From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-985468-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 8333C139083
	for <garchives@archives.gentoo.org>; Wed, 22 Nov 2017 09:13:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C15D0E0E90;
	Wed, 22 Nov 2017 09:13:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 9322CE0E90
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2017 09:13:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 1A62333BE2E
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2017 09:13:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 935D7A375
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2017 09:13:37 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
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" <jer@gentoo.org>
Message-ID: <1511342015.0d93bcbebb089c64c36798638e162cb405d81926.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi/, www-client/vivaldi/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/vivaldi/Manifest www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
X-VCS-Directories: www-client/vivaldi/ www-client/vivaldi/files/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 0d93bcbebb089c64c36798638e162cb405d81926
X-VCS-Branch: master
Date: Wed, 22 Nov 2017 09:13:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: afc40a00-38a1-4561-8f8a-69196f788c44
X-Archives-Hash: 7f386859c4d5bb6d841880a1cf594f43

commit:     0d93bcbebb089c64c36798638e162cb405d81926
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 09:13:14 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 09:13:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d93bcbe

www-client/vivaldi: Version bump.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 www-client/vivaldi/Manifest                        |   6 +-
 .../files/vivaldi-1.13.1008.32_p1-libffmpeg.patch  |  27 +++++
 www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild  | 128 +++++++++++++++++++++
 3 files changed, 159 insertions(+), 2 deletions(-)

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index a2ebeb73bea..ba3d87425b4 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,2 +1,4 @@
-DIST vivaldi-1.12.955.48_p1-amd64.deb 50790158 SHA256 8ecd1d367e7db2ebd6f9654082527bf03a9a63f05b5a784146d2f21d5ecbd07d SHA512 c3075ce2711859f547d79f6b8a22b253a308f702bcff841b707601fa19665d220b8851f202d96a57f28f387087875055a8b94a3798e7e6176398854ab5d32d58 WHIRLPOOL 2121b6821b29868f4804e518361b242e7d026fb8df73472685e278beddaf4dfb9fe6c3fe5c79261753a6fa154d99b34dda661d0f59f4df8163fe906493585956
-DIST vivaldi-1.12.955.48_p1-i386.deb 51640720 SHA256 90d7d127eef6d03f43fc959bd0e2568317e5156e534ed31f92beeb785f352c9f SHA512 8a59fa3b4efcdcae82ffafe2ec0b6506d42cd96d6f72c9317708222f2bd94391744b38b1a267702c80144cc6aa842cddcd2b963871306825f403d9a50ddd3f29 WHIRLPOOL d5e2321b0b4e3fa3b911a627c0cacffe0a5f0f5812c277750cf8996b54cd59eabb8e6b0c91153da73484bf419025ce1e94241e81bcc40bc16fe5dbfe2092d4f4
+DIST vivaldi-1.12.955.48_p1-amd64.deb 50790158 BLAKE2B 873c6246c0b5392332e220c4f1dd6549be6134c8f3e0475972edd55fafe5fdda59e4f23f26d8337502663085175878466ae680caf075da807233660842837724 SHA512 c3075ce2711859f547d79f6b8a22b253a308f702bcff841b707601fa19665d220b8851f202d96a57f28f387087875055a8b94a3798e7e6176398854ab5d32d58
+DIST vivaldi-1.12.955.48_p1-i386.deb 51640720 BLAKE2B 413574323c847a249b7ddf7c545aa495fe69eb0e97d3a5e60ab81fb5f7c5ac171fc00445f1aa6d9ff1c62d3131f208c6798725f694327fda6fa88ac961aee287 SHA512 8a59fa3b4efcdcae82ffafe2ec0b6506d42cd96d6f72c9317708222f2bd94391744b38b1a267702c80144cc6aa842cddcd2b963871306825f403d9a50ddd3f29
+DIST vivaldi-1.13.1008.32_p1-amd64.deb 49248234 BLAKE2B 8c9051fd749e37b85f601fe9ba4fd1ac7a5251ef4acd0584fd929ff29d8cd9f70a7e121b56325ffe857774a972cf378541bd81a56f1311b77f0cbb4414c7cbae SHA512 a8f003c2391b80cdaf64feaeef09fed318f03806276bfc2a40369ad6aea0acd70cdb18e674d3407a9ebd6bf1920998461531795d6eac676fae5a94118e4913b5
+DIST vivaldi-1.13.1008.32_p1-i386.deb 50138250 BLAKE2B 4e76e4d78fc2ac0093d25750fc38b0594784d85673d8520f520bca8788d6515bf7bb83148e994f52a61a31c72f79ce6b5152c38e06fed58aabe6453c3d05106b SHA512 ef0024038a35cc35e083f0652c5025e327ab39c653d3e44cb188949b8c75704b6cb7e325a87cf17999e8045f6f398841d523fc6bce215dc2caebaf9d63f56653

diff --git a/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch
new file mode 100644
index 00000000000..a0da6934742
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch
@@ -0,0 +1,27 @@
+--- a/opt/vivaldi/vivaldi
++++ b/opt/vivaldi/vivaldi
+@@ -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 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'
+ 

diff --git a/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
new file mode 100644
index 00000000000..83d658c050d
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
@@ -0,0 +1,128 @@
+# 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 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 )
+	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/${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.13.1008.32_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
+}