summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/csound')
-rw-r--r--media-sound/csound/ChangeLog8
-rw-r--r--media-sound/csound/Manifest20
-rw-r--r--media-sound/csound/csound-5.16.6-r1.ebuild (renamed from media-sound/csound/csound-5.16.6.ebuild)2
-rw-r--r--media-sound/csound/files/csound-5.16.6-install.patch41
4 files changed, 48 insertions, 23 deletions
diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index 0a87ecfbc5c1..a908dd46e459 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/csound
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.3 2012/02/27 07:03:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.4 2012/02/27 13:37:56 radhermit Exp $
+
+*csound-5.16.6-r1 (27 Feb 2012)
+
+ 27 Feb 2012; Tim Harder <radhermit@gentoo.org> -csound-5.16.6.ebuild,
+ +csound-5.16.6-r1.ebuild, files/csound-5.16.6-install.patch:
+ Revbump to properly install all required headers. Remove old.
27 Feb 2012; Tim Harder <radhermit@gentoo.org> csound-5.16.6.ebuild:
Only install locales when nls is enabled.
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index df885a087103..a18e8d67a787 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX csound-5.16.6-install.patch 7054 RMD160 7ff541583f2d3d3afdca88e380fe3a5b1f97d137 SHA1 692d48704e66c5db7cc8eb020927d21a706bbcd0 SHA256 8972ccea60614ee85c5eb3f0eba73c1f5441ff6ebcab1805659b3ebe8ee81879
+AUX csound-5.16.6-install.patch 7688 RMD160 1f7da4193df6e187ff0d7bc5cf7ab55d161b0fd3 SHA1 6a510c171c9133172fd543044ca66fbe395dc51a SHA256 95cb4f08c57aa6a6135f7c4038242678fff39af58d892cc38ba031dab120039e
AUX csound-5.16.6-scons.patch 8289 RMD160 ef1c41d8b418bdf7beb5c6717474781637859f5b SHA1 c43f252566922a7c531f52d5096d9fabe517040b SHA256 dc539056f99103578dcfb59666d883f177c8a8c57a9b34abb924905624768b1a
AUX csound-5.16.6-tests.patch 2356 RMD160 6b3d93e4e062d009b7776ece4cf9c39a7da7ac0c SHA1 11e2132a702565c7386c4b54b2e42d63820fd568 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca
DIST Csound5.16.6.tar.gz 8735038 RMD160 49f3f7af3cfca6e129750564822698f4d2433329 SHA1 28bbf5d34ee5bb11dc1d50fb122b5a706d317c33 SHA256 0ba912850152aeddb7eb757a33c185e3d50b4807548db6d7ba6cf85de15e7ffb
@@ -9,17 +9,17 @@ DIST Csound5.16_manual-fr_html.zip 9711044 RMD160 951a5e6872c888b49917e172f1b5a2
DIST Csound5.16_manual-fr_pdf.zip 5969838 RMD160 8710496e4909ac80df2a2fb48c124d811f3cffe7 SHA1 68a7dc63bf08b04aee8635d0cf13c44214fe743d SHA256 a30f30554529d891018534dc1de06cb7c7499d80f1b618f9977cf457194e8091
DIST Csound5.16_manual_html.zip 9451986 RMD160 262888c476044827f872764ba3a5ffab3717d42f SHA1 4dbe80c06a6573066269ce1ee0ac466a03414a65 SHA256 572b1b3825fd5203d00e3db6db7a190a17212b28de425cc0373e705d44aa2c8b
DIST Csound5.16_manual_pdf.zip 5661273 RMD160 a63c6806366e0b7bb702096d10d956194d2c9378 SHA1 91ee66b4c4aa93757165a391a19e8039ef9a6982 SHA256 66550eb53a77b942ad073be63c12dca66b6960d5995a6a241dde255d2d0be85b
-EBUILD csound-5.16.6.ebuild 5855 RMD160 fceb005fcda411ab49c06e3c760a11786e4d6720 SHA1 a3b06e524a4e119cd7a204c828ab3f8b0ee94b01 SHA256 06d3b91c0196f84ec11502d763fa37c934b0b7086be4f6c5b287380375a625d9
-MISC ChangeLog 687 RMD160 e65de14d1d13dc338b0d28d23953625d9de3fafe SHA1 818fbb0ec47ba439aba954eba501ca3c0862b81a SHA256 0a47eb7bd5dd331e6897ebadf6527cee07b4bc9b332411289f5808174ebae627
+EBUILD csound-5.16.6-r1.ebuild 5858 RMD160 f84b8204d9c7ced7dd83982bb0a460eade1f7539 SHA1 fd1a48ac559c95ff0698a4a10007c17bf79cc8a9 SHA256 68c7d0cddfb7a465434bb00f772ac681e08b9365c93abe8c4cc3c69b7d991040
+MISC ChangeLog 920 RMD160 6dc994b3187ca152836b51aa9b8d126a3bac49ab SHA1 c84719fe5adea884b8b73506dd7cdae411c91252 SHA256 da669b94ee695003fb2204bbe33d6bf17792eb56b23756f6be04e36c0ccc869c
MISC metadata.xml 1324 RMD160 14da35e00292156fbad91654b4d48d909f5ff80f SHA1 5524d7e4a8ef3e635d3647388505f6509a2165ed SHA256 90d345217445a0a5838e7662ac20da6653527027f93b01d131a0b677c9fc944d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPSyrFAAoJEEqz6FtPBkyjUcgIAIX+2hT3+c2qEQYyMFhlsXUQ
-IqMNtMmG9bszIChdZiWS0h3P76cv0bAyJk5+mYnT9+9Oo0/PL5XMFoJi5YxzLTzG
-CnvEKXFx4qWR2sM/rsz937s7fRSRWV/Ptl8MrqHG062A5nk7lQbKYblIoYYfffB/
-gB/lmtLj1dXheGDKibON7/NVCFHf1pKstPoJTzWK7PHZbgN0lV+BW4aQsZw+xtKF
-WYtIwsF4o1KEUnqH2Tx9EHfrmuqmL6AxK5QCOEmHLzhQoXE6vzJ68QetvhgsCuuF
-yudT84BeuwEAHAMejxE/GHv1DmRLKlirgHGbUhhTetDIfjzRYHMGmEoBMrjKqwc=
-=76yS
+iQEcBAEBCgAGBQJPS4dFAAoJEEqz6FtPBkyjItEIAKwOUO5Y7+migGSaY3ITGEyY
+OYJPrtCUUPBYEbYNlNVdwLidXc52DXFwMNyoyzC6nut3zMWatLvpUXlMo6yrEJUJ
+JanI78ri8U05jN1lr2VDkhLdkzmKLNmCVbdIWQm2mD2fBJWIspOwaUJp5Zjxa5QQ
+dJ8d4EIx1VAPm0XKffI0OZN4CxRSEQlUCJFTJtAyBrIKfuQo5MgLnRAsA16URFtI
+6okTUWIAMrbnUtCeY1lLd2eMRg+u2vpQ57M1JB3nF+ikoHSpbVyTZD2GG59lNayc
+xFnRDnzy8NXYUAvNDCr5EBoa3UQwIH05QGx3G7EKVz3yI2gY7+ARSjl2M7NXgL4=
+=R6Y7
-----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.16.6.ebuild b/media-sound/csound/csound-5.16.6-r1.ebuild
index 731763610409..77404e010b5a 100644
--- a/media-sound/csound/csound-5.16.6.ebuild
+++ b/media-sound/csound/csound-5.16.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.16.6.ebuild,v 1.2 2012/02/27 07:03:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.16.6-r1.ebuild,v 1.1 2012/02/27 13:37:56 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
diff --git a/media-sound/csound/files/csound-5.16.6-install.patch b/media-sound/csound/files/csound-5.16.6-install.patch
index 09b6e0d99391..e715f58dedd7 100644
--- a/media-sound/csound/files/csound-5.16.6-install.patch
+++ b/media-sound/csound/files/csound-5.16.6-install.patch
@@ -66,7 +66,7 @@
if err == 0:
if i[:13] == 'libcsound.so.':
err = installLink(i, concatPath([libDir, 'libcsound.so']))
-@@ -292,7 +267,7 @@
+@@ -292,11 +267,26 @@
if i in pluginList:
pluginList.remove(i)
for i in pluginList:
@@ -75,7 +75,26 @@
installErrors = installErrors or err
# copy header files
-@@ -313,6 +288,7 @@
+
++# Add forgotten header dependencies
++headerdeps = []
++for header in headerFiles:
++ f = open(header)
++ for line in f:
++ m = re.findall('^#include "\w+.\w+"', line)
++ if m:
++ n = re.match('^#include "(.+)"', "".join(m))
++ if os.path.isfile("H/" + n.group(1)):
++ headerdeps.append("H/" + n.group(1))
++ else:
++ headerdeps.append("interfaces/" + n.group(1))
++ f.close()
++headerFiles = list(set(headerdeps + headerFiles))
++
+ print ' === Installing header files ==='
+ err = installFiles(headerFiles, includeDir)
+ installErrors = installErrors or err
+@@ -313,6 +303,7 @@
['_loris\\.so', '1', pythonDir2],
['_scoregen\\.so', '1', pythonDir2],
['_CsoundAC\\.so ', '1', pythonDir2],
@@ -83,13 +102,14 @@
['csnd\\.jar', '0', javaDir],
['interfaces/csound5\\.lisp', '0', lispDir]]
for i in wrapperList:
-@@ -322,48 +298,21 @@
+@@ -322,48 +313,21 @@
if i[1] == '0':
err = installFile(fName, i[2])
else:
- err = installXFile('--strip-debug', fName, i[2])
-- installErrors = installErrors or err
--
++ err = installXFile('', fName, i[2])
+ installErrors = installErrors or err
+
-# copy XMG files
-
-print ' === Installing Localisation files ==='
@@ -109,9 +129,8 @@
- print ' %s' % fileName
- else:
- print ' *** error copying %s' % fileName
-+ err = installXFile('', fName, i[2])
- installErrors = installErrors or err
-
+- installErrors = installErrors or err
+-
-# Copy documentation
-
-print ' === Installing documentation ==='
@@ -138,7 +157,7 @@
# copy STK raw wave files
-@@ -398,7 +347,7 @@
+@@ -398,7 +362,7 @@
pdDir = ''
if pdDir != '':
print ' === Installing csoundapi~ PD object ==='
@@ -147,7 +166,7 @@
if err == 0:
try:
os.chmod(concatPath([instDir, pdDir, 'csoundapi~.pd_linux']), 0644)
-@@ -420,42 +369,6 @@
+@@ -420,42 +384,6 @@
'%s/%s' % (vimDir, 'syntax'))
installErrors = installErrors or err
@@ -190,7 +209,7 @@
# -----------------------------------------------------------------------------
-@@ -481,10 +394,6 @@
+@@ -481,10 +409,6 @@
print ' CSSTRNGS=%s' % xmgDir
if '%s/libstk.so' % pluginDir in fileList:
print ' RAWWAVE_PATH=%s' % rawWaveDir