diff options
author | Ben de Groot <yngwin@gentoo.org> | 2015-08-02 09:46:38 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2015-08-02 09:46:38 +0000 |
commit | 49bf31d9275c59dd9e1963b9577fae6e1cc9eefe (patch) | |
tree | 47b65f3bd500a454638a10aa0d855a8355dbec5f /media-sound | |
parent | sparc stable wrt bug #551890 (diff) | |
download | historical-49bf31d9275c59dd9e1963b9577fae6e1cc9eefe.tar.gz historical-49bf31d9275c59dd9e1963b9577fae6e1cc9eefe.tar.bz2 historical-49bf31d9275c59dd9e1963b9577fae6e1cc9eefe.zip |
Improve python handling (bug #556342)
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/csound/ChangeLog | 5 | ||||
-rw-r--r-- | media-sound/csound/Manifest | 36 | ||||
-rw-r--r-- | media-sound/csound/csound-6.05.0.ebuild | 10 |
3 files changed, 28 insertions, 23 deletions
diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog index cc8b2ff5e067..22e8e45c0e69 100644 --- a/media-sound/csound/ChangeLog +++ b/media-sound/csound/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/csound # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.38 2015/07/08 15:12:42 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.39 2015/08/02 09:46:31 yngwin Exp $ + + 02 Aug 2015; Ben de Groot <yngwin@gentoo.org> csound-6.05.0.ebuild: + Improve python handling (bug #556342) *csound-6.05.0 (08 Jul 2015) diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest index d35e9c1e9722..9537a85da5f4 100644 --- a/media-sound/csound/Manifest +++ b/media-sound/csound/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX csound-5.16.6-tests.patch 2356 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca SHA512 d85bf2458ef0b709f497f85c15b010ef9da3a70c9b2fcc4ba0ff0d44a7f1cd2547aa6bc823ffa0834c3dabb301b06e08fbf83089ec584d45545dc368955d780a WHIRLPOOL 9ed37a4f9aadfca902ce278c706759c3643b729ddda290060e88b7f83c0f0d33e0b371beb14ff371e60319bb5e2b58d12fa9bc248a6e001c8bd6d1238214907e AUX csound-5.17.11-cmake.patch 256 SHA256 abcf62d9aabaa8e761d1f9ff5cf5b93c7701d7ac917e149dd62efc3be7964acd SHA512 71bd58ba57304ba3b7dca88e0894af7d9b065bc5ebbcbb55af54a4e7528fec44f3ba9e9473f73a1e8bf1af41db83b85776ac570684adb7e778e24f5742adb593 WHIRLPOOL 38baac976621ffbc0284c7b75affa1df3ea2d96bf75259e41c57330e222d6d73701c6c57e65c87eec407d1b5ee5a2eff07b3d25af3884d21c36bf6d31bbadea3 @@ -17,25 +17,25 @@ EBUILD csound-5.19.01.ebuild 5931 SHA256 8b0b8cf423d405f472ed95003516af1c472cdd0 EBUILD csound-6.02.ebuild 5953 SHA256 0af459d6bc33975105cc3bb22aaa17281f7049514cb6b3fb92444dc06b41395a SHA512 a77d5789b91357c7e9cbc7df54faedb8ad7087fdf89cfe7e5069f5e6237ab8f782a8f244d77f37e55679858a27f6c48023635bff9e12f275403d3762ef8c78d1 WHIRLPOOL e430ff4327f344f8724fb4337f02fa655798824df560840d83d832ef32955d0ec6f90c20a96f00e544fb41eda413b016af744377e47b2a32d558a696d5a57e1d EBUILD csound-6.03.2.ebuild 5891 SHA256 33f98f897450bf6877005e98cab24347ad0d04163c95a006a742effb8970fdec SHA512 fb7519c0f26936cae98b26b841b8143570bc51abc361adad92790189abc33ec7764916b47a9123783a17abbdf6a7b4e9928e41d9610e161c50a3e6452a539a43 WHIRLPOOL 417c7e52093fe0c4c14aef9b4cc04172af77ef05593162c1045f4924bf33123d9e5ded15527fc0ae9fb229a8e7a7d066b0df1e22e68ad581f53d2a1b72cfae93 EBUILD csound-6.04.ebuild 5850 SHA256 a2e670301f373799dfba113a81ef5d86d3c654d328380f7bb8340e57b71de856 SHA512 ef3e994fb513fcc2399fb9bc82d1f30de06a68c7431e1cd5345964c568062f8b05c50921ddfb142f8fedf46c6368cb73c5f3af1a78f7cec2ff47f83235570c2f WHIRLPOOL d944c9d2d7368684601ab3a638e2e5577d8a014c62709161abe5414b9d095b701b9485c1c505b2f6dd24ff09f53251b31f56440842f350f3aa61aaf505e8234c -EBUILD csound-6.05.0.ebuild 5810 SHA256 b083feb41f244ad10b8af2241ce9f94e2d5c3a4d5d1d74b1d263b97234cd0c29 SHA512 9c476605470ef3e90dfd4634ef756a30b8390ae3303725079eb74348d949613be5e7c05f487a13642f9d406b3eb7f32e3026e58a57943591411f52041d2258c2 WHIRLPOOL cc7f1f37cbef15301d3904df9cfe02f5ca692df458502e621d303e270e5990e16e761663fbdc49c4cc6b028e09bad998de2c40975a596007e6ca01bcf90f83b3 -MISC ChangeLog 6088 SHA256 87311cbdad091d69907f4cfb8c0ce14c212cfd743e741cc15c347d62a943054a SHA512 f4eb2f497f6d462685e62df05ca7c1985394230a4c0004fd7b0f6f9dfa42b9fae14fd3003a948b1235bb9dcb9473c6f418ad3a57d3581be3b998ee8173eef7a4 WHIRLPOOL efc73edb7f7b7a0144ee81e6eb3877abcebfb4ded6f4e3261e778c421d06a31bd258c0ae557fd104594fd1f6676a8564aefa4bd1944ce063404b191fcc948c63 +EBUILD csound-6.05.0.ebuild 5854 SHA256 80222e27a87ea9ef417a885601a08b4ffc28a8d2c51346452d0a27921962ceb5 SHA512 b3f25b0ce4ba78b2ca0d5cc2c54f361690948353ff7271a0f89ac81644af9b15bb08a4aacbf09b5d0745f66b450a4844ca97108ddc06ea5ccfcd7f829a0bc65e WHIRLPOOL 068ec445350f5ce45d306ca242611f24f7858349ec9ab5c5cc64bbd73a2ad2abb28ea9a5ec7920b1c523450987d73eec52e775956d738a9bad9d33c770c0dfe7 +MISC ChangeLog 6199 SHA256 5aec5518fb201f61ab268f290313214115cae347341da5474f3bc4f89cd8bc73 SHA512 54a61c210d89cbee92e03607c1ee655426585552127b81390c7f08be8e36e1e5136fd3efd1b777d6438c3103489962725e3fbff9ac09b314dc3342acfcd299b4 WHIRLPOOL 4002b35567c3f7a172dddca7c71ee808b28e0e20d834b09fe99204d4c5798d5f1f1829e2814f42ab33332980d2df5249409bd8ef895c188bdc63a7bdbe86f518 MISC metadata.xml 1456 SHA256 144b2efa3d4cb0a4ec95922c55ed1b75a4ac8ab8be45ab3c48a0b1e2430d958a SHA512 d5c8d8ffa995f43a264e8fe2d168addcedb552a49d0a764abebe951bd9603996bcb8838988bf1f2c3667aaaa79fa3ca18adeec828e6e511e75e1b11dda85b2ab WHIRLPOOL 03358d789eb09149cf65f0a623c6ea80e491f8edc0ebecadfce8e27b9ed398c78779bc890d9c1ada5954610bcd9c59ddd16ec891abb32deda24e051a3e5bd130 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQJ8BAEBCgBmBQJVtggUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF -OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmio1IP/0jfI7iNlFIsngxWQpMk3Ayn -eksb/bEt0OUXoIoxxyzKIpJc0Ok7Bifc6YMFXiU2+rAE/tbzZ4Q9ZOW9P6EIqHgP -1Vz4cQM73u5j0bUrP4Idf+OMcpLUp7lQ5aincZcogrelYE3kj+teuCXspfaSczhw -gnGShV5zPU/zKWvBT6OQa7up2NcGYgnCkpL6JCI8ZD0v48bc/rYXFIOC+ikRj13k -tb8M+t27rn3eul3xpeJfExk72JXYwThA6tNYBLG/F6K9ndUzY2v8943hnOnfz9BZ -VZ34k/wyIO80XIwmaR8CkK1+v+mpsBZedg1RMcT5k4jk5gkoIRk71ihC8be4cyl6 -MDDkrHi3aZ0+Ts4xEkKOAHaoplijrpSlQy8geKsNW3Od5KGUpBsgzztpb9DpEQMn -ZQoEAyf8nIiIJwydbLFywdPTQphzLysfqyX2kxoHw8kjO9QEqUUXyn+W0hjiMM/Z -WlNoWoiW1AHimCvGGw6gXMip1JD0W2m5dWH0iKPGVauyTzGs/AedePTmLWzlQ1Jy -ffoBS9Y2KYALdva89F9zB5PFkZng5gydRoZ+38UWzmMv0E2ZQUYZohTBwa3duvKX -Tmp2DDPcH+7EgvNJc9rFZnPOMq0Mkt8ZYxgBm2BOj6dxyNb34LnsdP5MMKgxY/F3 -olqiqvsn311g+d9zktlC -=hH47 +iQJ8BAEBCABmBQJVveb6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0 +RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOf8MP/0qUbDsXjYj+nr+MVij/Rn1i +BVj7a51uhvqQWGEcLyD1RH3ZtWdrryUWbGHqDLFsWw9VBJH7duHFYVCr0NQD2qLv +F0pa4TycWInQsnPHPL9asE/Bi+n16RJT5Be+5xJIB9c7HZSYdUMzhA23dVVJNW+5 +wheAWTeJZdmOSHAuhakIs+8C9KIWiHDYkuZW91sKzzmOUpJkgpULVSLIegj4hqGj +2Uj9gZn192tnxLECzx8tck4rUhpP7TIFBVpGpfvnS65Z0ixVQsqrHrB8U1lHK1pC +K4qTK08ICHu0kWxliXqhlLFzx2zHD3u2rc6J63mJurkqX8Z8q3hN0EVca0z+kT09 +/P4XXYkziD4111v47MiqLgKdT8ihbaegdAJOQEF914Pf4aRkxtXmmBmXUwNxlbs9 +dV8UThRWE0fPyARUYMuJpb0BibfF7h13gxLBAKKHazNMqrjGwn467WZOPpdWka7m ++8RhObGpwadvGHbPZNjK/7hoTs+UAkN80goQ3cFIx8prf7Zx5s/DUUwKJ/F7swqr +nMxBVI90Tfp8NczRlg72ik0EosbIuYkEnuSr6tgI3ttkmaRK9JnAaps2QCFAxZuJ +jMhU9bGH4NOKlPdfd7QZ4VNyqnfILnhQHzpBBSieRQUJgIu0CzIenyfdUp3u50Fb +53jsmQX0AMZj13Vzmwo/ +=Rlqt -----END PGP SIGNATURE----- diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild index 999af0194cd0..41acccedd7d8 100644 --- a/media-sound/csound/csound-6.05.0.ebuild +++ b/media-sound/csound/csound-6.05.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-6.05.0.ebuild,v 1.1 2015/07/08 15:12:42 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-6.05.0.ebuild,v 1.2 2015/08/02 09:46:31 yngwin Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -28,7 +28,6 @@ RDEPEND=" x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost - ${PYTHON_DEPS} ) curl? ( net-misc/curl ) dssi? ( @@ -70,6 +69,7 @@ DEPEND="${RDEPEND} ) " REQUIRED_USE=" + csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) @@ -98,8 +98,10 @@ src_prepare() { -e '/-O3/d' \ -i CMakeLists.txt || die - sed -e 's#${REPLACE_ME}#'$(python_get_sitedir)'#' \ - -i CMakeLists.txt || die + if use python ; then + sed -e 's#${REPLACE_ME}#'$(python_get_sitedir)'#' \ + -i CMakeLists.txt || die + fi for lang in ${LANGS} ; do if ! use linguas_${lang} ; then |