Version bump for dev channel release.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

3 files changed, 42 insertions, 16 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f71f33c4b84d..dc7ed73abee3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.478 2011/10/26 23:24:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.479 2011/10/28 02:23:53 floppym Exp $
+
+*chromium-16.0.912.15 (28 Oct 2011)
+
+  28 Oct 2011; Mike Gilbert <floppym@gentoo.org> +chromium-16.0.912.15.ebuild,
+  -chromium-16.0.912.4.ebuild:
+  Version bump for dev channel release.
 
 *chromium-15.0.874.106 (26 Oct 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 101df0dc0875..f8782ba16871 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,20 +15,20 @@ DIST chromium-15.0.874.100.tar.bz2 151359223 RMD160 7afc1d06ec17233621f4eb27d932
 DIST chromium-15.0.874.102.tar.bz2 151371123 RMD160 dfca6a43e773666334c5a40d50fc86c5ee3c335b SHA1 961392fbde1f99a40b860454565e8be3b752a3cf SHA256 63c94003a2152d9b7ec51e9126d6848c3d1ec7088ba6879f47f4b594b00ad878
 DIST chromium-15.0.874.106.tar.bz2 151367039 RMD160 853dc23730a821d51e32e19fd9fc2173dbd2d038 SHA1 424a6b76a93dfdf1cf2fb153041ecdf9f9533c2c SHA256 07d216782b20513d3550e6a2388d31784740264ba6977d66617058687885becf
 DIST chromium-16.0.912.12.tar.bz2 154564973 RMD160 219b54529981a44d263518247c6cd7c3379c6c1b SHA1 9bd700be444edf6769ce8428174d00b2519d48ff SHA256 9c67182ce2a77cc9bae62ace8b8985bf3deb5066e6fb5fc40a0dcd5e3dc737c7
-DIST chromium-16.0.912.4.tar.bz2 154512361 RMD160 8819d50c05b4eae4da7f70010d9af6251499dfd2 SHA1 aace46aef9e57880efa6e73b3f7943e46e1bef28 SHA256 18456509f7d33cc988fde4ad3fe1498ff54aa7c383285ce4422a7bf539eaf156
+DIST chromium-16.0.912.15.tar.bz2 154090158 RMD160 f630f6602fe18f873edc8a5c957ff720d81814c7 SHA1 67f973ac0088d40803ebd8c47fff432e2adcf818 SHA256 c95b7edf5eea8ad5fa0d9a648a1d3eb63f290e91c9508bb3f6be4186f2e8bc02
 EBUILD chromium-14.0.835.202.ebuild 13789 RMD160 7a3c1f7d22f9285e5f89ec3a557d5dbf7e7cb118 SHA1 bc2a1024a5c347b283c4d932f7c2fcb29d24b64a SHA256 3b81df285e1053d7b7850edb5fcc79523f79ed236a269d1ca55c60df4d8338bb
 EBUILD chromium-15.0.874.100.ebuild 14256 RMD160 0ccedd6afe484844a8bc32753dbbc025c6772c59 SHA1 151dec37489bb19c546309d773b2cea3cc9df62d SHA256 99b66cc4eae4cb903db33bee80fdd666853b36139a9db86eac8272589921233a
 EBUILD chromium-15.0.874.102.ebuild 14142 RMD160 1c4a9330122e3ca2ec2ea7f5d8c6549ac0fb4481 SHA1 f1db9ed04c432ca6db1a5a8b4d460f6252c1bf5e SHA256 22c8518b24468e1a81a8eaf98d94c47b0c76873ddaa8b8c7f54aef198713135f
 EBUILD chromium-15.0.874.106.ebuild 14143 RMD160 ef3a52d44e4777aee44e2b835b234189fd381f00 SHA1 c0b6f25b143c90bc59f6a150371bdd6f8ce2b095 SHA256 e3ad615781dfa2b208054a6627378df0fc16f919c594823dc9f44d4fbee10665
 EBUILD chromium-16.0.912.12.ebuild 16453 RMD160 008d8dfad41de45b1e10149b85e764e587040160 SHA1 cea18d7ecfa11935d0ebbc420405f5c762453689 SHA256 529e13335db4087e0b6e5369cf9db0786f0e5e657866ca8ed08d650be8b4bf6a
-EBUILD chromium-16.0.912.4.ebuild 15480 RMD160 960ac59265d804d5aef7e12024a3645e4f674128 SHA1 5c90f0d0f5a3a09d5d8374edc1d9c5c289045926 SHA256 378b74a63774420eb7c14708712feded7bc6e141cc2eb2cb9708fbaa9933510d
+EBUILD chromium-16.0.912.15.ebuild 16450 RMD160 ce2f17b49ed4f0dc5bb5fc3553d6d9fa36c3ddc2 SHA1 6324be31c5deb73096490563dc6000941c3f22f9 SHA256 02a864acb63e408050a49ab7c94dc25485ae9b966aaefd487e6a1be56e4dcbc8
 EBUILD chromium-9999-r1.ebuild 18324 RMD160 b3264ec9143e0f372a3701db033a5d01020771a0 SHA1 541c77000cf9f931deeedaa5fbf8cf0e96de061b SHA256 e2f3cd6325774da624866c58e0d202d7ac79d2e167915483d0919036902fd7d1
-MISC ChangeLog 105557 RMD160 420bac82ece2fb8ae9136387b26bd91caf831997 SHA1 9b46f0ea785b7075be95c46ab9a3c7e5b52d2fae SHA256 b7d679c95036dc435dbef02e834528652823fe24c0163bae949442ce3adf47ca
+MISC ChangeLog 105745 RMD160 3d938a2025bf697601873eaa4e3eb575b2652be0 SHA1 cac45e803d854500eef30d7cb5e747c6e655fedc SHA256 bee75b32d3b89346e6a6053291c5758f5ebd6cd962906d45a929f1866446781c
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6olrQACgkQC77qH+pIQ6TdjwD9FRZTSgXKjWzh/LQGr0hDCwmN
-o3bpx8I4r704XVnlBroBAJl2ngM2j7hQC/ScrYxl1jMwp54x+mobPSBxOndmt/Vf
-=cdcQ
+iF4EAREIAAYFAk6qEkMACgkQC77qH+pIQ6S6zwEAoJkE9BLwerlnw/ojPoyROKoV
+FaouemttnktoTnbrIRoA/jXvldVKPpzINzqnCs5SH1P1u6KFzX+PEqvwioxYJ6IR
+=tQqs
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-16.0.912.4.ebuild b/www-client/chromium/chromium-16.0.912.15.ebuild
index 3da4104b001e..93cc91586aa0 100644
--- a/www-client/chromium/chromium-16.0.912.4.ebuild
+++ b/www-client/chromium/chromium-16.0.912.15.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-16.0.912.4.ebuild,v 1.2 2011/10/24 14:20:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.15.ebuild,v 1.1 2011/10/28 02:23:53 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -148,7 +148,12 @@ chromium-pkg_die() {
 }
 
 pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
@@ -382,12 +387,20 @@ src_install() {
 	esac
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
 
 	# It is important that we name the target "chromium-browser",
 	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
 	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
 
 	# Allow users to override command-line options, bug #357629.
 	dodir /etc/chromium || die
@@ -439,8 +452,8 @@ src_install() {
 	doins -r out/Release/locales || die
 	doins -r out/Release/resources || die
 
-	newman out/Release/chrome.1 chromium.1 || die
-	newman out/Release/chrome.1 chromium-browser.1 || die
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
@@ -453,11 +466,14 @@ src_install() {
 	for SIZE in 16 22 24 32 48 64 128 256 ; do
 		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
 		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
-			chromium-browser.png || die
+			chromium-browser${CHROMIUM_SUFFIX}.png || die
 	done
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	make_desktop_entry chromium-browser "Chromium" chromium-browser \
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
 		"Network;WebBrowser" \
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
@@ -466,7 +482,11 @@ src_install() {
 	if use gnome; then
 		dodir /usr/share/gnome-control-center/default-apps || die
 		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium-browser.xml || die
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
 	fi
 }