[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/, www-client/vivaldi-snapshot/files/

[Jeroen Roovers]

commit:     bff01dc11e387f5e970a68facda7144c79d08b99
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 18:27:06 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:36:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff01dc1

www-client/vivaldi-snapshot: Version bump.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-client/vivaldi-snapshot/Manifest               |   2 +
 .../vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch |  27 ++++++
 .../vivaldi-snapshot-1.12.955.3_p1.ebuild          | 105 +++++++++++++++++++++
 3 files changed, 134 insertions(+)

diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 5f2b2ca85cf..e6de24697de 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,3 +2,5 @@ DIST vivaldi-snapshot-1.12.947.3_p1-amd64.deb 52732106 SHA256 45acc962addc873743
 DIST vivaldi-snapshot-1.12.947.3_p1-i386.deb 53760034 SHA256 7988ed563abbe017134e55414e5d3720d33de9d26ba26542934d07c34d5080b3 SHA512 a9a958fc87b347d2ae339f93aeeaa05727d2a2f64668190ce0751ff2cfaedfdc37db369a224f98862b1baf0f3379b19fb6379d7adae66307a84b4e53bf397bb6 WHIRLPOOL 3bce70d9c72b2e2135b1db3800e7e5cfc136d228d752578fdcccf232f3cf340adf15971ef36e95a8de1ffe615c6abb9d3e33da8c0b293d215956dea3cd75d5b7
 DIST vivaldi-snapshot-1.12.953.8_p1-amd64.deb 53568350 SHA256 c4e1b3d5d4bda706c7b1e9aa02a18721ee11adf783e369b18fd21c17843483bf SHA512 57e7eaed0e9b35c241fd50b3a2eda4a15c04412af675066847aef615f323d9c44a0e68b54406ff6a2d8a0135004baae58622c7500d961b9922532696a39b65a5 WHIRLPOOL cf19e2f9d640d8ee9f1c174f286f92a434c9bf4e5af8e5b9c20b146d234a56c9c301bf27d92d8b64765b247705bbc1ff3735185ad44398dbac0fa9e5ced5cdf3
 DIST vivaldi-snapshot-1.12.953.8_p1-i386.deb 54870104 SHA256 2dd9e81cbdb1485e18f05ef4369456ae01c6db1b98cf4c903a2be6c451692393 SHA512 404fa87770951c1d979902233b102ceb7ef0c9585754a673604baef708edab9938a989a90a221b9285a3b5538b40e330cb72f1a677693125ece1cbf480f9822b WHIRLPOOL be39a1c15985e57df0d2fff550b23e876142757328f00e4854ae9cd2d04f36bac1944ac4ffc66f8c97130a21dbad964c20c3d4d7426a4f74d66245fd6778b51a
+DIST vivaldi-snapshot-1.12.955.3_p1-amd64.deb 53594844 SHA256 51e7fce2f83344c2d74f863c8f59d614edba707e44cdbbec103367b28ab544e1 SHA512 01dba2f51be2fb1a80c80a7196fcfe0ac12d4e2b5e195351408468461d0b9f2343a0e9d22792c8aa761c3ecf413e7b98b38dfeef9832d00212b2ab835a3e33d2 WHIRLPOOL cc9dd2a39277523427f5e992384e75bb15e652e134268f9eefcff3ccf4f5712feb1fc07ae97677281283f92a64eab42102fff5965e9e86566d899f1c3c91c052
+DIST vivaldi-snapshot-1.12.955.3_p1-i386.deb 54865484 SHA256 cddcc0e151dc4274b2424bf5e4667858cc0f13c05a979208a8ca0af898bf1dde SHA512 4c131b1d5c7256187cfc107a7ae8ce04346e959ef5f4ba8512f2c9ea7ade3fd372341e2206f6212d6ebfa0d0a1a6d48b2995fab2f9771bae7e23d2b29fab8d26 WHIRLPOOL a0ed51fffeb63951811c5b1f60f0c32370e50fbedadfda52c0942b756c252022014c1599309cf520abd0440643c992997fb7ccdd1542ca0855695484416e2b52

diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch
new file mode 100644
index 00000000000..0af4f14cf62
--- /dev/null
+++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch
@@ -0,0 +1,27 @@
+--- a/opt/vivaldi-snapshot/vivaldi-snapshot
++++ b/opt/vivaldi-snapshot/vivaldi-snapshot
+@@ -32,14 +32,14 @@
+       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
+       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
+       if [ -r "$1" ]; then
+-        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
++#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
+           if [[ -n "$LD_PRELOAD" ]]; then
+             export LD_PRELOAD="$LD_PRELOAD:$1"
+           else
+             export LD_PRELOAD="$1"
+           fi
+           export VIVALDI_FFMPEG_FOUND=YES
+-        fi
++#        fi
+       fi
+     fi
+   fi
+@@ -54,6 +54,7 @@
+ # Check for libs in order that they are most likely to appear.
+ # Where possible, use other files/directories to confirm it's the correct variant.
+ VIVALDI_FFMPEG_FOUND=NO
++checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
+ checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
+ checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
+ 

diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.955.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.955.3_p1.ebuild
new file mode 100644
index 00000000000..eda36f1e1ac
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.955.3_p1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil 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-2 eutils multilib unpacker toolchain-funcs
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${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"
+
+DEPEND="
+	virtual/libiconv
+"
+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}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| 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/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/${PN}-1.12.955.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}