[proaudio] [1988] Fixed csound-5.12.1-r1.ebuild

[subversion@xxxxxxxxxxxxx]

Revision: 1988
Author:   dominique
Date:     2011-06-04 02:45:27 +0200 (Sat, 04 Jun 2011)
Log Message:
-----------
Fixed  csound-5.12.1-r1.ebuild

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/csound/ChangeLog
    trunk/overlays/proaudio/media-sound/csound/Manifest
    trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild
    trunk/overlays/proaudio/profiles/package.mask

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/csound/files/custom.py-5.12.1.patch

Modified: trunk/overlays/proaudio/media-sound/csound/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/ChangeLog	2011-06-03 18:08:00 UTC (rev 1987)
+++ trunk/overlays/proaudio/media-sound/csound/ChangeLog	2011-06-04 00:45:27 UTC (rev 1988)
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jun 2011; Dominique Michel dominique@xxxxxxxxxxxxx>
+  csound-5.12.1-r1.ebuild:
+  * removed commented line that prevented csound to configure correctly
+  * USE csoundac depend on USE lua
+  * custom.py-5.12.1.patch fix the fltk PATH
+
   25 Mar 2011; Hakan Demiralp <keenblade@xxxxxxxxxxxxx>
   csound-5.12.1-r1.ebuild:
   csound-5.12.1-r1: fltk slot changed from 1.1 to 1

Modified: trunk/overlays/proaudio/media-sound/csound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/Manifest	2011-06-03 18:08:00 UTC (rev 1987)
+++ trunk/overlays/proaudio/media-sound/csound/Manifest	2011-06-04 00:45:27 UTC (rev 1988)
@@ -2,6 +2,7 @@
 AUX csound-SConsruct.diff 2225 RMD160 56e261b5f9f41d4c0fb8d7bc26220cc35b0317ff SHA1 4e26a9e356ba49e39ba3d5c66407676219fa4634 SHA256 bfbbc049f4f5ac3ff6d54384bdb5561483882eab407bbd9ab12924931002c81d
 AUX csound-remote.patch 591 RMD160 d75bc68af8be51b21ebc432ab15d2850af22514f SHA1 536cfe0c9026f3830030ed18370ab26ebf4a1501 SHA256 05cccce1a722d598c2ac05a4ccaa296d12f842ea412c3a8cc66eef39834a9e2b
 AUX custom.py 629 RMD160 a9186ab29d7424f72b5e13eec1a0aa5d2c92140f SHA1 97c66fbebd758eaae98974d97aa7a765cb79ae58 SHA256 81fea3923cc0b9b0eeca9c6a2270c2e2f4d3ded756a888649ebc1d5bbb492544
+AUX custom.py-5.12.1.patch 532 RMD160 6bcb516ca0c2f6e33e7a2e048b4ea498bf9f1c2f SHA1 a20f94460e991a5fee509c85ebb092981a8030df SHA256 41bed096090398fc455b7a4e61e504642d468f6d33e5596001440e32425b4397
 AUX install-stk.patch 1457 RMD160 edb7e42a0ae29e7722b342bc05ce6ead6abad004 SHA1 25b2841f8c587ebec28575724c3200f3ea568865 SHA256 3b513d5f249e4759fac621ed97589d05ff56382372c1cde96ff30cb61a695db2
 AUX javaVM.patch 1133 RMD160 c66ad3b4119dcf956c1256045b057d8118baa94e SHA1 7da1ce2a91da9a623c4e0c71508afab2fa32da7b SHA256 d0c65e81397b0ff76d45d94b2695de713cbab0d210ce6312d86c62779c253577
 AUX libmusicxml.patch 391 RMD160 3a6f700ed241f055ad37300012df35d92c848939 SHA1 9cffe53f19aab21ded69eefa13dfefa343f0da80 SHA256 a909e49b535accd2e2d1bfbe9ecb73454d9b59cd165e87c6bba9e10e65c4ab65
@@ -21,7 +22,7 @@
 EBUILD csound-5.07.0.ebuild 2940 RMD160 d3dbbebea4a89d549e7e1ebef7ff2e82acb2e10d SHA1 da2d8d8fd4f9802845fbe5dbf163d9c062429986 SHA256 b8914f6cb6b6db40ba1f0f78f807969c4b91a27fc7f2aa3e9a1d2a5820bf257f
 EBUILD csound-5.08.0.ebuild 2941 RMD160 9749d3b3131ecac73660929a841d1ded1e9b11a4 SHA1 744c6b8f126e9143e424ecf5a2c924746e4be38d SHA256 f5ae6f6e666be6929f87a337cdf4c33a7e7e1f8594c797e3a5c24f2d66eb3c7e
 EBUILD csound-5.09.0-r1.ebuild 3042 RMD160 8f7b11517e7f5bc3cccf1e03544c98750422b6d0 SHA1 76d56ef6bf1e4830dcb221dd402e6833fa235dc7 SHA256 a7679d519ee4347d4fa8a5986acd8230466ace1761f3a0eaf4e95d204534e576
