Version bump

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 18 insertions, 102 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index aae8eefbad5b..2b10a195f180 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.15 2009/07/17 15:37:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.16 2009/07/23 14:38:55 voyageur Exp $
+
+*chromium-bin-0_p21377 (23 Jul 2009)
+
+  23 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-bin-0_p20016.ebuild, -chromium-bin-0_p20377.ebuild,
+  +chromium-bin-0_p21377.ebuild:
+  Version bump
 
 *chromium-bin-0_p20951 (17 Jul 2009)
 
diff --git a/www-client/chromium-bin/chromium-bin-0_p20377.ebuild b/www-client/chromium-bin/chromium-bin-0_p20377.ebuild
deleted file mode 100644
index 09a7ea30e78c..000000000000
--- a/www-client/chromium-bin/chromium-bin-0_p20377.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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_p20377.ebuild,v 1.1 2009/07/10 17:13:12 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-0_p20016.ebuild b/www-client/chromium-bin/chromium-bin-0_p21377.ebuild
index 1c13090786b1..3b85edf21c2c 100644
--- a/www-client/chromium-bin/chromium-bin-0_p20016.ebuild
+++ b/www-client/chromium-bin/chromium-bin-0_p21377.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_p20016.ebuild,v 1.1 2009/07/07 08:52:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p21377.ebuild,v 1.1 2009/07/23 14:38:55 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -39,6 +39,14 @@ S=${WORKDIR}
 
 QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome"
 
+# Ogg/Theora/Vorbis-only FFmpeg binaries
+QA_TEXTRELS="opt/chromium.org/chrome-linux/libavcodec.so.52
+	opt/chromium.org/chrome-linux/libavformat.so.52
+	opt/chromium.org/chrome-linux/libavutil.so.50"
+QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libavcodec.so.52
+	opt/chromium.org/chrome-linux/libavformat.so.52
+	opt/chromium.org/chrome-linux/libavutil.so.50"
+
 pkg_setup() {
 	# This is a binary x86 package
 	has_multilib_profile && ABI="x86"
@@ -87,7 +95,7 @@ src_install() {
 	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
+	make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/lib:${CHROMIUM_HOME}/chrome-linux
 	newicon "${FILESDIR}"/chromium.png ${PN}.png
 	make_desktop_entry chromium-bin "Chromium" ${PN}.png "Network;WebBrowser"
 }