gentoo resync : 04.05.2019

3 files changed, 2 insertions, 130 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9a0c831d7ff3..36637038f488 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-2.4.1488.36_p1-amd64.deb 59073076 BLAKE2B 07b448bbea31fdf74f13d07258a28c52560209b8c1d47005cef5985fb50d22680706ce5cffa833042efc73d900acde1a7911d8bc760bdf7972fbfe4e2d8f4700 SHA512 07f1509739ec96de825373f61f058731613a55a1432b5ac3698b2e02eff86a587d32208e477f7df4272065c6c934c0e9e05c653440427142d345ade0cf30e397
-DIST vivaldi-2.4.1488.36_p1-armhf.deb 52193248 BLAKE2B 17a84aa2208ef7bb5ab686f0101938377626ff63ba8455507ab145a615c91eba6827299e425f9554a3e814a27068154d9ce65e73adc4a0f0d636c457d0d2c9fc SHA512 bfd4437f954503bb7e757a328c8070e783357dc0db70a5caa675cfc167883a19b0caff22ada88555a432605078360ba6be9070df9cee97e1ee88bb8f2ce55bc8
-DIST vivaldi-2.4.1488.36_p1-i386.deb 57287212 BLAKE2B 0d70ed125a29fb42e302c930615f5ef1b39443cc174da5f23896ab8f8d81e01b3d9035f00897e536f1f18199e022cff113279f0cf269bf0774b6caee96cf6a9f SHA512 6a6e3b4eec2e524eb3942d9b6c844b691704d26aa8123fe39e05e9ad4bcfabc340001325f3ed2e065de67b5e1384c67043e2d55e77e101ffa9c4544e0b4d6543
 DIST vivaldi-2.4.1488.38_p1-amd64.deb 59085524 BLAKE2B 1f64a54b011780dddf785d1d24273238621d9c6d72f7987d2a4c3a079cfb1756239c16447ab13167e7d55feaf61b384c2f4226600e001ce812034646304ecee8 SHA512 10e88503537211fc28bba20759882113ee23de732487b38fcbf54fa36ce5af0dfac25875b62c54a144077d76b672f7f3111c4f9a87e39d4fd2602323379bdb44
 DIST vivaldi-2.4.1488.38_p1-armhf.deb 52185308 BLAKE2B 8809ad8f86798d0e1af89342c4d9d00137d6238ee1515615695fa56d9f37e9d5f45bc8cb59cf52afdc18c8fe2079f989efb29345a9d54b0e9381998c2b2ae6e1 SHA512 0f856090774667861aa5a088f005e92507e2f4bb7b8952d7f91a4a061406964c11963437f5744d063902efd001c225d88047b409b87182bfaa47030c307cb373
 DIST vivaldi-2.4.1488.38_p1-i386.deb 57296220 BLAKE2B 7dbbd877114aedee0f762ccec709389b7ef447deaa34edc972a2a644d25e3ff58c64d804d0f7c503a261ec2f49e669bc38c85ff7f6211b7c637e13f759303465 SHA512 7abc97c924e60fe1eac24360b73ade74f1d0a518abcd569b42636c3ac54960b8c4b9b4e9972a3ba364dc5d5fe07e3de658956717a644e7c3d192a37865ce81a3
-EBUILD vivaldi-2.4.1488.36_p1.ebuild 2900 BLAKE2B d87d7b496037d5ad5cc151e7c41b5bc17bee148c05aee22a2f7b8ee600e5b7376cdd75b5f1d8e505435f467049879791b30c4314c63aeabeb342047c67bdbeb4 SHA512 a8e10d71c44a665bc305e094ee90510767317b925467b6e3327d2b2f83cfc6892539ceef4b492f480c0adfbcdb949cfc2ba050b8db54e43fa41a53e67fcb35b6
-EBUILD vivaldi-2.4.1488.38_p1.ebuild 2902 BLAKE2B 90b228d646569c8563b30d05882a352239cae8df9b690885decf5a86de4291bf528ed924678752d6bc015fa2b1d53c952a95328cdf07260fbaec52c31b5a0f08 SHA512 9d0a3abc68ea7eea61f25289b6b9f2cabef9a6f7e555865c837819685022b3d853541a244f4c0d371d865ae6bdd19ac46a645be8625024b4e6cef4a1c3555e52
+EBUILD vivaldi-2.4.1488.38_p1.ebuild 2900 BLAKE2B d87d7b496037d5ad5cc151e7c41b5bc17bee148c05aee22a2f7b8ee600e5b7376cdd75b5f1d8e505435f467049879791b30c4314c63aeabeb342047c67bdbeb4 SHA512 a8e10d71c44a665bc305e094ee90510767317b925467b6e3327d2b2f83cfc6892539ceef4b492f480c0adfbcdb949cfc2ba050b8db54e43fa41a53e67fcb35b6
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild b/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
deleted file mode 100644
index 98b6bc1fc327..000000000000
--- a/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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.4.1488.38_p1.ebuild b/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
index 102ad7b192fd..98b6bc1fc327 100644
--- a/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="