summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-09-05 00:52:23 -0400
committerMike Gilbert <floppym@gentoo.org>2016-09-05 00:52:42 -0400
commitc52485a2413414510b9239a0b8e89bae5834c18d (patch)
treeed588e433db613a6917b23c3d7f5183af6f3154a /www-plugins/chrome-binary-plugins
parentsci-calculators/units: Drop unsupported patch. (diff)
downloadgentoo-c52485a2413414510b9239a0b8e89bae5834c18d.tar.gz
gentoo-c52485a2413414510b9239a0b8e89bae5834c18d.tar.bz2
gentoo-c52485a2413414510b9239a0b8e89bae5834c18d.zip
www-plugins/chrome-binary-plugins: change install location
Install in /usr/lib64/chromium, where they may be detected by QtWebEngine. Bug: https://bugs.gentoo.org/592896 Package-Manager: portage-2.3.0_p24
Diffstat (limited to 'www-plugins/chrome-binary-plugins')
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild7
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild9
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild6
3 files changed, 12 insertions, 10 deletions
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild
index 94dadcf272ee..2757b382dda9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild
@@ -53,10 +53,11 @@ pkg_nofetch() {
src_install() {
local version flapper
- insinto /usr/$(get_libdir)/chromium-browser/
+ insinto /usr/$(get_libdir)/chromium
if use widevine; then
- doins libwidevinecdm.so
+ 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
@@ -67,7 +68,7 @@ src_install() {
# 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-browser/PepperFlash/libpepflashplayer.so"
+ 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
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild
index 07c207f2a773..2757b382dda9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild
@@ -31,7 +31,7 @@ MY_PN="google-chrome-${SLOT}"
MY_P="${MY_PN}_${MY_PV}"
SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
LICENSE="google-chrome"
IUSE="+flash +widevine"
@@ -53,10 +53,11 @@ pkg_nofetch() {
src_install() {
local version flapper
- insinto /usr/$(get_libdir)/chromium-browser/
+ insinto /usr/$(get_libdir)/chromium
if use widevine; then
- doins libwidevinecdm.so
+ 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
@@ -67,7 +68,7 @@ src_install() {
# 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-browser/PepperFlash/libpepflashplayer.so"
+ 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
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild
index d7fd45a0099a..27b7eea178ed 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild
@@ -53,10 +53,10 @@ pkg_nofetch() {
src_install() {
local version
- insinto /usr/$(get_libdir)/chromium-browser/
-
+ insinto /usr/$(get_libdir)/chromium
if use widevine; then
- doins libwidevinecdm.so
+ 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