www-client/vivaldi: Version bump.

Package-Manager: portage-2.2.23

3 files changed, 25 insertions, 13 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index fbc382ff6683..7445cb8f242f 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.303.40_p1-amd64.deb 41795562 SHA256 3550e902a5246ded926266248882f4ae921d42783b50c9b619a688f383baa28a SHA512 1af1e63034d4e8aad4a45cb114adc11dd43f42e339cbb6170ce6923cd9495ec53da59ab81c89e732fcd59428ade5eb98d5931ddbf8c8ad90984caabcd213c8e9 WHIRLPOOL 54e492562b8348fc87297adb0166af18ac1d93702eb124bde878970a39e85d7c3b43d2bda3abc8bc5218bbc077a5fd92ff3431c5d988eaf2667ea5f87a3de12a
-DIST vivaldi-1.0.303.40_p1-i386.deb 42289384 SHA256 559e14b38c45929557527c708adc3291b92248bbe008ac88b435e64a8bb4161f SHA512 66ea0a253f02c024fd4be6f62728a4ac6468989dbf51991b945366c74c5cbb086fddde09b84e4250c5ee423c20b721726c7f6311e1a78595cd48e47b103bc192 WHIRLPOOL a06ce50c21bf0af0c808e5f32d864bd5958969f2104ddf0e740f6b0bf29d2f12c6c0e1469f84c24f48b9c0cc38d31495559cdff5bedee2370d0902c0027099e9
 DIST vivaldi-1.0.303.48_p1-amd64.deb 41856320 SHA256 4025ebdee426c3778c891ecb4d63fc4081ed71b129d433334e364621e8f764a8 SHA512 59a0af1731ad3afc3550a1bf4b013b04622fa47be3ca1d857527d5e391724bf400ab227ccc88ffb03f4b673167134ef733c22c1cc6fcacda480914348befac9c WHIRLPOOL 6f511de2fd90163db3d91b51e78d489d3e276d5a8fbfe73deeefe8672a8e28f0351f7f7c1a66ebd190a4f5fded4bac475f491c037113f6c06316e612a99a78fd
 DIST vivaldi-1.0.303.48_p1-i386.deb 42360320 SHA256 69cae26c2a5bd9b0995a17aaa5f44f04057624b4906a294f6ebc0af30ee9b9af SHA512 f4da47fa16adabd42bb82d8e485013d2f6af95ccd35e90ad3697d85d382e0389503ed61d113f17db76cbca99f556b2496e94cec53f00f485460ee6782ae72733 WHIRLPOOL 1691e15fb187a401f712072247b0d35433c604e4c27a8831a447f36e2593fcfb360ce2594e535444f9bd3923bab68863b80e02107822e405939e7a34cd5789eb
+DIST vivaldi-1.0.303.52_p2-amd64.deb 42361274 SHA256 46214288da69c9af47a2706a73d2a3b698246b860032b1440e5bf0ca434829dd SHA512 e5b99d49a48203267a8b9cf9474f83be60e2695eebead67747982f5dca5c00d63804d40ec969cb615f2518969766dbb991e65b86a2aca27d7a37c1e673935e7b WHIRLPOOL 7156122b87be6b50c8a262065a8ad65c421b046cf5a72aef6bd60ee05dd77c02b9b6b001267f1ea1c0d37daab525947b18145ee488a5967a6640776e1e8e3fe7
+DIST vivaldi-1.0.303.52_p2-i386.deb 42823058 SHA256 74c90c34ef63007c8f552edac2bd6d072ee9497d972a3a4ed717f5240979a7b2 SHA512 cdfba84f63627b248bf7e2cecd6175bb20372baca6c6100c31a38672e36c4467e334db6ecba9261e3932ba4d61171138f3e86464b1fd0939ff8da58fe3e28786 WHIRLPOOL a8fe24279f99bcfcb5522259034965894d5631862a1b83b2871f288e4539b725c37cebde845b426a438fe9db884e8626c7e7436ab40e1d559fe62ddbc6dc340c
diff --git a/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch b/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch
new file mode 100644
index 000000000000..813a52897fbc
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch
@@ -0,0 +1,11 @@
+--- a/opt/vivaldi-beta/vivaldi-beta
++++ b/opt/vivaldi-beta/vivaldi-beta
+@@ -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/@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.303.40_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.303.52_p2.ebuild
index c40dd917fbf3..6328c59a67b5 100644
--- a/www-client/vivaldi/vivaldi-1.0.303.40_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.303.52_p2.ebuild
@@ -12,7 +12,7 @@ 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/-}_"
+VIVALDI_BASE_URI="${HOMEPAGE}download/${PN}-beta_${PV/_p/-}_"
 SRC_URI="
 	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
 	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
@@ -59,30 +59,31 @@ RDEPEND="
 
 QA_PREBUILT="*"
 S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
+VIVALDI_HOME="opt/${PN}-beta"
 
 src_unpack() {
 	unpack_deb ${A}
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
+	epatch "${FILESDIR}"/${PN}-1.0.303.52_p2-flash.patch
+
 	sed -i \
 		-e "s|@LIBDIR@|$(get_libdir)|g" \
-		opt/vivaldi-snapshot/vivaldi-snapshot || die
+		opt/vivaldi-beta/vivaldi-beta || die
 
 	sed -i \
-		-e 's|vivaldi-snapshot|vivaldi|g' \
-		usr/share/applications/${PN}-snapshot.desktop \
-		usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+		-e 's|vivaldi-beta|vivaldi|g' \
+		usr/share/applications/${PN}-beta.desktop \
+		usr/share/xfce4/helpers/${PN}-beta.desktop || die
 
-	mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+	mv usr/share/doc/${PN}-beta usr/share/doc/${PF} || die
 
-	rm etc/cron.daily/${PN}-snapshot || die
+	rm etc/cron.daily/${PN}-beta || die
 	rmdir etc/cron.daily/ || die
 	rmdir etc/ || die
 
-	rm usr/bin/${PN}-snapshot || die
+	rm usr/bin/${PN}-beta || die
 	rm _gpgbuilder || die
 
 	local c d
@@ -101,7 +102,7 @@ src_prepare() {
 
 src_install() {
 	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+	dosym /${VIVALDI_HOME}/${PN}-beta /usr/bin/${PN}
 
 	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
 }