EAPI=5. Consolidate code for the live ebuild.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

6 files changed, 110 insertions, 43 deletions

diff --git a/www-plugins/chrome-binary-plugins/ChangeLog b/www-plugins/chrome-binary-plugins/ChangeLog
index 0fd71d626c8f..c2965a1ef81e 100644
--- a/www-plugins/chrome-binary-plugins/ChangeLog
+++ b/www-plugins/chrome-binary-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/chrome-binary-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.174 2014/08/31 02:13:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.175 2014/08/31 23:11:41 floppym Exp $
+
+  31 Aug 2014; Mike Gilbert <floppym@gentoo.org>
+  chrome-binary-plugins-37.0.2062.94_p1.ebuild,
+  chrome-binary-plugins-38.0.2125.24_beta1.ebuild,
+  chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,
+  chrome-binary-plugins-9999.ebuild, metadata.xml:
+  EAPI=5. Consolidate code for the live ebuild.
 
 *chrome-binary-plugins-39.0.2138.3_alpha1 (31 Aug 2014)
 *chrome-binary-plugins-38.0.2125.24_beta1 (31 Aug 2014)
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild
index be02cb38191d..218714c95cd8 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v 1.3 2014/08/28 00:21:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v 1.4 2014/08/31 23:11:41 floppym Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib unpacker
 
@@ -10,7 +10,7 @@ DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
 HOMEPAGE="http://www.google.com/chrome"
 
 case ${PV} in
-	*_alpha*)
+	*_alpha*|9999*)
 		SLOT="unstable"
 		CHROMEDIR="opt/google/chrome-${SLOT}"
 		MY_PV=${PV/_alpha/-}
@@ -33,17 +33,19 @@ esac
 MY_PN="google-chrome-${SLOT}"
 MY_P="${MY_PN}_${MY_PV}"
 
+if [[ ${PV} != 9999* ]]; then
 SRC_URI="
 	amd64? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
 	)
 	x86? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
 	)
 "
+KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="google-chrome"
-KEYWORDS="~amd64 ~x86"
 IUSE="+flash"
 RESTRICT="bindist mirror strip"
 
@@ -60,6 +62,15 @@ pkg_nofetch() {
 	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
 }
 
+if [[ ${PV} == 9999* ]]; then
+src_unpack() {
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
+}
+fi
+
 src_install() {
 	local version flapper
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild
index 38d77bb38e77..4bdbf5221418 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v 1.1 2014/08/31 02:13:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v 1.2 2014/08/31 23:11:41 floppym Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib unpacker
 
@@ -10,7 +10,7 @@ DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
 HOMEPAGE="http://www.google.com/chrome"
 
 case ${PV} in
-	*_alpha*)
+	*_alpha*|9999*)
 		SLOT="unstable"
 		CHROMEDIR="opt/google/chrome-${SLOT}"
 		MY_PV=${PV/_alpha/-}
@@ -33,17 +33,19 @@ esac
 MY_PN="google-chrome-${SLOT}"
 MY_P="${MY_PN}_${MY_PV}"
 
+if [[ ${PV} != 9999* ]]; then
 SRC_URI="
 	amd64? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
 	)
 	x86? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
 	)
 "
+KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="google-chrome"
-KEYWORDS="~amd64 ~x86"
 IUSE="+flash"
 RESTRICT="bindist mirror strip"
 
@@ -60,6 +62,15 @@ pkg_nofetch() {
 	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
 }
 
+if [[ ${PV} == 9999* ]]; then
+src_unpack() {
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
+}
+fi
+
 src_install() {
 	local version flapper
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
index 0598b41063c4..ba533af11dce 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v 1.1 2014/08/31 02:13:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v 1.2 2014/08/31 23:11:41 floppym Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib unpacker
 
@@ -10,7 +10,7 @@ DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
 HOMEPAGE="http://www.google.com/chrome"
 
 case ${PV} in
-	*_alpha*)
+	*_alpha*|9999*)
 		SLOT="unstable"
 		CHROMEDIR="opt/google/chrome-${SLOT}"
 		MY_PV=${PV/_alpha/-}
@@ -33,17 +33,19 @@ esac
 MY_PN="google-chrome-${SLOT}"
 MY_P="${MY_PN}_${MY_PV}"
 
+if [[ ${PV} != 9999* ]]; then
 SRC_URI="
 	amd64? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
 	)
 	x86? (
-		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
 	)
 "
+KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="google-chrome"
-KEYWORDS="~amd64 ~x86"
 IUSE="+flash"
 RESTRICT="bindist mirror strip"
 
@@ -60,6 +62,15 @@ pkg_nofetch() {
 	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
 }
 
+if [[ ${PV} == 9999* ]]; then
+src_unpack() {
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
+}
+fi
+
 src_install() {
 	local version flapper
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
index 771c3f360f97..955af5d5969e 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
@@ -1,21 +1,52 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.13 2014/08/08 02:26:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.14 2014/08/31 23:11:41 floppym Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib unpacker
 
 DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
 HOMEPAGE="http://www.google.com/chrome"
-SLOT="unstable"
-URI_BASE="https://dl.google.com/linux/direct/"
-URI_BASE_NAME="google-chrome-${SLOT}_current_"
-SRC_URI="" # URI is left blank on live ebuild
+
+case ${PV} in
+	*_alpha*|9999*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_alpha/-}
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_beta/-}
+		;;
+	*_p*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV/_p/-}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+if [[ ${PV} != 9999* ]]; then
+SRC_URI="
+	amd64? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="google-chrome"
-KEYWORDS="" # KEYWORDS is also left blank on live ebuild
-IUSE="+flash +pdf"
+IUSE="+flash"
 RESTRICT="bindist mirror strip"
 
 for x in 0 beta stable unstable; do
@@ -24,30 +55,27 @@ for x in 0 beta stable unstable; do
 	fi
 done
 
-S="${WORKDIR}/opt/google/chrome-${SLOT}"
+S="${WORKDIR}/${CHROMEDIR}"
 QA_PREBUILT="*"
 
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+if [[ ${PV} == 9999* ]]; then
 src_unpack() {
-	# We have to do this inside of here, since it's a live ebuild. :-(
-
-	if use x86; then
-		G_ARCH="i386";
-	elif use amd64; then
-		G_ARCH="amd64";
-	else
-		die "This only supports x86 and amd64."
-	fi
-	wget "${URI_BASE}${URI_BASE_NAME}${G_ARCH}.deb"
-	unpack_deb "./${URI_BASE_NAME}${G_ARCH}.deb"
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
 }
+fi
 
 src_install() {
 	local version flapper
 
 	insinto /usr/$(get_libdir)/chromium-browser/
 
-	use pdf && doins libpdf.so
-
 	if use flash; then
 		doins -r PepperFlash
 
diff --git a/www-plugins/chrome-binary-plugins/metadata.xml b/www-plugins/chrome-binary-plugins/metadata.xml
index e75f0ade7570..08d7051fa90d 100644
--- a/www-plugins/chrome-binary-plugins/metadata.xml
+++ b/www-plugins/chrome-binary-plugins/metadata.xml
@@ -7,7 +7,6 @@
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
 	<use>
-		<flag name="pdf">Install Chrome's native PDF reader plugin.</flag>
-		<flag name="flash">Install Chrome's native Pepper Flash.</flag>
+		<flag name="flash">Install Chrome's native Pepper Flash</flag>
 	</use>
 </pkgmetadata>