gentoo resync : 29.10.2017

4 files changed, 153 insertions, 4 deletions

diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 776ebf475350..58f882c64d6a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,12 @@
 AUX vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch 1190 SHA256 e67cfe8b6a7bd14b20ab2d3f8fc26018544b0fd3218a704e6af584c474d8da9a SHA512 550c0b9a9683c389846e058c31074ccdc7164c2ec1d13ad4a4b7daa0e3f4a0f469d6ec71cc4c293cb6403427d589d0084b96ec5caa27f69548fbfe5c8608865b WHIRLPOOL cbd948618af24e7e4070df51695c1e6166bd606053b23ddcae64f7d020cec8724d8d9409c8a19eeee5f102bbf558e58993fba7b995774b387fdd63e35399d525
-DIST vivaldi-snapshot-1.13.966.3_p1-amd64.deb 53410782 SHA256 a7a20c765d9a5ea22337424a66706f1909c6e18ea7ccef01575d245d3cb80db1 SHA512 5b71245656885584b4dbd5a02da89e5fede1ea246f5fc14a7cc3216cf40191d0183dcf80fcb3a433a75073e474bb45d111590777b8fee6ce1ab8fb68b2bc8b19 WHIRLPOOL 9a699723abfd50413957da4da1ceaa132a6bf58c102197bbb9a4c0458632a95e7e87e5a46788268efec6d7fe447928ccac7ca66006a2b1de5c536fcf67188c1e
-DIST vivaldi-snapshot-1.13.966.3_p1-i386.deb 54706528 SHA256 3d132d1f2428ba816d2b93764205b2772f1fa84f2dac71cfbd60794121b1898b SHA512 373006f4b93e4f5bcd32bdd55ec97844a5eb1569a5177f541ffc572b4c7298e80e5479baf0ba5a5c2ed516beb27d68be5d092aab741e06e62b5e38b219f30d7b WHIRLPOOL c53f769b38448f5ecfce26167eaab82afdc73688e184f7dbd6f2c7b546e6f055946c5b54e21355e78fe536621898d40683f8e477b81877c1cc471763dbcf80f7
+AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 SHA256 260fe8e0c736f6ee34136b417d4798099d83abc55adffca6903966d21fa73a66 SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb WHIRLPOOL 036b6f99ffe4c39231293c3a49fca90aa52de8273757dd1fbcf3660c669fd05d22ed6952ccfd50b18e008d6f279cc60d020284581cef63385c9234ba6c1a6b36
 DIST vivaldi-snapshot-1.13.971.8_p1-amd64.deb 53403290 SHA256 1ee7306a6f6c02e1b66a4d36671bbfaf63a4119980e988a8ec67b54963d83e32 SHA512 884548741be907c6c3eaaabccb2d87440cbc07da886e0fdd7197fcd8e17ef7e59a977a6ead35ce5ffa1743bb038ea48a54af727d7cdf1b6ccf1974a2094e87ff WHIRLPOOL c4cfbd05a5123b402855a89d3e1016fc5d2f5abf91e3fe20e68e7b8d306d59e80c0e3c4ad1aa639b113bfe37d165f81eb56bce9241fe7e6e27c6de139e615e0e
 DIST vivaldi-snapshot-1.13.971.8_p1-i386.deb 54726014 SHA256 a6e5a8274881a4f53f5e528bc0d832566611eca15f2fba0d10f3307c905e5629 SHA512 a6d4f14c34e2ebfda6db6c47d8db76acf64a7a7f21da95debe4aff01eeeef856a3c353f4c9a4f4658d5a39ffe64f715ab3eace9b614f8fa13a33ff04b7886305 WHIRLPOOL b7c2b769a98b7c4eb42db61f571b3224731d5720ecbfeea666d86b2c6ee3c28f84d96cf9512412ce82497ed95e8f68b094ba729aecb4524fd1a83a82929ce48d
