Various fixups, change "js" USE flag to "javascript", fix up usage of "aac" USE flag.

Package-Manager: portage-2.1.1_pre2-r8

3 files changed, 22 insertions, 16 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index cd77da339237..ec20b7b2b880 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.21 2006/07/13 20:50:31 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.22 2006/08/01 14:18:01 chutzpah Exp $
+
+  01 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
+  gpac-0.4.1_pre20060122-r1.ebuild:
+  Various fixups, change "js" USE flag to "javascript", fix up usage of "aac"
+  USE flag.
 
 *gpac-0.4.1_pre20060122-r1 (13 Jul 2006)
 
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 73b9bc3c21f2..1b86f0717c08 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -24,18 +24,18 @@ EBUILD gpac-0.4.0.ebuild 2931 RMD160 a237b118413386818905ef21d116754ed657563c SH
 MD5 ad1180ed7a633d4d70ce898b9b03d94b gpac-0.4.0.ebuild 2931
 RMD160 a237b118413386818905ef21d116754ed657563c gpac-0.4.0.ebuild 2931
 SHA256 f7c97c86d5b57720ce7ee30a48a93da0381f8a730aaea0b442381a4a8dc72d48 gpac-0.4.0.ebuild 2931
-EBUILD gpac-0.4.1_pre20060122-r1.ebuild 3204 RMD160 670621c070916c1285fc389064817257bcaf1142 SHA1 5dab81e3bdb2661fc0ec2de7e7308e9c83081dc2 SHA256 fe1645b85d1a93ba94b7208147e50c71bfa30fccf61276509184d417f3a905bd
-MD5 b7fe69aa18bb61ba88225ce452e5e0d9 gpac-0.4.1_pre20060122-r1.ebuild 3204
-RMD160 670621c070916c1285fc389064817257bcaf1142 gpac-0.4.1_pre20060122-r1.ebuild 3204
-SHA256 fe1645b85d1a93ba94b7208147e50c71bfa30fccf61276509184d417f3a905bd gpac-0.4.1_pre20060122-r1.ebuild 3204
+EBUILD gpac-0.4.1_pre20060122-r1.ebuild 3280 RMD160 fcd058d744d6c0e2c17aa8544da4c2beef455007 SHA1 1dda4e93edf9939f3363551c90e7bb329cb94c5a SHA256 254c2b4c598ce3b7c387d88a35e8c78839561f25d27180afaddf1dc7f9fbe768
+MD5 d713f90adba81fad145d2d77f631802c gpac-0.4.1_pre20060122-r1.ebuild 3280
+RMD160 fcd058d744d6c0e2c17aa8544da4c2beef455007 gpac-0.4.1_pre20060122-r1.ebuild 3280
+SHA256 254c2b4c598ce3b7c387d88a35e8c78839561f25d27180afaddf1dc7f9fbe768 gpac-0.4.1_pre20060122-r1.ebuild 3280
 EBUILD gpac-0.4.1_pre20060122.ebuild 3811 RMD160 bd0248f363244dbd662a9bcf4c2f0a53d96b3ba6 SHA1 be5aa0bd2465dc8631388d66ce93998f22ee9143 SHA256 223c7f4caea69a5db5d625f6d17819032de6bfa455143caaf37fb820eb493445
 MD5 d0c6bc1e7ba9cb8708c7f23c63fab42a gpac-0.4.1_pre20060122.ebuild 3811
 RMD160 bd0248f363244dbd662a9bcf4c2f0a53d96b3ba6 gpac-0.4.1_pre20060122.ebuild 3811
 SHA256 223c7f4caea69a5db5d625f6d17819032de6bfa455143caaf37fb820eb493445 gpac-0.4.1_pre20060122.ebuild 3811
-MISC ChangeLog 3076 RMD160 4dac36787d4f414fa8fb13179fc5934257a13b72 SHA1 2310c24ac03492cb422bef2621360da306c4556a SHA256 a2ab7a3b3d2ce654ee007846ea9af3076d29d96b96ad275a6b55b55e73cbb942
-MD5 6684378401b7f114b205ba1671e5e966 ChangeLog 3076
-RMD160 4dac36787d4f414fa8fb13179fc5934257a13b72 ChangeLog 3076
-SHA256 a2ab7a3b3d2ce654ee007846ea9af3076d29d96b96ad275a6b55b55e73cbb942 ChangeLog 3076
+MISC ChangeLog 3255 RMD160 0ddd0068b3a7f6a588864a8e030be85ca8a54004 SHA1 1093942546f7510477e7a019f7e13463bb25e90f SHA256 11f0299ee283b58e2f32ec99e1e885880d876ed9a147e6f5147dcafa34e2a344
+MD5 a7456f551e8081d9c3350d83b2b3f54a ChangeLog 3255
+RMD160 0ddd0068b3a7f6a588864a8e030be85ca8a54004 ChangeLog 3255
+SHA256 11f0299ee283b58e2f32ec99e1e885880d876ed9a147e6f5147dcafa34e2a344 ChangeLog 3255
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
diff --git a/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild b/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild
index 1c2d1e3bffe7..851d2c0129ca 100644
--- a/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild,v 1.1 2006/07/13 20:43:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.1_pre20060122-r1.ebuild,v 1.2 2006/08/01 14:18:01 chutzpah Exp $
 
 inherit wxwidgets flag-o-matic multilib
 
@@ -11,13 +11,14 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="aac amr debug faad ffmpeg ft jpeg js mad ogg opengl oss png sdl ssl theora truetype vorbis wxwindows xml xvid"
+IUSE="aac amr debug ffmpeg ft jpeg javascript mad ogg opengl oss png sdl ssl theora truetype vorbis wxwindows xml xvid"
 
 S="${WORKDIR}/${PN}"
 
 RDEPEND="aac? ( media-libs/faad2 )
 	ffmpeg? ( media-video/ffmpeg )
 	jpeg? ( media-libs/jpeg )
+	javascript? ( dev-lang/spidermonkey )
 	mad? ( media-libs/libmad )
 	opengl? ( virtual/opengl )
 	ogg? ( media-libs/libogg )
@@ -38,11 +39,11 @@ RDEPEND="aac? ( media-libs/faad2 )
 DEPEND="${RDEPEND}"
 
 my_use() {
-	local flag="$1"
+	local flag="$1" pflag="${2:-$1}"
 	if use ${flag}; then
-		echo "--use-${flag}=system"
+		echo "--use-${pflag}=system"
 	else
-		echo "--use-${flag}=no"
+		echo "--use-${pflag}=no"
 	fi
 }
 
@@ -105,10 +106,10 @@ src_compile() {
 		$(use_enable oss oss-audio) \
 		$(use_enable ssl) \
 		$(my_use ffmpeg) \
-		$(my_use faad) \
+		$(my_use aac faad) \
 		$(my_use jpeg) \
 		$(my_use mad) \
-		$(my_use js) \
+		$(my_use javascript js) \
 		$(my_use png) \
 		$(my_use ft) \
 		$(my_use xvid) \