Version bump for dev channel release. Remove old.

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

4 files changed, 12 insertions, 149 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b4f6bc443295..6a974635550c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.40 2010/01/22 18:14:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.41 2010/01/22 21:38:44 phajdan.jr Exp $
+
+*chromium-4.0.302.2 (22 Jan 2010)
+
+  22 Jan 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-4.0.260.0.ebuild, -chromium-4.0.288.1.ebuild,
+  +chromium-4.0.302.2.ebuild:
+  Version bump for dev channel release. Remove old.
 
   22 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   -files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fcd7b34498aa..efebab949497 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,15 +2,13 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
 DIST chromium-4.0.249.43.tar.bz2 140438366 RMD160 3a95c9ed343008245000fb5e691091ac033c2e55 SHA1 d98cb7787433446946601ed4ff4577d0b1e5f46b SHA256 ea6da2353a2c2a8eae3b13b9b86e44308ea6ae1f62b9594c346846f69fec25d1
-DIST chromium-4.0.260.0.tar.bz2 134032408 RMD160 6b390458306572f473b4858c8a06fb9cf8f724e0 SHA1 896ffbc613b8d75aeee3de0b3839aee086755556 SHA256 d09986e89b431476005333d00a1bfb8b59f5c7edcaf3781e6a8251468786c7cc
 DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
-DIST chromium-4.0.288.1.tar.bz2 149595763 RMD160 7c2d9c87786da414038442518f6bff97f8ab1c99 SHA1 5d52c7ebafe5d87a7eae7844f5517c7a1e334c75 SHA256 bf74d9feaf54ea16c7dbf19c73928e6bf9da60257631d56a93ee39cb3a4e9551
 DIST chromium-4.0.295.0.tar.bz2 152197504 RMD160 6465221e9e34c700efabbccaa5757bacf2295a9e SHA1 457c79a72b90a1fe0037db6503b66a55c5c2a4e5 SHA256 d78a7cb0cdf6914fd9f87786a9fa792944a2446ce8b5a6124bedcddd2d3a4cb9
+DIST chromium-4.0.302.2.tar.bz2 153073484 RMD160 d275f05b7d628bb0948eb287a19eecde012b0127 SHA1 c9940df87f2f2941f28606fc57f764e165d36504 SHA256 5528e637e8521d01093d69f0e7e880dd898941616caa6d7a361d467031d0b62d
 EBUILD chromium-4.0.249.43.ebuild 4329 RMD160 c376ce69855d3b3b34df647689c72a2161170ecb SHA1 3aa0961adabedb34855736d0bda03b70b2258fbf SHA256 230bac6158556b40f8b0cf4e7ae50ae0180c581c171807c71fd27cb69b8871de
-EBUILD chromium-4.0.260.0.ebuild 4313 RMD160 b45d7b31a069df89c7bc9d5d89888af61058712d SHA1 02046c43a7fad0ca11c165f0ba2d00d2012b6233 SHA256 d240bf5a799e91f1460e6d19c332708d5e9f6034a9046db075502a1e7cd5607e
 EBUILD chromium-4.0.266.0.ebuild 4596 RMD160 9e975c79949c3a24430c43390e2baf9350b9abad SHA1 42ebf7b5a4130cb32980235daefff6555206335e SHA256 53d361d33220915add11b5b0c391a5507dc82cf83d2abf104132e05f4dea2ee2
-EBUILD chromium-4.0.288.1.ebuild 4596 RMD160 f7b9802cf9e2de8b212d107426ed431ef80df18c SHA1 aa13168a6dbe7d5bcce3fd34395d5136423519a0 SHA256 51a5a417b7925e39bbdf5b6b2567e7c1d0c507f1b5f5f0306b3f3827ffc5c7e1
 EBUILD chromium-4.0.295.0.ebuild 4486 RMD160 d8a9372d1d84c332b22b74114323c149eb15e099 SHA1 8016c1f3692427504d8e52b24a348e78fb5faf91 SHA256 1f1ed1203d285754041add21ec9e2a2146bca5564163581c491e34a159dcf58a
+EBUILD chromium-4.0.302.2.ebuild 4489 RMD160 79cb9c0e2da0dfb6d7059c0ab621f09393a5133e SHA1 4b007cc7d37c45f5865b92fd5e5a2328dab5d224 SHA256 6f4666aafed7f5f3a7c563763aa05f0845ec8e30b0a2f7a639bec9f249c6e2d2
 EBUILD chromium-9999.ebuild 6175 RMD160 a5c0078c49a35a0b69fe49087f3fa7f2d41e8085 SHA1 156f77395d60ab728f411b25768556b701ab97d9 SHA256 9d4ce427d9255ad1cb64cee929515357da82e55f0016c9e6acc4aeec4bda19fb
-MISC ChangeLog 8843 RMD160 abdf27fc95768aed12b767da4555b0b7d1e51c62 SHA1 88e7089720a1d648efd3038ea4fc1e225be0f77b SHA256 394fb73e546c698db7c2eff13cf559590b7a2f654eb23b7cdf416daf04990381
+MISC ChangeLog 9077 RMD160 8a69cead2f54f9913910e816852cc157757c626f SHA1 83d35c0e36fb8eb8b7e07e0bdb84a85eac425b88 SHA256 e50bb479854582f39667b1105c261ffd68ec4ce92725366d47ffa07483013c52
 MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
diff --git a/www-client/chromium/chromium-4.0.260.0.ebuild b/www-client/chromium/chromium-4.0.260.0.ebuild
deleted file mode 100644
index d4e9cc0bddd2..000000000000
--- a/www-client/chromium/chromium-4.0.260.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.5 2010/01/13 12:15:45 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="+ffmpeg"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	media-fonts/corefonts
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg
-	media-libs/libpng
-	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
-#	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() {
-	# Gentoo uses .kde4, not .kde
-	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-		|| die "kde proxy sed failed"
-	# 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-1.4.13.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
-		|| die "zlib sed 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_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
-	# -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() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		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
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	if use ffmpeg; then
-		# 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}
-	fi
-
-	# 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"
-}
diff --git a/www-client/chromium/chromium-4.0.288.1.ebuild b/www-client/chromium/chromium-4.0.302.2.ebuild
index 14986dfa5530..0ef5e785a076 100644
--- a/www-client/chromium/chromium-4.0.288.1.ebuild
+++ b/www-client/chromium/chromium-4.0.302.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.288.1.ebuild,v 1.3 2010/01/18 19:41:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.1 2010/01/22 21:38:44 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -47,8 +47,6 @@ src_prepare() {
 	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-1.4.13.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \