Bump, sync with VERSION file change in trunk svn

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

4 files changed, 217 insertions, 3 deletions

diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 0cf95c9b2184..9005a11e6484 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,7 +1,10 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
 DIST chromium-bin-amd64-27359.zip 22913797 RMD160 1a680f9c7f5c3622652ccda24d0d888fb89bbe94 SHA1 1ee3537428f00bb44f9f390298e57a2f26b13791 SHA256 13118fdbb66ab368f71f97daaba1b4381de89187823fd0d5b2f4fc2d86d4f449
+DIST chromium-bin-amd64-27967.zip 23585605 RMD160 28f0ad38398005699731b0627ebe0823a3852283 SHA1 599f51223d44f43af7df30ee372039d297ad3764 SHA256 86f5aed2eef9ba50d90613bc1fcdee948ff734722ca307d2e7da9d666c8b01bb
 DIST chromium-bin-x86-27359.zip 20927232 RMD160 4febb14d07b3906ee9d9e023f9fdfef4cb05b06a SHA1 54427a4b3b77bc52933ef388a6fc8e359db50c7e SHA256 f23c8844395228b931540efdf5ed6b304bdc30aab40c62438cea5d50e2881e04
+DIST chromium-bin-x86-27967.zip 21519217 RMD160 c4878fb34d2fe0337510c94f07e55c4bd2dc103e SHA1 3de7c9d024ea0e35fead021d848c8c9a812ee3b6 SHA256 e8dc8f8ee346a775bea1374d704970896d8a249ade917ea92109124653a28c51
 EBUILD chromium-bin-4.0.219.4_p27359.ebuild 3188 RMD160 4f3288858f2476ef01e5151497a287e82d6c23d1 SHA1 fc2bbe7855bb2ccac6d85428f2ea647efc022cbf SHA256 065cc0f7d490fd98b3476e03ef96cb84f24bea46ac0a371d84323dd17a0f1808
+EBUILD chromium-bin-4.0.221.5_p27967.ebuild 3188 RMD160 bc05610ad9fdc7f4f04c1d471c96a7e3910321ad SHA1 320573b043045ce25672a81dc724316fe10d1d5b SHA256 e0ecb71ef94231d75e608b487470fe726b75bbaf421daede81e493d90e5b220b
 EBUILD chromium-bin-9999.ebuild 3216 RMD160 8f0f25b83f2827248b3d36f3ad7a8f981710e2f7 SHA1 870d92b2ebe7dc5def102d3ed3762582ac02511c SHA256 aa1a3ef5c50d39443f73a7ac091fad7b4c8e60ff8d581be16a98977bd39927c8
-MISC ChangeLog 8342 RMD160 a1ab2b5958ad229c2fdc309c2838aea94a8bd5d4 SHA1 3a1745a60e2719cc191ab3f3c97bc35d3305bc75 SHA256 d31519cc0a6502c4e937eeb39fef238d9d7964604999ad7f76cdb476b31d6ec3
+MISC ChangeLog 8526 RMD160 bf5c52855be36a6b34f2232cb8dc755ada43108d SHA1 9acff53c62c5e202d8e030145737dce41a0c2be8 SHA256 2e89a3840c13a9882db117b3d05a7351fc78e45ab8b52b80a9a953f62a14e755
 MISC metadata.xml 423 RMD160 72f9e5ed12d956dc13010060e44cc23e87da0e18 SHA1 eea81a8e1114e539b3a9863a5d6dc4c725f05f57 SHA256 8d2b773ffe4a7a44e49ad05c0c171b6a6ab23eb1aa7027ea7e1904e853be9cea
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 856e574afc8e..43a559b62d1a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,8 +1,77 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.12 2009/10/02 14:29:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.13 2009/10/05 09:38:28 voyageur Exp $
+
+*chromium-4.0.221.5_p27967 (05 Oct 2009)
+
+  05 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.221.5_p27967.ebuild:
+  Bump, sync with VERSION file change in trunk svn
 
   02 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -chromium-4.0.212.0_p26805.ebuild, chromium-9999.ebuild:
   Fix compilation in new native client part
 
