Migrate beta and unstable slots to separate packages, bug 498306.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 233 insertions, 1 deletions

diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index b32f7401f0c1..ac43df349815 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST google-chrome-beta_33.0.1750.29-1_amd64.deb 49990926 SHA256 12b589e772d803bd6e0752fe3ba74459b49c428963f9fd8d4ba24c72360df0f8 SHA512 2fc0178eb9a55d52a0363793740473fffea6e5ba4bc94aa2c983d49874f984e85e2c658c4f7806f8bef63a383038e099051c3f312d0f0531fa365605180ed160 WHIRLPOOL 0823be775cbce01e5ca101f8e1acdd37041243203d1578c37716e7e6682fddd50740a7891adf2a99cb67e53aa6f9630f5203de7f7b717ad1f0c8fb8780b7cffa
 DIST google-chrome-beta_33.0.1750.29-1_i386.deb 47579380 SHA256 e2d2f66d68a495eee236b6a142f783e506c8f7e2197bba37104c7620992d9178 SHA512 8cd342d3547b479be3b70ac6f579b38a9255f97cdff1f981cbcc9d44d71b8a521e5c6c8feecb1a33bdbf526fbf4304f67c8095b5cd95fdef665d1e028d7216b5 WHIRLPOOL 933fd97f911de5c1a5d9df941dd39e9903a5928c153016a3234d52f729572379fc203b6faceb0430cdec4be3dedfa431d5ed3bd813f65c2c60b46ef287f07205
 DIST libgcrypt.so.11.8.2-amd64.xz 211916 SHA256 b83ef0cae62318f1c60c464daf8cfd77c35e4d931d8be79490098cc494ba2c00 SHA512 d350c0e78185b142434cd26887eebdf3d836e2e3e2c4114c5571f0f4f23daebb65875195779c95b3b8ca88a77bfa01009cb1e08bc79b45705978dae70bd4f03f WHIRLPOOL 4e1f9b55765a2c40e54e79d0c7ab53645fbc25417bde2d511f91858d068fd8cba83eb76ca716e2a51dc4c2ed3d887e55f53391c3a38edc9fb6e18c6ac420117e
 DIST libgcrypt.so.11.8.2-x86.xz 210568 SHA256 cc3223c2edc6ed9c1fca7a198c0444d752685553319245618252594c01958049 SHA512 3ae308c0842f7d188c73933d9ab52cb3186310eb7225b9bbaee05596b70431c8ab52d1723611a7db51d5d9e4e3ec9b9f69836ce0f4b394f9b3ec148da82b1176 WHIRLPOOL 4b34cd97a5925dc54e5fa4d42d447e490ae2334efec6d25822095c7869b7bdf89c64cc9a43ff7440955e49300c0e2a69f73137c0f2c44cbf7aa9babf6679708f
-EBUILD google-chrome-beta-33.0.1750.29_p1.ebuild 4757 SHA256 30b7644b990913405a6ac754210c221b4d3b1afbe899e236d35890f3ac7e9072 SHA512 a10b75a9a49b67fdbc592b9bda948b832a29e31e97c00b8b21f99210b4af72ade543ef9509182685fdc5f656e2015f33020cf253b9ad4cfaa6ba52f41a6926a8 WHIRLPOOL 92abfbd6d014f0edb70b0d2491624f469348df346a814f84479745310d98ace83cdcafa73875981d7e96b02793a4228155f311bf291819eb921b81f08cbb2887
+EBUILD google-chrome-beta-33.0.1750.29_p1.ebuild 4764 SHA256 fc1edde3d0a0bdf3e3c2765a1432d5bd8ee0a9e642a2a813357bbe56e3c66f7b SHA512 54cdd8d9495454f5345bb4511afecfa1c7bbff6961d26250eb4f7c413ebd398bc0ed4ed65e3d54aafd81438aa4121f2bda8069dd29b230ab51f1e0e60305188d WHIRLPOOL bf591ace7a626efbcbb871f317c96d325a5f33f5ccb85b3354f2155a35a7cc3a1ea5b07bec7f83bcc0e68570bef0e88bdda4a33f170341460bb50b4b73b4bc85
+MISC ChangeLog 461 SHA256 d102ee50d8938c35913739c0936b8a33e1fd692685b3a961636d249e63ac0734 SHA512 8f6f6b168a2a9eeac662f9f7eb4fbd3beaae3adbe60e972c3ec42132274f55e9c2f4c06c910d1e28bb5f3c00e2ded5ef9f1b12ebdfc17b6638db2dea4e413910 WHIRLPOOL 4b54e94778acba8d60616bfb8fb8dc9062234318ccca9a24530cf2bfb935d7fe8b2cdfe44e80ef8fe5c66b2e7c73c162ca04886c66c33962e8287d13caa49692
 MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlLbHJgACgkQC77qH+pIQ6RlJwD/V6+L+8gLm6DIdtkKsD4yFDKg
