Only link to adobe-flash libraries when it is detected on the system

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

4 files changed, 16 insertions, 8 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index db4410e736a7..b9005413900d 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.8 2009/06/14 20:49:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.9 2009/06/17 16:14:23 voyageur Exp $
+
+  17 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-bin-0_p18366.ebuild, chromium-bin-9999.ebuild:
+  Only link to adobe-flash libraries when it is detected on the system
 
 *chromium-bin-0_p18366 (14 Jun 2009)
 
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 833559513bda..ec32294915c4 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -2,7 +2,7 @@ AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a
 DIST chromium-bin-17935.zip 14742004 RMD160 09b4a53208a195b0cc47c19e251106d4b7f42651 SHA1 ff822b3252231bc4f9683e703a9d62f2913042a5 SHA256 0642db43121c0e34ef62b544d3846de7f68db89f5111eb23b49a794b01bb08d0
 DIST chromium-bin-18366.zip 14806523 RMD160 30c606bf97e845a41ef99546aeca6b9a696bcfb7 SHA1 a17c344925298b6f2719e6194e08ad679776cb11 SHA256 4bb74d3d088c538d4bd4e6e3082b9c9bf51d9855c76732a517f597df8bffdfd5
 EBUILD chromium-bin-0_p17935.ebuild 2304 RMD160 3c4bb4acfa69e8822cc1fb7cfb185435ed4cc84a SHA1 5e51b66adcf0b78a128d6c29140f3923743831d2 SHA256 4cdb1e6234e9602334d0f83ed869721a9870d53194c4dafdd4919a45c08295b9
-EBUILD chromium-bin-0_p18366.ebuild 3049 RMD160 0d67e4f5d2e8bd197ecccd0efd98ba8e965242af SHA1 3facb14fed18bbc4f9cd654c469cef79d5b3ce75 SHA256 2690af6b491d509ad81e125ba8dbb3a0e6c21bddd81fd571033eaba8d552efea
-EBUILD chromium-bin-9999.ebuild 3185 RMD160 4fb3d2ef5dd551c7a79d797062eaf8ccb653df10 SHA1 0174a482f712c908cef219ff35be135f116e6c6e SHA256 143f2132cb165fa43d85e8219b3f29bf1c3ab2c45f2e0886fcc52f3984958272
-MISC ChangeLog 2100 RMD160 0abb885f8e4b929cad90dac925c645920481b0b4 SHA1 ebf2c557d6d9a8b5427032083cc5db374893fd32 SHA256 cef6d35627cb51fa69359bdf5b2491bd8dbc12e0f06be806a8269bf71ee7c7b5
+EBUILD chromium-bin-0_p18366.ebuild 3227 RMD160 17e30c3801eab0b5d77ec1b30c657eaee050343a SHA1 28176281948709aacc98c564034456a9ca7834d8 SHA256 4b9ef2b37ccd7d4bcfedebb74efb5d71e2ca24feffea35280f76eef939d150da
+EBUILD chromium-bin-9999.ebuild 3364 RMD160 376318dc7e8eeb42078f71243935c7bca1ad2898 SHA1 445a47f7bb85f4e7edc1108aaa2badac85677862 SHA256 0ecfb3ca61d744c724180a8c0786969c0246e4aa33a51b274cc119f4702e03a1
+MISC ChangeLog 2285 RMD160 4512b07de84520b01e84871dc0eb95447e32df6f SHA1 e60a984788c71013c7c060b43bf58d22a1fcbe79 SHA256 20e2589c618c614985e4dd5d63c7722b4d9be58f7bd0628f28448ef3d7876d72
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium-bin/chromium-bin-0_p18366.ebuild b/www-client/chromium-bin/chromium-bin-0_p18366.ebuild
index 320725f76cf7..d130e67c8732 100644
--- a/www-client/chromium-bin/chromium-bin-0_p18366.ebuild
+++ b/www-client/chromium-bin/chromium-bin-0_p18366.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/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v 1.1 2009/06/14 20:49:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v 1.2 2009/06/17 16:14:23 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -60,10 +60,12 @@ src_install() {
 			einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin"
 			NSS_DIR=../../../opt/xulrunner
 			NSPR_DIR=../../../opt/xulrunner
-		else
+		elif has_version www-plugins/adobe-flash; then
 			einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash"
 			NSS_DIR=../../../opt/flash-libcompat
 			NSPR_DIR=../../../opt/flash-libcompat
+		else
+			die "One of these packages is needed: www-client/mozilla-firefox-bin, net-libs/xulrunner-bin, www-plugins/adobe-flash[32bit]"
 		fi
 
 	fi
diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild
index 630afc7d6379..81174b81f351 100644
--- a/www-client/chromium-bin/chromium-bin-9999.ebuild
+++ b/www-client/chromium-bin/chromium-bin-9999.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/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.9 2009/06/14 20:49:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.10 2009/06/17 16:14:23 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -64,10 +64,12 @@ src_install() {
 			einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin"
 			NSS_DIR=../../../opt/xulrunner
 			NSPR_DIR=../../../opt/xulrunner
-		else
+		elif has_version www-plugins/adobe-flash; then
 			einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash"
 			NSS_DIR=../../../opt/flash-libcompat
 			NSPR_DIR=../../../opt/flash-libcompat
+		else
+			die "One of these packages is needed: www-client/mozilla-firefox-bin, net-libs/xulrunner-bin, www-plugins/adobe-flash[32bit]"
 		fi
 
 	fi