From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9433B1393F1 for ; Tue, 15 Sep 2015 04:14:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F88F21C001; Tue, 15 Sep 2015 04:14:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C770F21C001 for ; Tue, 15 Sep 2015 04:14:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91810340AE2 for ; Tue, 15 Sep 2015 04:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5F57186 for ; Tue, 15 Sep 2015 04:14:01 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1442290438.80bc02f4a7cc7e9ab3c52891748709575b3ec494.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi/files/, www-client/vivaldi/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch www-client/vivaldi/vivaldi-1.0.275.3_p1.ebuild X-VCS-Directories: www-client/vivaldi/files/ www-client/vivaldi/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 80bc02f4a7cc7e9ab3c52891748709575b3ec494 X-VCS-Branch: master Date: Tue, 15 Sep 2015 04:14:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0377b390-fdca-4c19-be99-3f0be258f7de X-Archives-Hash: 39b7369df94d35bc464203520a4749ab commit: 80bc02f4a7cc7e9ab3c52891748709575b3ec494 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Sep 15 04:13:38 2015 +0000 Commit: Jeroen Roovers gentoo 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 \