floppym 14/08/31 23:11:41
Modified: chrome-binary-plugins-9999.ebuild
chrome-binary-plugins-38.0.2125.24_beta1.ebuild
chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
chrome-binary-plugins-37.0.2062.94_p1.ebuild
metadata.xml ChangeLog
Log:
EAPI=5. Consolidate code for the live ebuild.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.14
www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?r1=1.13&r2=1.14
Index: chrome-binary-plugins-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chrome-binary-plugins-9999.ebuild 8 Aug 2014 02:26:33 -0000 1.13
+++ chrome-binary-plugins-9999.ebuild 31 Aug 2014 23:11:41 -0000 1.14
@@ -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 @@
fi
done
-S="${WORKDIR}/opt/google/chrome-${SLOT}"
+S="${WORKDIR}/${CHROMEDIR}"
QA_PREBUILT="*"
-src_unpack() {
- # We have to do this inside of here, since it's a live ebuild. :-(
+pkg_nofetch() {
+ eerror "Please wait 24 hours and sync your portage tree before
reporting fetch failures."
+}
- 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"
+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
insinto /usr/$(get_libdir)/chromium-browser/
- use pdf && doins libpdf.so
-
if use flash; then
doins -r PepperFlash
1.2
www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?r1=1.1&r2=1.2
Index: chrome-binary-plugins-38.0.2125.24_beta1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chrome-binary-plugins-38.0.2125.24_beta1.ebuild 31 Aug 2014 02:13:05
-0000 1.1
+++ chrome-binary-plugins-38.0.2125.24_beta1.ebuild 31 Aug 2014 23:11:41
-0000 1.2
@@ -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 @@
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 @@
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 @@
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
1.2
www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?r1=1.1&r2=1.2
Index: chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chrome-binary-plugins-39.0.2138.3_alpha1.ebuild 31 Aug 2014 02:13:05
-0000 1.1
+++ chrome-binary-plugins-39.0.2138.3_alpha1.ebuild 31 Aug 2014 23:11:41
-0000 1.2
@@ -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 @@
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 @@
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 @@
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
1.4
www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?r1=1.3&r2=1.4
Index: chrome-binary-plugins-37.0.2062.94_p1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chrome-binary-plugins-37.0.2062.94_p1.ebuild 28 Aug 2014 00:21:05
-0000 1.3
+++ chrome-binary-plugins-37.0.2062.94_p1.ebuild 31 Aug 2014 23:11:41
-0000 1.4
@@ -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 @@
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 @@
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 @@
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
1.2 www-plugins/chrome-binary-plugins/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 19 Oct 2012 20:10:37 -0000 1.1
+++ metadata.xml 31 Aug 2014 23:11:41 -0000 1.2
@@ -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>
1.175 www-plugins/chrome-binary-plugins/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.175&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.175&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?r1=1.174&r2=1.175
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog 31 Aug 2014 02:13:05 -0000 1.174
+++ ChangeLog 31 Aug 2014 23:11:41 -0000 1.175
@@ -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 <[email protected]>
+ 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)
