Version bump, prepare ebuild for plugins support (symlink to nsbrowser ones)

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

4 files changed, 121 insertions, 5 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index ff9a4e5a4edf..b5d335f04b1c 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2009/06/28 22:45:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.12 2009/06/30 11:40:28 voyageur Exp $
+
+*chromium-bin-0_p19580 (30 Jun 2009)
+
+  30 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-bin-0_p19580.ebuild, chromium-bin-9999.ebuild:
+  Version bump, prepare ebuild for plugins support (symlink to nsbrowser
+  ones)
 
   28 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -chromium-bin-0_p18366.ebuild:
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 37a84bd2f291..016c5c46d3ea 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,6 +1,8 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
 DIST chromium-bin-19106.zip 14909004 RMD160 894a13a2a89f891f41a816776ad31833173a5316 SHA1 fbf92e05c9b74c29092849c21f978a47d49124bd SHA256 a94e2969548be7a2c1bd95465545390b7b19ea783d5df8c8afc00e57296fc486
+DIST chromium-bin-19580.zip 15011701 RMD160 8712c40dcb7246452531675145dd60ccd18fc301 SHA1 3c487671941541a5d1f35117d4dc77a7405ac619 SHA256 9a4e1eef16283d77aab7da3a6e4da430254c2583aae3fd789d7839a8006ee937
 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 2600 RMD160 002ebcc63624354934752bf900d54c5e55ebd90e SHA1 0cd2d1b731630de9af99605a641b15b91b34d9a8 SHA256 a12712dbcbc55cb66690ac80ea1bc42d6b589416b8e4a894701e17d6c7387b11
+EBUILD chromium-bin-0_p19580.ebuild 3406 RMD160 20969b31aa50f30a75852b665f5a58545884c728 SHA1 8a84646465284eaa799c4e4599c6501233118601 SHA256 0dd017f7fd555ec0cb875f0589bdb4f67092a193253df3c7adc5e30f8f5026d3
+EBUILD chromium-bin-9999.ebuild 3543 RMD160 311d063104a07f453417546962f2928fbec3f0bf SHA1 8a6f6b78941bbe8c5e7cf3fdffff57ce965902ad SHA256 00a388b634e40d37d6105dbb6f9394b0e49c8863d71cf6df7e795f307a545b6c
+MISC ChangeLog 2834 RMD160 195e89f7cfe31be14b66f5fb00186579aef52fcf SHA1 de428969ede5a205032071bf321896bf2030a659 SHA256 f434578e9aa4172332cf88de70ea28ee6565e42993c62133e0d00530adb2da96
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium-bin/chromium-bin-0_p19580.ebuild b/www-client/chromium-bin/chromium-bin-0_p19580.ebuild
new file mode 100644
index 000000000000..59af7333f51b
--- /dev/null
+++ b/www-client/chromium-bin/chromium-bin-0_p19580.ebuild
@@ -0,0 +1,99 @@
+# 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_p19580.ebuild,v 1.1 2009/06/30 11:40:28 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib
+
+# Latest revision id can be found at
+# http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST
+MY_PV="${PV/0\_p}"
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://code.google.com/chromium/"
+SRC_URI="http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${MY_PV}/chrome-linux.zip -> ${PN}-${MY_PV}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE=""
+
+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
+	x86? ( >=dev-libs/nspr-4.7
+		>=dev-libs/nss-3.12
+		gnome-base/gconf
+		x11-libs/pango )
+	${AMD64_DEPEND}"
+
+S=${WORKDIR}
+
+QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome"
+
+pkg_setup() {
+	# This is a binary x86 package
+	has_multilib_profile && ABI="x86"
+}
+
+src_install() {
+	declare CHROMIUM_HOME=/opt/chromium.org
+
+	dodir ${CHROMIUM_HOME}
+	cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder"
+
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+
+	# Create symlinks for needed libraries
+	dodir ${CHROMIUM_HOME}/lib
+	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
+
+	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d
+	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d
+	dosym ${NSPR_DIR}/libplds4.so ${CHROMIUM_HOME}/lib/libplds4.so.0d
+	dosym ${NSS_DIR}/libnss3.so ${CHROMIUM_HOME}/lib/libnss3.so.1d
+	dosym ${NSS_DIR}/libnssutil3.so ${CHROMIUM_HOME}/lib/libnssutil3.so.1d
+	dosym ${NSS_DIR}/libsmime3.so ${CHROMIUM_HOME}/lib/libsmime3.so.1d
+	dosym ${NSS_DIR}/libssl3.so ${CHROMIUM_HOME}/lib/libssl3.so.1d
+
+	# Create chromium-bin wrapper
+	make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/lib
+	newicon "${FILESDIR}"/chromium.png ${PN}.png
+	make_desktop_entry chromium-bin "Chromium" ${PN}.png "Network;WebBrowser"
+}
+
+pkg_postinst() {
+	ewarn "This binary requires the C++ runtime from >=sys-devel/gcc-4.2"
+	ewarn "If you get the \"version \`GLIBCXX_3.4.9' not found\" error message,"
+	ewarn "switch your active gcc to a version >=4.2 with gcc-config"
+}
diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild
index 81174b81f351..e839f2f823f5 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.10 2009/06/17 16:14:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.11 2009/06/30 11:40:28 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -35,6 +35,11 @@ S=${WORKDIR}
 
 QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome"
 
+pkg_setup() {
+	# This is a binary x86 package
+	has_multilib_profile && ABI="x86"
+}
+
 src_unpack() {
 	LV=`curl --silent http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST`
 	elog "Installing/updating to version ${LV}"
@@ -49,7 +54,10 @@ src_install() {
 	dodir ${CHROMIUM_HOME}
 	cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder"
 
-	# Create symbol links for necessary libraries
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+
+	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/lib
 	if use x86; then
 		NSS_DIR=../../../usr/$(get_libdir)/nss