-EBUILD csound-5.12.1-r1.ebuild 7110 RMD160 306d3820ec4ff6594011c90026af95c1acaa60ad SHA1 1032e346fee77afb6af7e725a47d2e7833b76f3e SHA256 5dc37631ba87affd9bff2b72b2367f564b5a4f97558dfbe1872493c94867d037
+EBUILD csound-5.12.1-r1.ebuild 7280 RMD160 b0a61559e98eb237d79b676605276b57ccac75cc SHA1 1e87800e074e329a826f8baaab410ddd6c27832c SHA256 40bc49d2c2ed2313479181b35fd42b3e24660c90cfe9ae7a4bcf9210949abcc3
 EBUILD csound-5.12.1.ebuild 3043 RMD160 ca18bb046d0505e20a2fa03508c3b24ebe502cc2 SHA1 c42a18d4cf126462a6afb3dcc20bec3536318193 SHA256 93c50d7073586ddb49672ae1d1e4d0b4a62db4ef80f65b29dd1d84c39c30a4df
-MISC ChangeLog 1151 RMD160 ace5c51c1519059a4be940d6a9f71d646ce1333e SHA1 e3ad292bb1dfdddd7efa77084a858e961b5be04a SHA256 6d493c46c7ee0a7cb5c8d8aa5378c9bad9f8181c14f93e6f5db34ae4931f825b
+MISC ChangeLog 1388 RMD160 e1617a4b8e85a1dad771e331fb191040955a48d6 SHA1 7da8a4baef883ea19808b8baf517fc02b9b87cac SHA256 7f5ea4556003c4b192f9d8400e1a1e928f8284ce4a7c228142d0c108ff8e5f94
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild	2011-06-03 18:08:00 UTC (rev 1987)
+++ trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild	2011-06-04 00:45:27 UTC (rev 1988)
@@ -83,7 +83,12 @@
 	epatch "${FILESDIR}"/install-stk.patch
 	epatch "${FILESDIR}"/javaVM.patch
 	epatch "${FILESDIR}"/libmusicxml.patch
-
+	epatch "${FILESDIR}"/custom.py-${PV}.patch
+	
+	if use csoundac && ! use lua ; then
+		die "You have enables the USE csoundac, you must emerge ${P} with USE=\"lua\" for this to work"
+	fi
+	 
 	if use stk; then
 		ebegin "Copying Perry Cook's Synthesis ToolKit to the tree"
 		cp -r "${WORKDIR}"/stk-"${STK_VERSION}"/* "${S}"/Opcodes/stk/
@@ -159,7 +164,6 @@
 	einfo "You enabled following scons options: ${myconf}"
 
 	escons \
-#		prefix=/usr \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		customCCFLAGS="$CFLAGS -fno-strict-aliasing" \

Added: trunk/overlays/proaudio/media-sound/csound/files/custom.py-5.12.1.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/files/custom.py-5.12.1.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/csound/files/custom.py-5.12.1.patch	2011-06-04 00:45:27 UTC (rev 1988)
@@ -0,0 +1,13 @@
+--- custom.py.orig	2011-06-04 00:13:49.000000000 +0200
++++ custom.py	2011-06-04 00:09:34.000000000 +0200
+@@ -18,8 +18,8 @@
+ if sys.platform[:5] == 'linux':
+     platform = 'linux'
+     customCPPPATH.append('/usr/include/libmusicxml')
+-    customCPPPATH.append('/usr/include/fltk-1.1')
+-    customLIBPATH.append('/usr/lib/fltk-1.1')
++    customCPPPATH.append('/usr/include/fltk-1')
++    customLIBPATH.append('/usr/lib/fltk-1')
+ elif sys.platform == 'darwin':
+     platform = 'darwin'
+     customCPPPATH.append('/usr/include/malloc')

Modified: trunk/overlays/proaudio/profiles/package.mask
===================================================================
--- trunk/overlays/proaudio/profiles/package.mask	2011-06-03 18:08:00 UTC (rev 1987)
+++ trunk/overlays/proaudio/profiles/package.mask	2011-06-04 00:45:27 UTC (rev 1988)
@@ -22,8 +22,3 @@
 # waf seems broken
 =media-sound/jack-audio-connection-kit-1.9.1
 =media-sound/jack-audio-connection-kit-1.9.2
-
-# Hakan Demiralp <keenblade@xxxxxxxxxxxxx> (10 Jan 2011)
-# Masking this versions until we can make the
-# the ebuild properly, since it fails to emerge
-=media-sound/csound-5.12.1-r1