Change way how bundled libraries are removed (whitelisting instead of blacklisting).

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 95 insertions, 93 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0e235ee44184..bf3a3471b91d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.256 2011/01/09 15:52:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.257 2011/01/10 09:44:20 phajdan.jr Exp $
+
+*chromium-10.0.628.0-r1 (10 Jan 2011)
+
+  10 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-10.0.612.1-r1.ebuild, +chromium-10.0.628.0-r1.ebuild,
+  chromium-9999.ebuild:
+  Change way how bundled libraries are removed (whitelisting instead of
+  blacklisting).
 
   09 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-10.0.628.0.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5aa54025ab7b..905fb8be4b8f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,16 +12,15 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a
 AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda
 AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
-DIST chromium-10.0.612.1.tar.bz2 143485277 RMD160 396eaeb7d25ddb9b372be52d93a1de65ab646edf SHA1 96085dfee33727ff121d955dc093f3e293a7d1dc SHA256 dc1e0ccf1e56f5111acfb0686283bd2e8557a94513c9087a00910408f8fe89e4
 DIST chromium-10.0.628.0.tar.bz2 143344367 RMD160 7a1233c286d35fce6817f524ec4aa3e5489fee7e SHA1 ee59d656b6a4c9611be6eea2eec7f2f21b804406 SHA256 d1803cb73311b8aedf091844373246a6687d1f4af1e22c39aff2ced9c4979e0c
 DIST chromium-8.0.552.224.tar.bz2 135345394 RMD160 e7bed4bc0b4d851e83bfc351ceca9af4ae739dad SHA1 4544ec2f753893e9a5426e4bad353bad8fd25f8a SHA256 c10b5f7cbafbc430ba25f6cdc00af5c86c6216b280101df2036a89474b75a848
 DIST chromium-9.0.597.44.tar.bz2 141943121 RMD160 0536ea24b5f40393989900d0109a5c3b7bf50ab9 SHA1 5b0b465bdf22c9fd64f8139af1d8ffd12f67b198 SHA256 ac03a34e6143bf66d3869e37d908177e96a0523918ba9330a14a5d4739c01c30
 DIST chromium-9.0.597.45.tar.bz2 141958182 RMD160 d2d006d61ea704252cdaa198a7624bd674ead942 SHA1 d011dec2ce9c3c88a417ded3400870eb79e947da SHA256 08a3282e0a69033848a1acc6f091528b5fceb31b3804cd4ba377e31b6fea7336
-EBUILD chromium-10.0.612.1-r1.ebuild 10784 RMD160 f3d9fc79812392c738a993b32e76def2d1029a1b SHA1 fd1c45b979cda406b39c1a136fc258309fcbe842 SHA256 172c86c8f646e078e95e8cfb964ca5bef9effac2e11684ccf74e282defeabc06
+EBUILD chromium-10.0.628.0-r1.ebuild 10492 RMD160 e0c59baf75a983c46c6924b887b3eaac0d73e44d SHA1 4940c863c121e0c8f2a6ded724ee57f9764fcdbf SHA256 47fb9a9f6021feaab779b1dabdbc46a9df4fc2eddd453e51244a80f153a7d7d9
 EBUILD chromium-10.0.628.0.ebuild 10386 RMD160 9b37c5a5649d1f4ff1a72c9565ef838c04b9226f SHA1 8ea4ffa994a3f30cef8601196b1f412221ff92b0 SHA256 7ff190eef133f715d70ed51eec51972cf7ba0ee0e6bcd7a5ff43b72b1095c227
 EBUILD chromium-8.0.552.224.ebuild 8606 RMD160 da7aba06f58b5f00f49fa2b5377be60f986ea7b4 SHA1 3c7127b56601c7db9684d561fffed18ed1246fd4 SHA256 5b4ca0dcf464bd316fd5d8ea36f10a2553748d0df821eed8a026a03c5f0e943f
 EBUILD chromium-9.0.597.44.ebuild 9305 RMD160 791a327c54533213806655b081ec0be8f39b1f70 SHA1 8c66db48740c8be913b43bf85b323ab07397e315 SHA256 8c930d64e9574a20bb9bc06e32816e8551b48fcc5a2a88b95427418c235a415a
 EBUILD chromium-9.0.597.45.ebuild 9305 RMD160 0911dc68d0b5bd73da5c25714867d287f8e9c53d SHA1 cc0d6e42421a4be60d038a2657cf9570475e46a9 SHA256 ca5b912d704634fe7083141035265ed775a3bb30e16c0294cf0506b4d36a8af6
-EBUILD chromium-9999.ebuild 11829 RMD160 f724d758da83ab315f63dbd8896449a0e2d5a02e SHA1 bee75a332eab27aa5c2ce8d1f9b3a94b38967106 SHA256 2536ca0371c1818230bb6bbd1987afbf82cce3c2dc33ee6102a7d2b452b55ef6
-MISC ChangeLog 56701 RMD160 a7a7a8e6a5d185532b069e13da8bac3c953a6083 SHA1 09f22bd26b614de75a2a9446545e2ed861c4a943 SHA256 c05a0f5f0f5bf5e1512c7ee20cfe77e8fde1772358539dbd009b9e874114e040
+EBUILD chromium-9999.ebuild 11928 RMD160 59d0a4773e024031c1fca913dd0a1d7745416618 SHA1 52b4a9a74c3675dff0464b0138844681141afa3d SHA256 f547b789f5e0fdb6d06e6f1a3d6d8ad4cee2d19b1db1c542a979ed04d15d806a
+MISC ChangeLog 56975 RMD160 291e0422a14b83c2103f233b934d675882668b39 SHA1 a3fca79efa2c0c9bdb2683b3fc943fd011d09e7e SHA256 00b45edeb0d5bcae51d798011702148a89f8bbfc278fa8ea48b1bbd5b2fcc307
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.612.1-r1.ebuild b/www-client/chromium/chromium-10.0.628.0-r1.ebuild
index 5390c23ad9a9..a8add6585034 100644
--- a/www-client/chromium/chromium-10.0.612.1-r1.ebuild
+++ b/www-client/chromium/chromium-10.0.628.0-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.612.1-r1.ebuild,v 1.2 2011/01/02 15:31:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.628.0-r1.ebuild,v 1.1 2011/01/10 09:44:20 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
+V8_DEPEND="3.0.4.1"
 
 inherit eutils flag-o-matic multilib pax-utils portability python \
 	toolchain-funcs versionator virtualx