+*chromium-9999 (01 Oct 2009)
+
+  01 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-9999.ebuild:
+  Add live ebuild for those who wonder what to do of their free diskspace
+
+  30 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.212.0_p26805.ebuild, chromium-4.0.219.4_p27359.ebuild:
+  Fix desktop entry so xdg-open works correctly with chromium as default
+  browser
+
+*chromium-4.0.219.4_p27359 (28 Sep 2009)
+
+  28 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.219.4_p27359.ebuild:
+  Version bump, this finally fixes the useless automatic recreation of
+  ~/Downloads
+
+  23 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.212.0_p26805.ebuild:
+  Use bundled libevent until 1.4.13, per upstream advice
+
+  23 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.212.0_p26805.ebuild:
+  Correctly set revision for about box, install man page
+
+*chromium-4.0.212.0_p26805 (22 Sep 2009)
+
+  22 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.212.0_p26343.ebuild, +chromium-4.0.212.0_p26805.ebuild,
+  +files/chromium-use_system_libevent.patch:
+  Bump to fix truncated downloads, http://crbug.com/406 . Also use system
+  libevent
+
+  22 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.212.0_p26343.ebuild:
+  Fix .desktop entry as reported by nightmorph in bug #285922
+
+  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  files/chromium-launcher.sh:
+  Set CHROME_DESKTOP in the wrapper script
+
+*chromium-4.0.212.0_p26343 (16 Sep 2009)
+
+  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.210.0_p26329.ebuild, +chromium-4.0.212.0_p26343.ebuild:
+  Version number was incorrect (they really change it often!), grab a V8
+  crash fix on amd64 too
+
+  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/chromium-drop_sse2.patch, chromium-4.0.210.0_p26329.ebuild:
+  Forgot patch for x86 users, to prevent automatic enabling of
+  -march=pentium4 -msse2
+
+*chromium-4.0.210.0_p26329 (16 Sep 2009)
+
+  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.210.0_p26329.ebuild, +files/chromium-launcher.sh,
+  +metadata.xml:
+  Initial commit, ebuild py Pawel Hajdan Jr <phajdan.jr@chromium.org> and
+  me, bug #278975. Tarball hosted on gentoo mirrors until upstream makes
+  official ones available
+
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a43ceaeaa2f7..51dee2284602 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,7 +2,9 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb
 DIST chromium-4.0.219.4_p27359.tar.bz2 124727820 RMD160 c504b1c76703f006afc70432934d42ffc2c02fa6 SHA1 070859cf677c6d249455206d19eaf85cad7924cd SHA256 380d792ed4db3a43e151834e583f144263166e4ad09a2cfa00ad22a6a552e4c0
+DIST chromium-4.0.221.5_p27967.tar.bz2 130816527 RMD160 a9ff7d1ebd786cb062d3ee96be2f47c319bac744 SHA1 02f608abf24816733aff1aba350ee7c858c90ae8 SHA256 5757866a498c7225cb65ba1df14f4d2a7d8819e05ecc191965282ef4cef472b7
 EBUILD chromium-4.0.219.4_p27359.ebuild 4330 RMD160 6121148ae5a7f7ed875b0b3d511fc684390d90e5 SHA1 b674f50c891069dfc9035933c1b183768234e8d2 SHA256 656b8fbb1f7a067788019cbb68e90ed18f1f9dd1ef7ac59a6f6db4abb6551155
+EBUILD chromium-4.0.221.5_p27967.ebuild 4443 RMD160 8a87aecaf5119a575b217ffa65f7bf36601f4798 SHA1 a0ec0d099149f6d4541ac7041c046b2f3660eee9 SHA256 76b9e4d325943fda7c2db264379201acb42e90434fddcaaf2a28c513ff25d2e3
 EBUILD chromium-9999.ebuild 6038 RMD160 0b860ff0ef81908dd5639c747bbb8fd50207ea0c SHA1 636b9696628aa15bdd3ab86af465008aa935278e SHA256 b1e266b91cd88e9a8f704134561a9fa2c9fbd6855b5b401253c7a7e9236f50b1