+jULYXw0dyJUgWe4hM/IBAKCQ24vgucN5DzWaX+K7fPyfWGYYusVvAYQ6phwnO8Lw
+=6sRg
+-----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome-beta/google-chrome-beta-33.0.1750.29_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-33.0.1750.29_p1.ebuild
new file mode 100644
index 000000000000..dd9b876fd4db
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-33.0.1750.29_p1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-33.0.1750.29_p1.ebuild,v 1.1 2014/01/19 00:30:15 floppym Exp $
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="http://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+# Bundle a copy of libgcrypt, bug 494596
+LIBGCRYPT="libgcrypt.so.11.8.2"
+
+SRC_URI="
+	amd64? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+		http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz
+	)
+	x86? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+		http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libgcrypt
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-print/cups
+	sys-apps/dbus
+	>=sys-devel/gcc-4.4.0[cxx]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+if [[ ${PN} == google-chrome ]]; then
+	RDEPEND+="
+		!www-client/google-chrome:beta
+		!www-client/google-chrome:stable
+		!www-client/google-chrome:unstable
+	"
+fi
+
+for x in google-chrome{,-beta,-unstable}; do
+	if [[ ${PN} != ${x} ]]; then
+		RDEPEND+=" !www-client/${x}"
+	fi
+done
+unset x
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-base/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+	rm -r usr/share/menu || die
+	rmdir usr/share/doc/google-chrome || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/google-chrome" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" google-chrome.png
+	done
+
+	insinto /
+	doins -r opt usr
+
+	fperms 755 "/${CHROME_HOME}"/{{,google-}chrome,nacl_helper{,_bootstrap},xdg-{mime,settings}}
+	fperms 4755 "/${CHROME_HOME}/chrome-sandbox"
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+	dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
+
+	insinto "${CHROME_HOME}"
+	newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-beta/metadata.xml b/www-client/google-chrome-beta/metadata.xml
new file mode 100644
index 000000000000..b6a2d8a0f044
--- /dev/null
+++ b/www-client/google-chrome-beta/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		Google Chrome is a browser that combines a minimal design with
+		sophisticated technology to make the web faster, safer, and easier.
+	</longdescription>
+	<use>
+		<flag name="plugins">Add system plugins path to launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/google-chrome-unstable/ChangeLog b/www-client/google-chrome-unstable/ChangeLog
new file mode 100644
index 000000000000..44f7da8c9b2c
--- /dev/null
+++ b/www-client/google-chrome-unstable/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for www-client/google-chrome-unstable
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/ChangeLog,v 1.1 2014/01/19 00:30:38 floppym Exp $
+
+*google-chrome-unstable-34.0.1788.0_p1 (19 Jan 2014)
+
+  19 Jan 2014; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-unstable-34.0.1788.0_p1.ebuild, +metadata.xml:
+  Migrate beta and unstable slots to separate packages, bug 498306.
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
new file mode 100644
index 000000000000..10f88a276195
--- /dev/null
+++ b/www-client/google-chrome-unstable/Manifest
@@ -0,0 +1,6 @@
+DIST google-chrome-unstable_34.0.1788.0-1_amd64.deb 47538220 SHA256 67b1df8e2bf0bf7b29127994a62b45d4cf0d8b19d42bc354f4abf87cfb1b620c SHA512 3f70b990f717de9923217d0204ee3c7238f61f985cf67514ad0b7809b3a81dbae7f39be2a96dbc4e2be8aa3764b17441320fc8bcb54b2ebbc5334cb9728a6bf4 WHIRLPOOL ff9141a842bc4dce48823b10d15340440fdc4732fbfaa3050fcf88ba9ac96a0727c265dd6ffa6f66e41054907377717e431ffb195064f47bd1970298c0ab9c67
+DIST google-chrome-unstable_34.0.1788.0-1_i386.deb 47846906 SHA256 8e0c0923c4c077236f989ae3263526eb77dc2798ddcb8d30884873347ec5a9e9 SHA512 b475e33a23b042fc02230c12eaed32ee28cce88177334ab2d5f0be65cd8016d9c283524f37f83b22ecd6d53e6324b767cbd35146a058fa633d508ee481b6926e WHIRLPOOL 48fdb94f29251b5dc6a6b3c7667548feebd02546d4ec5d743f2ae8ced91459161fe80b198a03f4667a65891327f10129bb60a97160377e6d77d4bb463cebfbec
+DIST libgcrypt.so.11.8.2-amd64.xz 211916 SHA256 b83ef0cae62318f1c60c464daf8cfd77c35e4d931d8be79490098cc494ba2c00 SHA512 d350c0e78185b142434cd26887eebdf3d836e2e3e2c4114c5571f0f4f23daebb65875195779c95b3b8ca88a77bfa01009cb1e08bc79b45705978dae70bd4f03f WHIRLPOOL 4e1f9b55765a2c40e54e79d0c7ab53645fbc25417bde2d511f91858d068fd8cba83eb76ca716e2a51dc4c2ed3d887e55f53391c3a38edc9fb6e18c6ac420117e
+DIST libgcrypt.so.11.8.2-x86.xz 210568 SHA256 cc3223c2edc6ed9c1fca7a198c0444d752685553319245618252594c01958049 SHA512 3ae308c0842f7d188c73933d9ab52cb3186310eb7225b9bbaee05596b70431c8ab52d1723611a7db51d5d9e4e3ec9b9f69836ce0f4b394f9b3ec148da82b1176 WHIRLPOOL 4b34cd97a5925dc54e5fa4d42d447e490ae2334efec6d25822095c7869b7bdf89c64cc9a43ff7440955e49300c0e2a69f73137c0f2c44cbf7aa9babf6679708f
+EBUILD google-chrome-unstable-34.0.1788.0_p1.ebuild 4816 SHA256 2f3bd6bf6eaf1a3e73483143c0d088e481aa86ffd76d6f9d818acd7f275c2bd2 SHA512 81a1d4180cfeb4591648a7e5454248686ce3e4be64d5390a90adcf52b401c0a02a4fab08869efff074a2dbba95dca4a51ae184d40fe2082b37221fa3bb00e40f WHIRLPOOL b3d3562fac1f91853d9929e55cd49282c4a976a7692fd4cb8577951d25f5c40fc46efdb51ed7d5d932ba4d3e38bd1aa6c9175b5977d0e0892c855fe6139075fc
+MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129