[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/

[Mike Gilbert]

commit:     4ae3820ffa40e093465d4759191b80efefbc991a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 16:00:16 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:00:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae3820f

www-plugins/chrome-binary-plugins: drop flash from stable

Package-Manager: portage-2.3.2

 .../chrome-binary-plugins-54.0.2840.59.ebuild        | 20 ++------------------
 www-plugins/chrome-binary-plugins/metadata.xml       |  1 -
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.59.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.59.ebuild
index 2757b38..c293b43 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.59.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.59.ebuild
@@ -34,7 +34,7 @@ SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd
 KEYWORDS="-* amd64"
 
 LICENSE="google-chrome"
-IUSE="+flash +widevine"
+IUSE="+widevine"
 RESTRICT="bindist mirror strip"
 
 for x in 0 beta stable unstable; do
@@ -51,29 +51,13 @@ pkg_nofetch() {
 }
 
 src_install() {
-	local version flapper
+	local version
 
 	insinto /usr/$(get_libdir)/chromium
-
 	if use widevine; then
 		doins libwidevinecdm.so libwidevinecdmadapter.so
 		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
 		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
 		doins widevine.version
 	fi
-
-	if use flash; then
-		doins -r PepperFlash
-
-		# Since this is a live ebuild, we're forced to, unfortuantely,
-		# dynamically construct the command line args for Chromium.
-		version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json)
-		flapper="${EPREFIX}/usr/$(get_libdir)/chromium/PepperFlash/libpepflashplayer.so"
-		echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash
-		echo -n "--ppapi-flash-path=$flapper " >> pepper-flash
-		echo "--ppapi-flash-version=$version\"" >> pepper-flash
-
-		insinto /etc/chromium/
-		doins pepper-flash
-	fi
 }

diff --git a/www-plugins/chrome-binary-plugins/metadata.xml b/www-plugins/chrome-binary-plugins/metadata.xml
index db13e56..0612d37 100644
--- a/www-plugins/chrome-binary-plugins/metadata.xml
+++ b/www-plugins/chrome-binary-plugins/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
 	<use>
-		<flag name="flash">Install Chrome's native Pepper Flash</flag>
 		<flag name="widevine">Install the Widevine DRM library</flag>
 	</use>
 </pkgmetadata>