Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 130 insertions, 2 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 620d25abdbd2..765da4cf7a60 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,5 +1,9 @@
+DIST vivaldi-2.7.1628.30_p1-amd64.deb 61729696 BLAKE2B acf5b3f9405122191655dc90be39ed1beb41d98d0f89596f731402caea0df32b4e806669cdc629bddcf8aeb301fddf62c3dfd88a8890178b3903682846a4a7bd SHA512 66fc19193c45ecec87b7a2e57650d14bdc3760d0334d72e2908c39ad1b0fcf7a3f90f03683680d0a957cd449848e569a3e12f7a28f1bf709d340973bd6aa6607
+DIST vivaldi-2.7.1628.30_p1-armhf.deb 54616352 BLAKE2B 1b11e52d25bfe67e408ec42cea3b6ab6a8bbadabb97734ee42a81473ccb6d15582e731d81560703969333c180a745eac3e810ad5439faf6629e45bab33815622 SHA512 a32571579c97ed5227985c698ac1812b4b079b16bb82e9994ee1519bb8206bc235d0a4e01b165e6e8691ed56adb0f3a2fc4c5bfad15194b248db265d643259ea
+DIST vivaldi-2.7.1628.30_p1-i386.deb 60218100 BLAKE2B e9cf2fa0b9c6dbb38df1807d8462dc7d6012db4dd1c279f963e1ce4954ebd1f36713be7c3d4d0c5896e243dfafd89303a2456919a686d28e5e77e702ec29d57d SHA512 8c4d6074ca35e8181a901cddb4412418b3a3c3981220d08e71ea3783508b649fd3e1f4b9d1c7f4bfd1ec713a04be609336345a5cab13d303eb61dbfb0c872ad1
 DIST vivaldi-2.7.1628.33_p1-amd64.deb 61738688 BLAKE2B cb685ced9184a252deb203cc70296b8ea3c7e47bf12a43f12c3a636ada2dce81df340bbdec07271aa3832396e446dc93ebee4123290509b8c8d6c5bca64c28fe SHA512 5c098335e79aa2eb17bce6fa5bfdbf1713050b8fb90d412b218dcd39fcd5f597e7a41bff81eb783f32712261e9bd2333777c6fd1f9d246d60fb5d1e8460a0077
 DIST vivaldi-2.7.1628.33_p1-armhf.deb 54632760 BLAKE2B aafebbf2c406e860676e95f13ffb86c5d887f78c6860315cd9921e4682064a04db9620d524efafbe0d83d94d25472d9723f725ae1d78d3486b9eff985259b529 SHA512 db35c67911093d11c48bcf9bbe404a5d9ff362afb7dd53c782201d5b5a733af0cc88f9dbcdcceb7f3587b4fe651f40529d2167ca335c96cd80d957794a6666f3
 DIST vivaldi-2.7.1628.33_p1-i386.deb 60221768 BLAKE2B 448b2ed57f6770fe378deec0024368274ca05bd767afa10f537386d5a1afeb54a0fcff976b108ab87b62a410a40578f4be8e184511bc04afd74bcce5d6d6885b SHA512 b8abd46b13d5ded6b3e8856cd5fe749a39f672094adcfb8b7a32d6fceb7c4a7b07cfa00cc69b9160d2190a21276296e61dc6ebe82adf7dc66c28a461d3782b88
-EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+EBUILD vivaldi-2.7.1628.30_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+EBUILD vivaldi-2.7.1628.33_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild
new file mode 100644
index 000000000000..479dfcff4842
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.7.1628.30_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
+}
diff --git a/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
index 479dfcff4842..69ed6a41d087 100644
--- a/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
+KEYWORDS="-* ~amd64 ~arm ~x86"
 RESTRICT="bindist mirror"
 
 DEPEND="