-EBUILD vivaldi-snapshot-1.13.966.3_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+DIST vivaldi-snapshot-1.13.997.3_p1-amd64.deb 50485472 SHA256 81b132dfda7f82374a631cf81ec63a8f8c5f5b59c1af871d02ecff25c805ea89 SHA512 d88cac768f34788b8c3b6550bfe03ad64557e731af57b85a144f6c4622d256749f0498dac2d73c689890c8d5fe76c66efe0963813481d2a593b9ffcbfea7a966 WHIRLPOOL a9fa9cc3690f0943b42030f95f7cd3ddf1682aa9ea3160bef967619d30f2475e6b0ea48ff397a622d29f2a6bc04baf0357089a51212952342481be8503a98272
+DIST vivaldi-snapshot-1.13.997.3_p1-i386.deb 50953694 SHA256 d1f3a38651cef629c6aa77fc8d401593ed4915b6fd68a6177f25ff8a8fd8db45 SHA512 016fbe2bbf007a12417a14200c7136f0fbf887a74d76b2c6e34603da44f42bbc84a9a981cb8652e5c2c504080e0e4330fdf8a8a8886ef93a1ecdb73bc48ebb79 WHIRLPOOL 5c4212551fe57fa118fd7814cd3ecedcd685846d891860279c8fb8bcbad1d40604b37e26bbf56c118fffbbc3304749003aa48f04199125d200c5b61dac35a075
+DIST vivaldi-snapshot-1.13.998.3_p1-amd64.deb 50480568 SHA256 614bef3d831c0ad5aea661789856bcc64acaf1056f0c5e2761b58462b32aef53 SHA512 cf184ada5c09cfd47bc4f97df6c48f69535149153cab9594dcab40e75301b0fcc8ff6847e30a681cee98d194ec6d3d93dbf7c0c5934110c797be189774453889 WHIRLPOOL 8dcbea6c53df56a62460cf2d117903bc24bee78a4eb814a55a80c4e9ad71479361c4bb27ebc83304f1d41e91512b7f55bc265478a2007396bc4ee2603516db11
+DIST vivaldi-snapshot-1.13.998.3_p1-i386.deb 50952110 SHA256 ac06dd0fef18c0e00b6cf7702b9171b226f9534be955bf3487b64ab11e1d1a75 SHA512 818dd2b1a26a20b9c2192ccceeac734b032416b349267aa17758a781a5f243923bf270f97e792d3828918600bd98c642403f4f629f71a69c464646e1ae0335dc WHIRLPOOL 7d6e59dc2e52d4538e8b7accc09c783f726fbe565f0964ef99c69755067eb6d66bfafb8852770d8dc306b4c2fa61c4120f6b1e3bf833fa8866630734bb81f390
 EBUILD vivaldi-snapshot-1.13.971.8_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+EBUILD vivaldi-snapshot-1.13.997.3_p1-r1.ebuild 2354 SHA256 792d8210ae35215af58dd79d8882bf68a5eeca4ce6e1acc91af2c7ca3b6f8eff SHA512 c9e8bd094c64fa28cca7cc477e9ff6a4bd55d5ed0ff3028b8f40040d13f969b49849e3b5aa531e4d204f90d83f433ae6596794538558e7cc1e452272804ddf4c WHIRLPOOL 6d1845b060d2427721ba2906e075b29200f22d4bdffcbdd142f8429b03fd05fa0f822b289edf1a10398d26a4cd32ae53019f63ff25f920eb51a5e7c11a136df7
+EBUILD vivaldi-snapshot-1.13.998.3_p1-r1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
new file mode 100644
index 000000000000..807164299ac4
--- /dev/null
+++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.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 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-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
index eda36f1e1ac4..53dd25845f8d 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
-	epatch "${FILESDIR}"/${PN}-1.12.955.3_p1-libffmpeg.patch
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
 
 	epatch_user
 }
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
new file mode 100644
index 000000000000..fff39bc27059
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
@@ -0,0 +1,118 @@
+# 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_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}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-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
+}