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

[Jeroen Roovers]

commit:     1ac9354f091ada7af446393736b4932d0eefdf4c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 08:18:05 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 08:18:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac9354f

www-client/vivaldi: Version 1.14.1077.41_p1.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 www-client/vivaldi/Manifest                        |   3 +
 .../files/vivaldi-1.14.1072.3_p1-desktop.patch     |   7 ++
 .../files/vivaldi-1.14.1072.3_p1-libffmpeg.patch   |  27 +++++
 www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild  | 130 +++++++++++++++++++++
 4 files changed, 167 insertions(+)

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index c1cdb731417..f142619bdcf 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,3 +1,6 @@
 DIST vivaldi-1.13.1008.44_p1-amd64.deb 49265816 BLAKE2B 4d49e00cb0bb7fbf72303eb32da01751b22f9ec252766205893ead6c65e95695457065d2d9dcd5c4d42621a1382b012b2718e67b7f514df2ee7b1ea959eeaeca SHA512 3bb7f5ac0e01b1b3d36b4faae8a0a7874ab8acad5398663c9e51b6f9f26a6f00f01c3a183ff964e18eda2358009c99b270e65a3d35d99cea1de72554a7f6255a
 DIST vivaldi-1.13.1008.44_p1-armhf.deb 45147556 BLAKE2B 90d8c056c129273e2c759247d452d4a825cb0ad41052716674fac790bb488d3f0743fa692f302f1c7af3f22adb91b1a115e1bd5c2745560577c14e0645fe0afd SHA512 f390ef2a6afa98212458a803b2411e53849bc2be3ebf54f3fdedc15bd38462239f7590dd31870c312319a38bb0e293948e1bbd1f1a0cdf243747780925c9762c
 DIST vivaldi-1.13.1008.44_p1-i386.deb 50145626 BLAKE2B 44c913c2e8242d2b4b5b24fb63bc21dd8636283ebbcc5b72178b7dd4a34e2fc0e5d45fe41fef9ce7c918809e0bfffa1cf3ddbe436626afaa6237b4c85d27c09e SHA512 2f34facdc0ee2662d0ce03347346f8e510c288259aa92306f22c1eced6fc8626275f766401f6468b7a3037c2e7d5e65f692de39753553c7c8537b6c7f7a57a7a
+DIST vivaldi-1.14.1077.41_p1-amd64.deb 52284634 BLAKE2B 91a96b201f6d3947145685a519e79a4ebff921df5c5873c5ce790f269e337f6944df71307b45649d0d754aec8b8ff6691748919d680d2354997a4cbb3440a211 SHA512 f6f8afc76699924edcfeacd51f60364506e2e9c07773d0411207507c0493b7427ba0373402c5eab7a10dde699cfee7e6e5c42179bf63c285123ff7e0e88f15b2
+DIST vivaldi-1.14.1077.41_p1-armhf.deb 46360044 BLAKE2B d7fba11b524936ebf047162de597a829da1fc362e1d245b1de131431f288219085e17572853537c06637f7ce25ca482a19a703c58939855ee1a0a2ca7fc381a2 SHA512 8a6abbb6b362327aeefb2b526825caac0896b80d8f45870dfe78ad6cf56228deb0b932c157c3e85e66bde6e73dbde0470879d35cbfbf41b984222e2f3da6dc77
+DIST vivaldi-1.14.1077.41_p1-i386.deb 51911354 BLAKE2B 050b9b2fb8495d9b9eaf51c61d1dd5bfcbbca0804bfa39e084dc8ded5c4ecd4aea31b459d6f1cba8fc0b5626ed926ed03d0263c47590bbdb024bf31fedc15fcf SHA512 538ff94c056c2fe3ac5c5042191dd3e7fc385d833a6375a05894df2f3945e363c017bb9e717a46b060cba9be81cdbc610cfd3ad3880a6da43ec5a89242a0f8bf

diff --git a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch
new file mode 100644
index 00000000000..31f5371d8be
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-desktop.patch
@@ -0,0 +1,7 @@
+--- a/usr/share/applications/vivaldi-stable.desktop
++++ b/usr/share/applications/vivaldi-stable.desktop
+@@ -111,4 +111,3 @@
+ Type=Application
+ Categories=Network;WebBrowser;
+ MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+-Actions=new-window;new-private-window;

diff --git a/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch
new file mode 100644
index 00000000000..8c6a574fccb
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.14.1072.3_p1-libffmpeg.patch
@@ -0,0 +1,27 @@
+--- a/opt/vivaldi/vivaldi
++++ b/opt/vivaldi/vivaldi
+@@ -32,14 +32,14 @@
+       # Chromium's FFMpeg version N-89284-gba4dfad 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 "89284" ]; then
++#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; 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 preferred order.
+ # 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/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
+ checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
+ checkffmpeg '/usr/lib64/chromium-ffmpeg-extra/libffmpeg.so' '/usr/share/doc/packages/chromium-ffmpeg-extra'

diff --git a/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild b/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild
new file mode 100644
index 00000000000..cddb182a307
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.14.1077.41_p1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 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 gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+#VIVALDI_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	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/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+	sed -i \
+		-e "s|${VIVALDI_BIN}|${PN}|g" \
+		usr/share/applications/${VIVALDI_PN}.desktop \
+		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${VIVALDI_BIN} \
+		${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/vivaldi.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/${PN}-1.14.1072.3_p1-desktop.patch
+	epatch "${FILESDIR}"/${PN}-1.14.1072.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}