Version bump. Remove old.

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

3 files changed, 22 insertions, 10 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index 3e05f20478c4..9b97760181f1 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.78 2010/10/20 14:26:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.79 2010/10/26 14:38:51 phajdan.jr Exp $
+
+*chromium-bin-7.0.517.41 (26 Oct 2010)
+
+  26 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-bin-6.0.472.62.ebuild, +chromium-bin-7.0.517.41.ebuild:
+  Version bump. Remove old.
 
 *chromium-bin-6.0.472.62-r1 (20 Oct 2010)
 
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 9ef9ca7428a4..4f1885f4f17a 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,7 +1,9 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
 DIST chromium-bin-amd64-6.0.472.62.tar.bz2 20616624 RMD160 58417f47c2e2435aae13859dfb663030e62d50b0 SHA1 5e33562bfa3e88171a313bae29064f4685f7cae5 SHA256 ebc12b6448acfd82c66799aba536607663de5b2b496ed2b3a882610884f8216b
+DIST chromium-bin-amd64-7.0.517.41.tar.bz2 16138022 RMD160 22ee1c671fc345e1a0eeea9c69756d888c581c0b SHA1 10f115eb92ccc655ecb54c0b764d97466e7c11c4 SHA256 3e36f6184ce166a3b9f37f128feed1ddd343e73e251d54172d0a7d88dfbe54c1
 DIST chromium-bin-x86-6.0.472.62.tar.bz2 19070916 RMD160 4b0156ea14cdcaf25c936023d9779243dc8bafe1 SHA1 6590e0b33e0d11f0a6ec3416aa6e80d9b3b13dfe SHA256 be0271428a1b61be9524346f413ccb3a9d2362165451c3be58c58d9b0339e621
+DIST chromium-bin-x86-7.0.517.41.tar.bz2 14647251 RMD160 b3a50d445aba5f9a5f4f1b1a170f7430c00cc2c4 SHA1 29a0d5ea2f0d4fc7ccf4454ce04963fcbdf8cdda SHA256 b22c7bc0e340f77aaadfb7e5670c28685f45b6582817bac9c03c09a01fcf6baf
 EBUILD chromium-bin-6.0.472.62-r1.ebuild 1903 RMD160 0a04480ef764385ee09b918e912f67ecf175b393 SHA1 099663e4fc8985adf64eeb044d7153c1bb42bba3 SHA256 950908b009430e6d56dce66a39c5bb2261e8e42c8af413220178bf5f7915a24c
-EBUILD chromium-bin-6.0.472.62.ebuild 1760 RMD160 c7ec1d8ee9e8ccecde2e8b3cd1f1f01d87d6f574 SHA1 edb23ab64b96f4359f527344113c695d5d99256c SHA256 15f389ef31e1b708ce56648652c88697f72a51d54f4fffdd8781857bcd1823fd
-MISC ChangeLog 18306 RMD160 2822b8f23e14225cee4cf843fca2c34dec98cd54 SHA1 60a55dcefc594d2c4bd6513e2850bbc9f32ff1a6 SHA256 f7bc76dfe5a5991aadcacbe20687a6c4c766d07f860504de2d3649bd4303fbfb
+EBUILD chromium-bin-7.0.517.41.ebuild 1922 RMD160 640a50d4fa1dde6e21b1ac78b63dff6861ed3546 SHA1 79d41c858389057ec92f811244d86e8847aff922 SHA256 853aed029abc6020b6993bae9715c090efdd159a0157334029eb9f3aa8d6064f
+MISC ChangeLog 18498 RMD160 61750b3823060c93bcf9a39b90ec85e98247c8c6 SHA1 21d5ce80f47bc714f8965b31fb5b92802283859f SHA256 a6ad31c4f86bc4c9c14e1acad79c4ade13b7f015e6bc795908ee06be84a304e5
 MISC metadata.xml 268 RMD160 9ff00833163599f39e038e1c8eeeb8fb26075eb5 SHA1 c4dbfb9b12c89298993a09c1253a50a103cd34a6 SHA256 077e9bbbea232ae4b86f8b50510c40c3494c5e8e4f9ea1600dc349abeb489580
diff --git a/www-client/chromium-bin/chromium-bin-6.0.472.62.ebuild b/www-client/chromium-bin/chromium-bin-7.0.517.41.ebuild
index 16485e5fe6b3..b243284c630f 100644
--- a/www-client/chromium-bin/chromium-bin-6.0.472.62.ebuild
+++ b/www-client/chromium-bin/chromium-bin-7.0.517.41.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-bin/chromium-bin-6.0.472.62.ebuild,v 1.1 2010/10/09 14:20:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-7.0.517.41.ebuild,v 1.1 2010/10/26 14:38:51 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -19,6 +19,7 @@ RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
 	dev-libs/expat
 	dev-libs/glib
+	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	>=dev-libs/nspr-4.7
 	>=dev-libs/nss-3.12.3
@@ -47,16 +48,19 @@ RDEPEND="app-arch/bzip2
 		x11-themes/xfce4-icon-theme
 	)"
 
-get_chromium_home() {
-	echo "/opt/chromium.org"
+pkg_setup() {
+	CHROMIUM_HOME="/opt/chromium.org"
 }
 
 src_install() {
-	dodir "$(get_chromium_home)" || die
-	insinto "$(get_chromium_home)"
-	cp -R usr/$(get_libdir)/chromium-browser/* "${D}/$(get_chromium_home)" || die
+	dodir "${CHROMIUM_HOME}" || die
+	insinto "${CHROMIUM_HOME}"
+	cp -R usr/$(get_libdir)/chromium-browser/* "${D}/${CHROMIUM_HOME}" || die
+
+	sed -e 's/chromium-chromium.desktop/chromium-bin-chromium-bin.desktop/g' \
+		-i "${D}/${CHROMIUM_HOME}/chromium-launcher.sh" || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-bin || die
 
-	make_wrapper chromium-bin ./chrome "$(get_chromium_home)"
 	newicon "${FILESDIR}"/chromium.png ${PN}.png
 	make_desktop_entry chromium-bin "Chromium (bin)" ${PN} "Network;WebBrowser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \