summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/csound/ChangeLog5
-rw-r--r--media-sound/csound/Manifest18
-rw-r--r--media-sound/csound/csound-5.16.6-r1.ebuild11
3 files changed, 19 insertions, 15 deletions
diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index a908dd46e459..427d57ce7633 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,9 @@
# 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.4 2012/02/27 13:37:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.5 2012/02/28 21:04:04 radhermit Exp $
+
+ 28 Feb 2012; Tim Harder <radhermit@gentoo.org> csound-5.16.6-r1.ebuild:
+ Move linguas settings and pass LDFLAGS to scons in a better format.
*csound-5.16.6-r1 (27 Feb 2012)
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a18e8d67a787..b6dcf4b2d511 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -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-r1.ebuild 5858 RMD160 f84b8204d9c7ced7dd83982bb0a460eade1f7539 SHA1 fd1a48ac559c95ff0698a4a10007c17bf79cc8a9 SHA256 68c7d0cddfb7a465434bb00f772ac681e08b9365c93abe8c4cc3c69b7d991040
-MISC ChangeLog 920 RMD160 6dc994b3187ca152836b51aa9b8d126a3bac49ab SHA1 c84719fe5adea884b8b73506dd7cdae411c91252 SHA256 da669b94ee695003fb2204bbe33d6bf17792eb56b23756f6be04e36c0ccc869c
+EBUILD csound-5.16.6-r1.ebuild 5858 RMD160 4b6381a7d3e3ddd4eced514337c77deb1f78b39e SHA1 930c7b8b0a774962f93ece13e0cacfd90244dfd2 SHA256 59e1f6591f0235dae5f2cdb7a968020953e204f5e9aae7d4cee5e1806ab12f3f
+MISC ChangeLog 1065 RMD160 5b3393715808a18e9962a6d3df74250273000efc SHA1 2e8cbe869dd9e054c6bc6cd4de79e27bc6ebb3c9 SHA256 928c0b8131febb695050d34b7b45baa168c653af2d3b54ce13314afb82ac3d47
MISC metadata.xml 1324 RMD160 14da35e00292156fbad91654b4d48d909f5ff80f SHA1 5524d7e4a8ef3e635d3647388505f6509a2165ed SHA256 90d345217445a0a5838e7662ac20da6653527027f93b01d131a0b677c9fc944d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPS4dFAAoJEEqz6FtPBkyjItEIAKwOUO5Y7+migGSaY3ITGEyY
-OYJPrtCUUPBYEbYNlNVdwLidXc52DXFwMNyoyzC6nut3zMWatLvpUXlMo6yrEJUJ
-JanI78ri8U05jN1lr2VDkhLdkzmKLNmCVbdIWQm2mD2fBJWIspOwaUJp5Zjxa5QQ
-dJ8d4EIx1VAPm0XKffI0OZN4CxRSEQlUCJFTJtAyBrIKfuQo5MgLnRAsA16URFtI
-6okTUWIAMrbnUtCeY1lLd2eMRg+u2vpQ57M1JB3nF+ikoHSpbVyTZD2GG59lNayc
-xFnRDnzy8NXYUAvNDCr5EBoa3UQwIH05QGx3G7EKVz3yI2gY7+ARSjl2M7NXgL4=
-=R6Y7
+iQEcBAEBCgAGBQJPTUFJAAoJEEqz6FtPBkyjCDIIALeJiiHxJwzoQAFG8EypHp6t
+GX/it6p/feymuKBEJIj641LKeOUThSg8oZrmwKwoYhI6WMqzogiKDvinSrFAqI1R
+m7luWbptL1Th0W4zcZ4q4DTWM0FDoEWdtiT2NGlCQT+W3HuZLa1ctR39oPJcu9rK
+/kKzX97wdWmj01/S25k03pKkSb+Gwy3aSPb4F+anTWlKrchHNeGOYOqUUG13ZMy/
+ZPjItZc6YXM2sLEzjAannsuxSC2kGxfK7XzO8NgDUSpmhpksvxFPBHF5DqmqZFHY
+DrqZVXg2qfLlVcTqpMu89X4kftTZ8pzhV2Dgmto/uiFPu9DNbt+77x4NPLxnGEc=
+=8n0i
-----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.16.6-r1.ebuild b/media-sound/csound/csound-5.16.6-r1.ebuild
index 77404e010b5a..4c313c79cab9 100644
--- a/media-sound/csound/csound-5.16.6-r1.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-r1.ebuild,v 1.1 2012/02/27 13:37:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.16.6-r1.ebuild,v 1.2 2012/02/28 21:04:04 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -26,10 +26,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-LANGS=" de en_GB en_US es_CO fr it ro ru"
IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
html +image jack java keyboard linear lua nls osc openmp doc portaudio portmidi pulseaudio
-python samples static-libs stk tcl test +threads +utils vim-syntax vst ${LANGS// / linguas_}"
+python samples static-libs stk tcl test +threads +utils vim-syntax vst"
+
+LANGS=" de en_GB en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
RDEPEND=">=media-libs/libsndfile-1.0.16
alsa? ( media-libs/alsa-lib )
@@ -97,7 +99,7 @@ src_prepare() {
customCXXFLAGS = "${CXXFLAGS}".split()
customLIBS = []
customLIBPATH = []
- customSHLINKFLAGS = []
+ customSHLINKFLAGS = "${LDFLAGS}".split()
customSWIGFLAGS = []
EOF
}
@@ -110,7 +112,6 @@ src_compile() {
prefix=/usr \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
- LINKFLAGS="${LDFLAGS}" \
buildNewParser=1 \
pythonVersion=$(python_get_version) \
$(use_scons alsa useALSA) \