www-client/vivaldi: Fix path to libpepflashplayer.so for x86

Package-Manager: portage-2.2.23

4 files changed, 5 insertions, 108 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index bbd1f3074c8b..e02f718eecad 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,2 @@
-DIST vivaldi-1.0.288.3_p1-amd64.deb 39924644 SHA256 86bee895601dbee6f3808b8846e65d2f6a786d2d0ea213c6767fdbea561c3480 SHA512 55919c588391d548f1623fdea43997da297e58f708bad742e8e3334945044dc8734729fbb3f5985c4ee5ccd8e3d8a07d8e94efffbabb16adada03beabb769465 WHIRLPOOL 06ff1132aeade8d1b1c2036be8d7e0a303196020bb75651a978a741cc72aa2531bb57030495f0fab06a7c7a880e26afaddcfdbc9fcb1e384518aa94cca4c4855
-DIST vivaldi-1.0.288.3_p1-i386.deb 40121952 SHA256 27f323d6c138cba6095dfa4dc17672096f421b02161c09d16394a70440242347 SHA512 4813f36cbe999a6d7a801667cb6093d2bb6289ba8c1221e427bd3ec459f07e44949494b3f9c1d41b013fb459dc07d5f641ad6f16423714d98d4b24de94bac013 WHIRLPOOL 7d01912f6f2f64285cfe6ebc330da68467996e387ed7373b814e77248ddf6d167b2b126836cf41c25f47dc0d4eb2986d4edacf994894d17c0993bf10f0978b02
 DIST vivaldi-1.0.291.18_p1-amd64.deb 40035786 SHA256 057fd309ac396dcb1170a83dcc0ea9d1804839e6846dd607d92189d25530ed08 SHA512 1fc5508aed4f850ecf097e0551b0342dca9f29745a2f6161301ef993f289eaa82a10538ba47c64e53bd0b85cf4c5ea3358f680811c7dfa30649f36993e4960c1 WHIRLPOOL dda5ce0c847c80ccfdb4b94a6421297cecb95e6da59e24986d6162dd8c51fb52601e3f3316fb5008b1f921bc0fae8f2301ecc1ba55f7440d361978755a9b0fbe
 DIST vivaldi-1.0.291.18_p1-i386.deb 40162732 SHA256 f66debe9282d34e56f2b9309bce0e9d5f3f002165dc16c3e1931b27edf12f261 SHA512 e5caf75aae4dac7054e79ba36604a32363550dd94da5eeb0f9a217d512058e368d81c2fb1ef3a050ce725acaa239a323d0450ee724d6b4c5e73ad7a109fe8216 WHIRLPOOL 22e0d087aeb4a2c66eadbb73fb3b827c9480df46e8f132e7e2605335118a70cdb041842da5f2c8f34c60f2bfbec18be3915071a747bacbf2bfc1cf819464cb21
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
index e1fc56f14236..ee8d0c736e2b 100644
--- 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
@@ -4,8 +4,8 @@
    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
++elif [ -f "/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
++  FLASH_PATH="/usr/@LIBDIR@/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.288.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
index 6378a5a54217..c40dd917fbf3 100644
--- a/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
@@ -67,6 +67,9 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
+	sed -i \
+		-e "s|@LIBDIR@|$(get_libdir)|g" \
+		opt/vivaldi-snapshot/vivaldi-snapshot || die
 
 	sed -i \
 		-e 's|vivaldi-snapshot|vivaldi|g' \
diff --git a/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild
deleted file mode 100644
index 6378a5a54217..000000000000
--- a/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
-	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 eutils multilib unpacker toolchain-funcs
-
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-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 \
-		usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
-
-	mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
-
-	rm etc/cron.daily/${PN}-snapshot || die
-	rmdir etc/cron.daily/ || die
-	rmdir etc/ || die
-
-	rm usr/bin/${PN}-snapshot || die
-	rm _gpgbuilder || die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}