@@ -21,7 +22,7 @@ RDEPEND="app-arch/bzip2
 	system-sqlite? (
 		>=dev-db/sqlite-3.7.2[fts3,icu,secure-delete,threadsafe]
 	)
-	system-v8? ( >=dev-lang/v8-3.0.0.1 )
+	system-v8? ( >=dev-lang/v8-${V8_DEPEND} )
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
@@ -64,19 +65,6 @@ egyp() {
 	"${@}"
 }
 
-get_installed_v8_version() {
-	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
-}
-
-remove_bundled_lib() {
-	local out
-	out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
 pkg_setup() {
 	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
 
@@ -112,51 +100,58 @@ pkg_setup() {
 
 src_prepare() {
 	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
+	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r1.patch
 
 	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch
-
-	epatch "${FILESDIR}"/${PN}-system-icu-r2.patch
+	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
 
 	epatch "${FILESDIR}"/${PN}-system-speex-r0.patch
 
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/icu"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libvpx"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/speex"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/yasm"
-	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libwebp/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/xdg-utils/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
 
 	# Provide our own gyp file that links with the system speex.
 	# TODO: move this upstream.
 	cp "${FILESDIR}"/speex.gyp third_party/speex || die
 
+	# Check for the maintainer to ensure that the dependencies
+	# are up-to-date.
 	local v8_bundled="$(v8-extract-version v8/src/version.cc)"
-	if use system-v8; then
-		local v8_installed="$(get_installed_v8_version)"
-		einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-		version_is_at_least "${v8_bundled}" "${v8_installed}" || die
-	else
-		einfo "Bundled V8 version: ${v8_bundled}"
+	if [ "${V8_DEPEND}" != "${v8_bundled}" ]; then
+		die "update v8 dependency to ${v8_bundled}"
 	fi
 
 	if use system-sqlite; then
-		remove_bundled_lib "third_party/sqlite/src"
-		remove_bundled_lib "third_party/sqlite/preprocessed"
+		# Remove bundled sqlite, preserving the shim header.
+		find third_party/sqlite -type f \! -iname '*.gyp*' \
+			\! -path 'third_party/sqlite/sqlite3.h' \
+			-delete || die
 	fi
 
 	if use system-v8; then
@@ -164,7 +159,8 @@ src_prepare() {
 		# TODO: move this upstream.
 		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
 
-		remove_bundled_lib "v8"
+		# Remove bundled v8.
+		find v8 -type f \! -iname '*.gyp*' -delete || die
 
 		# The implementation files include v8 headers with full path,
 		# like #include "v8/include/v8.h". Make sure the system headers
@@ -276,13 +272,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake chrome chrome_sandbox base_unittests net_unittests \
-		BUILDTYPE=Release V=1 || die
+	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
 	if use test; then
-		emake base_unittests net_unittests \
-			BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base_unittests,net_unittests}
+		emake base_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/base_unittests
 	fi
 }
 
@@ -297,11 +291,9 @@ src_test() {
 		die "locale ${mylocale} is not supported"
 	fi
 
-	# Make test failures non-fatal for now. This needs more investigation.
+	# For more info see bug #350347.
 	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
-		|| eerror "base_unittests failed"
-	LC_ALL="${mylocale}" maketype=out/Release/net_unittests virtualmake \
-		|| eerror "net_unittests failed"
+		'--gtest_filter=-ICUStringConversionsTest.*' || die
 }
 
 src_install() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 0bc20e43fe69..551e6561700d 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.122 2011/01/09 15:52:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.123 2011/01/10 09:44:20 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -109,15 +109,6 @@ egyp() {
 	"${@}"
 }
 
-remove_bundled_lib() {
-	local out
-	out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
-		|| ewarn "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		ewarn "no files matched when removing bundled library $1"
-	fi
-}
-
 pkg_setup() {
 	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
 
@@ -160,33 +151,44 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-system-speex-r0.patch
 
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/icu"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libvpx"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/speex"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/yasm"
-	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libwebp/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/xdg-utils/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
 
 	# Provide our own gyp file that links with the system speex.
 	# TODO: move this upstream.
 	cp "${FILESDIR}"/speex.gyp third_party/speex || die
 
 	if use system-sqlite; then
-		remove_bundled_lib "third_party/sqlite/src"
-		remove_bundled_lib "third_party/sqlite/preprocessed"
+		# Remove bundled sqlite, preserving the shim header.
+		find third_party/sqlite -type f \! -iname '*.gyp*' \
+			\! -path 'third_party/sqlite/sqlite3.h' \
+			-delete || die
 	fi
 
 	if use system-v8; then
@@ -194,7 +196,8 @@ src_prepare() {
 		# TODO: move this upstream.
 		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
 
-		remove_bundled_lib "v8"
+		# Remove bundled v8.
+		find v8 -type f \! -iname '*.gyp*' -delete || die
 
 		# The implementation files include v8 headers with full path,
 		# like #include "v8/include/v8.h". Make sure the system headers