Version bump

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

3 files changed, 45 insertions, 13 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index b9005413900d..c84de43ebb89 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2009/06/17 16:14:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.10 2009/06/24 09:38:40 voyageur Exp $
+
+*chromium-bin-0_p19106 (24 Jun 2009)
+
+  24 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-bin-0_p17935.ebuild, +chromium-bin-0_p19106.ebuild:
+  Version bump
 
   17 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
   chromium-bin-0_p18366.ebuild, chromium-bin-9999.ebuild:
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index ec32294915c4..d622346904bd 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,8 +1,8 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
-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
+DIST chromium-bin-19106.zip 14909004 RMD160 894a13a2a89f891f41a816776ad31833173a5316 SHA1 fbf92e05c9b74c29092849c21f978a47d49124bd SHA256 a94e2969548be7a2c1bd95465545390b7b19ea783d5df8c8afc00e57296fc486
 EBUILD chromium-bin-0_p18366.ebuild 3227 RMD160 17e30c3801eab0b5d77ec1b30c657eaee050343a SHA1 28176281948709aacc98c564034456a9ca7834d8 SHA256 4b9ef2b37ccd7d4bcfedebb74efb5d71e2ca24feffea35280f76eef939d150da
+EBUILD chromium-bin-0_p19106.ebuild 3227 RMD160 0155c5640f1e792ff13981e3c5e8201249bd9fc9 SHA1 e426b6559cd360a107521d54f18ba1afcb745374 SHA256 b9dfbd08005ce2b27f6ce5d99643871cbb06311048fe6e7edbc7b0709faba946
 EBUILD chromium-bin-9999.ebuild 3364 RMD160 376318dc7e8eeb42078f71243935c7bca1ad2898 SHA1 445a47f7bb85f4e7edc1108aaa2badac85677862 SHA256 0ecfb3ca61d744c724180a8c0786969c0246e4aa33a51b274cc119f4702e03a1
-MISC ChangeLog 2285 RMD160 4512b07de84520b01e84871dc0eb95447e32df6f SHA1 e60a984788c71013c7c060b43bf58d22a1fcbe79 SHA256 20e2589c618c614985e4dd5d63c7722b4d9be58f7bd0628f28448ef3d7876d72
+MISC ChangeLog 2459 RMD160 52e1e415d7eb74398745a2f726cae395a31b09e4 SHA1 53e32f307c24df293d0be49eab8b64f059e35c33 SHA256 26a2559f8fd51919aaa1b4c4514ffbae58667cb0fd5e2f457f5513735e9a0ab0
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium-bin/chromium-bin-0_p17935.ebuild b/www-client/chromium-bin/chromium-bin-0_p19106.ebuild
index 929f4d291240..606573e23b79 100644
--- a/www-client/chromium-bin/chromium-bin-0_p17935.ebuild
+++ b/www-client/chromium-bin/chromium-bin-0_p19106.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_p17935.ebuild,v 1.1 2009/06/09 09:01:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p19106.ebuild,v 1.1 2009/06/24 09:38:40 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -17,13 +17,23 @@ SLOT="0"
 KEYWORDS="-* ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-libs/nspr-4.7
-	>=dev-libs/nss-3.12
-	gnome-base/gconf
-	media-fonts/corefonts
+AMD64_DEPEND="amd64? (
+	|| ( www-plugins/adobe-flash[32bit]
+		www-client/mozilla-firefox-bin
+		net-libs/xulrunner-bin )
+	>=app-emulation/emul-linux-x86-gtklibs-20081109
+	app-emulation/emul-linux-x86-soundlibs
+	)"
+
+DEPEND="app-arch/unzip
+	${AMD64_DEPEND}"
+RDEPEND="media-fonts/corefonts
 	>=sys-devel/gcc-4.2
-	x11-libs/pango"
+	x86? ( >=dev-libs/nspr-4.7
+		>=dev-libs/nss-3.12
+		gnome-base/gconf
+		x11-libs/pango )
+	${AMD64_DEPEND}"
 
 S=${WORKDIR}
 
@@ -40,9 +50,25 @@ src_install() {
 	if use x86; then
 		NSS_DIR=../../../usr/$(get_libdir)/nss
 		NSPR_DIR=../../../usr/$(get_libdir)/nspr
+	elif use amd64; then
+		# amd64: we still miss gconf
+		if has_version www-client/mozilla-firefox-bin; then
+			einfo "Using NSS/NSPR libraries from www-client/mozilla-firefox-bin"
+			NSS_DIR=../../../opt/firefox
+			NSPR_DIR=../../../opt/firefox
+		elif has_version net-libs/xulrunner-bin; then
+			einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin"
+			NSS_DIR=../../../opt/xulrunner
+			NSPR_DIR=../../../opt/xulrunner
+		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
-	# amd64: firefox-bin, xulrunner-bin, adobe-flash[32bit] could
-	# provide these, but we miss gconf
 
 	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d
 	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d