gentoo resync : 28.09.2019

2 files changed, 133 insertions, 0 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 4d199a289d52..1137050eed2a 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -4,6 +4,15 @@ DIST vivaldi-2.7.1628.33_p1-i386.deb 60221768 BLAKE2B 448b2ed57f6770fe378deec002
 DIST vivaldi-2.8.1664.36_p1-amd64.deb 62602676 BLAKE2B 953ed3741d935cbe6ce3e37e8b7caa7062f1bafdf893cb1e03805ccdddfb4cbeae801175cd562f50e7d2efa273417773bccee7c5d20ac71c138ee40edcddc1e6 SHA512 76da975e24d695765407d23468da0970a224dc3184abe696e4d11125a764c693032e19ee5f644eecccdf468e0be9286d0e89019ef53da4fff4904e7251af6fb2
 DIST vivaldi-2.8.1664.36_p1-armhf.deb 55296004 BLAKE2B f3d16c83c398dd817fcc456e0689ef06ffce82d6c937d79bfd563ec4d5e0dc7608445cd0844c6931b53250a3603ae869ae49bfb97d098b45317134db36a1c5c6 SHA512 8c0767ed17b1414bb0a20e7eff0a92a93f2c0d4ee1a2c1f6af3efdafd22bea811bca0473cea477993d0f5fb3c0b493de75f4c173a12d5d4ada8494edda72b701
 DIST vivaldi-2.8.1664.36_p1-i386.deb 60890700 BLAKE2B 7a9ec7c4aadd571208e0e212c5fb62433857eb2b2345ef801ddf213fdc73500dc885cc9953cf355ada2e46a8b76199c95f2b9784598e5ea07edea7f8051d8a86 SHA512 5ef2752593960822f2161929637ceec98c5f022d139942c80d36f5bc9ceda67df07c4fbaef7d5de8858ba95c26dae3b4a2677956002e87e405d495b90b9aa5e1
+<<<<<<< HEAD
 EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
 EBUILD vivaldi-2.8.1664.36_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+=======
+DIST vivaldi-2.8.1664.40_p1-amd64.deb 62559932 BLAKE2B 380dbc0a08fa5131ea59460c3aa736f19291ecbec730ebee6b546593c234e052391fda33494952cf778a9804816ee2223634ff6768756345c73b8b55e555e106 SHA512 503f16357a699d9a7c99f05b3536a432bf7fb7c74c9e32a739ba7541a33c8b15d637be7a254fcb64d294815c467ac2569cd05f17f710a145d8e5bf8b8c9ae93d
+DIST vivaldi-2.8.1664.40_p1-armhf.deb 55160132 BLAKE2B f4776279798f22df6dc6a2478ac7ca758f8ef78ac7260dd1f305cb290a1d22b7f3a97a634a839d3cfa40d10b58892c90d8e57c3982cceccf4877bc7e4c0fe4b6 SHA512 89249be5857c398c8d7f47ddebfe6e278e6f1e12c246c1e623fc16dd702257de1a3140331a8f637e5b1dd53e2ad252b0a9d8c06ade81f8c198687316e6267db0
+DIST vivaldi-2.8.1664.40_p1-i386.deb 60896168 BLAKE2B c70a6ca57ad1254917ea8ebdb41d0c3fceb64119c976d82a69aa02466e841dc6715c8b33cf4d1e110c6671ede6e8212dee804c8814e6dcc575e85700fa60490a SHA512 24bb02fb005e7b44798d226e4edbb0e107e38a38000bd8a3144df6c4a6c86705c565994dfee8f9a27b20b1d7a4a3f96dadc93966b6b9c8da76fcafb218a3044f
+EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+EBUILD vivaldi-2.8.1664.36_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+EBUILD vivaldi-2.8.1664.40_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+>>>>>>> next
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-2.8.1664.40_p1.ebuild b/www-client/vivaldi/vivaldi-2.8.1664.40_p1.ebuild
new file mode 100644
index 000000000000..69ed6a41d087
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.8.1664.40_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 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 browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.${PN}.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+:3
+	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
+
+	gunzip usr/share/doc/${PF}/changelog.gz || 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/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}