-MISC ChangeLog 373 RMD160 4d9e835a36711c77cf659e6615d6b3e327c9e908 SHA1 96ebbe95ed43aa72ee4aa79d4fc740e79edf96bc SHA256 c89ee9cb50d1773f5069bc2584cb65baea2bf8ec3e07a10bce137736a4052003
+MISC ChangeLog 2889 RMD160 8ed748d26d3fad02faa62671dc4930d51a70c26c SHA1 89f4a7e8b6d0ab84daf093fad06244d5d582c32a SHA256 ae6bf2662def2dffb2fc34cb25f4f67d44f3ce7ba36ef963bea307d32f2e9ec6
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium/chromium-4.0.221.5_p27967.ebuild b/www-client/chromium/chromium-4.0.221.5_p27967.ebuild
new file mode 100644
index 000000000000..e9c068b9ae97
--- /dev/null
+++ b/www-client/chromium/chromium-4.0.221.5_p27967.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.221.5_p27967.ebuild,v 1.1 2009/10/05 09:38:28 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.2
+	>=gnome-base/gconf-2.24.0
+	media-fonts/corefonts
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-video/ffmpeg-0.5_p19787
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7"
+#	>=dev-libs/libevent-1.4.13
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23"
+
+export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+src_prepare() {
+	# Needed until we add back "rootdir=${S}", see below
+	for i in app webkit third_party/ffmpeg build/util \
+		base chrome v8/tools/gyp \
+		native_client/src/trusted/validator_*/ \
+		native_client/src/trusted/service_runtime/arch/*/
+	do
+		ln -s "${S}"/out ${i}/out
+	done
+
+	# Changing this in ~/include.gypi does not work
+	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
+	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
+	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	# Add configuration flag to use system libevent
+	epatch "${FILESDIR}"/${PN}-use_system_libevent.patch
+
+	# Display correct svn revision in about box
+	echo "${PV/[0-9.]*\_p}" > build/LASTCHANGE.in || die "setting revision failed"
+}
+
+src_configure() {
+	# CFLAGS/LDFLAGS
+	mkdir -p "${S}"/.gyp
+	cat << EOF > "${S}"/.gyp/include.gypi
+{
+	'target_defaults': {
+		'cflags': [ '${CFLAGS// /','}' ],
+		'ldflags': [ '${LDFLAGS// /','}' ],
+	},
+}
+EOF
+	export HOME="${S}"
+
+	# Configuration options (system libraries)
+	local myconf="-Duse_system_bzip2=1 -Duse_system_zlib=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1 -Dlinux_use_tcmalloc=1"
+	# -Duse_system_libevent=1: http://crbug.com/22140
+	# -Duse_system_sqlite=1 : http://crbug.com/22208
+	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
+
+	# Sandbox paths
+	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	if use amd64; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
+}
+
+src_compile() {
+	# Broken for "Argument list too long":
+	# http://code.google.com/p/chromium/issues/detail?id=19854
+	# http://code.google.com/p/gyp/issues/detail?id=71
+	# When this is fixed, remove the src_prepare symlinks
+	# and add back "rootdir=${S}"
+	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		|| die "compilation failed"
+}
+
+src_install() {
+	# Chromium does not have "install" target in the build system.
+
+	dodir ${CHROMIUM_HOME}
+
+	exeinto ${CHROMIUM_HOME}
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto ${CHROMIUM_HOME}
+	doins out/Release/chrome.pak
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+	doins -r out/Release/themes
+
+	newman out/Release/chromium-browser.1 chrome.1
+
+	# Chromium looks for these in its folder
+	# See media_posix.cc and base_paths_linux.cc
+	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
+	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
+}