gentoo resync : 28.04.2018

3 files changed, 132 insertions, 2 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index e5105231be69..55095a08a627 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,5 +2,9 @@ AUX vivaldi-1.14.1077.45_p1-libffmpeg.patch 567 BLAKE2B b26ad49c8d4336e572ca4fc4
 DIST vivaldi-1.14.1077.60_p1-amd64.deb 52308364 BLAKE2B 164bbbe34d9702e4be9632f2fb457516ade647b69bd56a1480e4ef7c7f4d569a61848d85386dadb2b9a5095ba5e2926953c242d6eee4fb692bb85cdb66cf20ac SHA512 e2ef6e8e734d7191b35d72fd1b4fd2cbc9974a6fa556ff416e3b3908d9418470c661adb1963eee2e5454cb6521ca8a110a08cd9a78ab6f8b4a03e5225ddb8e95
 DIST vivaldi-1.14.1077.60_p1-armhf.deb 46408356 BLAKE2B b6e1b5e8d83127aecf2af264a8d61bc49b916c20d1e8c01c582f89a21799855720ebec2617b3047185b7ca289234e4b2be8a2cf6b13f6454096672a4b44292e5 SHA512 30da3805536b1dc068c4c86ef1c7f56a8743e8e4ba1085d78d856432eb12dbe4468fae5b704359433e6f09f4a4e5ce3351b1e11d25c416c11b013001d89f721b
 DIST vivaldi-1.14.1077.60_p1-i386.deb 51952946 BLAKE2B d427c187f04122d5492b7a8ca006292dec25efc75381b87dec24819b97cfe35b8929bfde9f8f576940cc0cac1aeebf5f24297e21093b072aaaf31c161a2a0111 SHA512 a8cec6c5f43a336ff3d001480461932ddcf143d984cfdf94f6f1786fd87ce5698afcee7b1b944e686b740a015013d95aa00f3986a71ab601f948c8e50d604759
-EBUILD vivaldi-1.14.1077.60_p1.ebuild 2982 BLAKE2B 18d5f570f0aea0827caa35d22412bcdaea4ad7871853100673f2f3de9216b4e489c01ada0fcf25361585049f4796b33e363170b4ada378750b2e3c7c1cc60228 SHA512 ce4a2a851cd65c6c5d8fc9f01de11eac937016ec9e2fee4f3ed23ad25bd97174d1214a69154b63483fe108a201c9c6cdb5fb1188d88b9167edc115efec7a7b6e
+DIST vivaldi-1.15.1147.36_p1-amd64.deb 52848048 BLAKE2B ab10837423cd6c0f300bccc482c118da054e81504d072b2eda08fb366bb4a11226a44c432d23ca619b702315c879fba46b82371cf12d93e9427becd533ea895e SHA512 35ee2d20f7448cd968b22336a9cfc6b12400fba2b4bcb6cadc79e992da8b7cbd6365c98bcb61ae51342479191e38fe7e73c48d8ff2bdb9291824e83f970779b0
+DIST vivaldi-1.15.1147.36_p1-armhf.deb 46834630 BLAKE2B bb62b63dce82e397d93300757df025a7c2cb8f62a27a1373157079f581a92afa22340f2a19a9667408565a8e34de4de815bacf1c424ea847e8deb3827ecd4931 SHA512 74592afba850aa155f5b58fd4c383d39c5b87a0c7c532f5c52a0504d2437c2663a5fe6a75ab758269e2c5add7eed64db13ac16122c76440660cfa342dab33e2d
+DIST vivaldi-1.15.1147.36_p1-i386.deb 52483148 BLAKE2B 113b6640373f7e6d0989379e5a20b116a92ea8f7f1e9745ee5a15097b13abd6e1df91bb4a805ac0fef9d0d9d1c578b92cc3c974ed116932eac41d33575366bc3 SHA512 6ba0a2633ba4da5fe96e3d6d754587ffea572f5581cfdec76b4085848f52147fa0a253e023e5dc0e8f824a820a77570ac30a5124f74e34dc2818eee0b1570699
+EBUILD vivaldi-1.14.1077.60_p1.ebuild 2954 BLAKE2B bebe591bd6c78a34f78da4286a75b776bf03ca8938216fa17b18ffd100d4a6a7da86aa4f687c606e15590da812b1accccaf928e4ba9dfced0d22862ebf8d30e1 SHA512 923065ce3444ddb4cfb8c80817ae24a2a8ea77d98d021563bf460366b5fe0746b4da7077aa2c80162dc8d6c4f2d49a3470c62a999ed612b61e0f6140f252a94b
+EBUILD vivaldi-1.15.1147.36_p1.ebuild 2936 BLAKE2B b03d8c06e0a499c790cb9a53a0b5f472ddc0941f26c35eca3b450502586130fcbdcd9e74c7696fc549bdf3cf6492ce707600ac5ac6ff00acaa4df9a885d48d4d SHA512 290fbb1eab03eaa6678c5d28d02c17a052468679b7ed99e7ad5a9c319c055df05338da6dbba9845ed4091f2eda64231592566fa6a116216287e1db100fea4975
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/vivaldi-1.14.1077.60_p1.ebuild b/www-client/vivaldi/vivaldi-1.14.1077.60_p1.ebuild
index 772c185172c8..5a64aee60f76 100644
--- a/www-client/vivaldi/vivaldi-1.14.1077.60_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.14.1077.60_p1.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 	virtual/libiconv
 "
 RDEPEND="
-	>=dev-libs/openssl-1.0.1:0
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
diff --git a/www-client/vivaldi/vivaldi-1.15.1147.36_p1.ebuild b/www-client/vivaldi/vivaldi-1.15.1147.36_p1.ebuild
new file mode 100644
index 000000000000..9a671c805d00
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.15.1147.36_p1.ebuild
@@ -0,0 +1,127 @@
+# 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/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	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.1077.45_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
+}