commit: 80bc02f4a7cc7e9ab3c52891748709575b3ec494
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 04:13:38 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 04:13:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bc02f4
www-client/vivaldi: Add path to libpepflashplayer from
www-plugins/chrome-binary-plugins by Andreas Grapentin (bug #560260).
Package-Manager: portage-2.2.20.1
www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch | 11 +++++++++++
www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
new file mode 100644
index 0000000..e1fc56f
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
@@ -0,0 +1,11 @@
+--- a/opt/vivaldi-snapshot/vivaldi-snapshot
++++ b/opt/vivaldi-snapshot/vivaldi-snapshot
+@@ -85,6 +85,8 @@ elif [ -f "/usr/lib64/chromium/PepperFla
+ FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" #
openSuse 64-bit
+ elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
+ FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" #
ppa:skunk/pepper-flash
++elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ];
then
++ FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" #
www-plugins/chrome-binary-plugins
+ fi
+ if [ -f $FLASH_PATH ]; then
+ FLASH_VERSION=`grep -m 1 -a -o "LNX
[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c
5- | sed -e "s/,/./g"`
diff --git a/www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild
b/www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild
index 69c1403..6378a5a 100644
--- a/www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="
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 chromium multilib unpacker toolchain-funcs
+inherit chromium eutils multilib unpacker toolchain-funcs
DESCRIPTION="A new browser for our friends"
HOMEPAGE="http://vivaldi.com/";
@@ -66,6 +66,8 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
+
sed -i \
-e 's|vivaldi-snapshot|vivaldi|g' \
usr/share/applications/${PN}-snapshot.desktop \
