Added new '32-bit' local USE flag which specifies whether amd64-multilib platforms get both 32- and 64-bit plugins, or just the 64-bit one.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 21 insertions, 10 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index 2095a5543e8f..ed2f58fd8931 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/netscape-flash
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.89 2009/02/25 19:41:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.90 2009/02/26 14:00:56 lack Exp $
+
+  26 Feb 2009; Jim Ramsay <lack@gentoo.org> metadata.xml,
+  netscape-flash-10.0.22.87.ebuild:
+  Added new '32-bit' local USE flag which specifies whether amd64-multilib
+  platforms get both 32- and 64-bit plugins, or just the 64-bit one.
 
 *netscape-flash-9.0.159.0 (25 Feb 2009)
 
diff --git a/net-www/netscape-flash/Manifest b/net-www/netscape-flash/Manifest
index f4576d957efd..4007a50f6b49 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -5,7 +5,7 @@ DIST flash-plugin-10.0.22.87-release.i386.rpm 4065576 RMD160 0e28bd9d4c581fedbb8
 DIST install_flash_player_9.tar.gz 3057882 RMD160 959557613c79b52f8e80daa8346948a8ed6e20a3 SHA1 df4868afc1927319b37bf2b6cd3871cc033da58c SHA256 fe7a55f86faf663b36befa19848ddd28f808666d5cf7b14311599128c6d85fb7
 DIST libflashplayer-10.0.22.87.linux-x86_64.so.tar.gz 3729613 RMD160 010b1ac1795d9833e0ac5d7e8babcbfa7f21914e SHA1 ff6d1d72d9b17b5411dc6fdd4ee6046a8f6676f8 SHA256 eac1d05aa96036819fe8f14f293a2ccc9601e1e32e08ec33e6ed9ed698e76145
 EBUILD netscape-flash-10.0.15.3.ebuild 2831 RMD160 c660b8bc44290bd218257d0aaa8b9d9ce4de4a89 SHA1 309f980e0f639680ed98af6feed3c9ba2e9eed33 SHA256 4a458b827408adacdbdb5975b449455496ed34d64c1878fb4b534bc310af6ffd
-EBUILD netscape-flash-10.0.22.87.ebuild 3763 RMD160 dd7900a96cb7ff31b248b990896d672b77765702 SHA1 aa4f7c82456ce368e6fff25e3a59157a779732eb SHA256 f69d96dc0facfe0798a16ec4e37ec1d388990d6166eebaa746a68e25a094e92b
+EBUILD netscape-flash-10.0.22.87.ebuild 3808 RMD160 33da42ba06bb4829729b06406ded6735d46346eb SHA1 73b29845d497c3751aa7ccd0c45e4ea7f8c5e787 SHA256 6d679a75da5252b2454f7185d37fbe8bd6dd2f8e90cea2e82cf5b1bf23ab23ef
 EBUILD netscape-flash-9.0.159.0.ebuild 1850 RMD160 e46fc7b742df95813a898a376a188cc08baed6d6 SHA1 46b95088d6199aab5cc0dcd2e401eaaacbc830b3 SHA256 534f083fe9f9ae6fc16ea8bcb9adc529077a849e062a70385bc79c87ddb485e3
-MISC ChangeLog 15950 RMD160 753664daf19a99a16a06f99d99cc745b943c1c8d SHA1 f96808643fd1f8f0a5ef0ec1e1bccf895088e61c SHA256 af57517f7ca3d58da0ce237d4c81faa78075d18cc07a341ece04f5c32a06c161
-MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
+MISC ChangeLog 16189 RMD160 9159ba10da3449a7951984c4259970bfa4f5f3ec SHA1 a24ed4fdd9ad45218f7b4f0d2e95d02b2f0132e5 SHA256 7d93b84fa07e7be2e02bc3aea949765ceb8b5fe34213aec35d33193a5e3f67f6
+MISC metadata.xml 382 RMD160 5cd0a24035f9c6f50aad44ef478a328ba8274fd2 SHA1 31189a8c153d2e68e2984488ca04a42d84fc736e SHA256 05705498ee12c4acaef863eb60800f39c0eac2f76c2113727ff41d6fbede42d5
diff --git a/net-www/netscape-flash/metadata.xml b/net-www/netscape-flash/metadata.xml
index 24f1e9f83097..8be16fe08e9e 100644
--- a/net-www/netscape-flash/metadata.xml
+++ b/net-www/netscape-flash/metadata.xml
@@ -6,4 +6,8 @@
 		<email>lack@gentoo.org</email>
 		<name>Jim Ramsay</name>
 	</maintainer>
+	<use>
+		<flag name='32bit'>For amd64-multilib, installs the 32-bit plugin
+			alongside the native 64-bit plugin</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild b/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild
index c91019b5cad3..bed879ba6485 100644
--- a/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild
+++ b/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v 1.1 2009/02/25 19:32:09 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v 1.2 2009/02/26 14:00:56 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib
@@ -11,10 +11,12 @@ MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="x86? ( ${MY_32B_URI} )
 amd64? ( ${MY_64B_URI}
-	multilib? ( ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 )
+	multilib? ( 32bit? (
+		${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2
+	) )
 )"
 HOMEPAGE="http://www.adobe.com/"
-IUSE="multilib"
+IUSE="multilib +32bit"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -30,12 +32,12 @@ RDEPEND="x11-libs/gtk+:2
 	>=sys-libs/glibc-2.4
 	|| ( media-fonts/freefont-ttf media-fonts/corefonts )
 	amd64? (
-		multilib? (
+		multilib? ( 32bit? (
 			app-emulation/emul-linux-x86-baselibs
 			app-emulation/emul-linux-x86-gtklibs
 			app-emulation/emul-linux-x86-soundlibs
 			app-emulation/emul-linux-x86-xlibs
-		)
+		) )
 	)
 "
 
@@ -59,7 +61,7 @@ src_install() {
 	# 64b tarball has no readme file.
 	use x86 && dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
 
-	if use amd64 && has_multilib_profile; then
+	if use amd64 && has_multilib_profile && use 32bit; then
 		oldabi="${ABI}"
 		ABI="x86"