gentoo resync : 01.12.2017

4 files changed, 2 insertions, 161 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index b276e0e4252f..176c35391be2 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-AUX vivaldi-1.11.917.43_p1-libffmpeg.patch 1154 BLAKE2B 82f1d3cacbfa112e7ab521e50c7728d89b6051be8f27b807da44633d785b8b9a0f44adf22fe6af3b7c144a8e25860209f2f33f0f1034e1a899e4020eac64c380 SHA512 cce5c30231f3e1d6904d12c3bddf63ac02978bfbd0fe44f248899060c332bb0c242c0d2e18b62568fc65bd144b6a83c38ea6c4ec88db4512a7add4057fe7a605
 AUX vivaldi-1.13.1008.32_p1-libffmpeg.patch 1128 BLAKE2B c6e8dccf5625128ddc6d671835b6b4288a5b67a501a83f8794f98d42f92e1d681a76534c7d175e4b3fa3e70a732decbbd7656e0045754a0c4d8f017c5e6ad92e SHA512 8af68ec79839922ceedd3bcc32dc2e600337cfbede48bc1a254841fd2cf3f0eaaf0d84bc59f292c3b383af72cfbd24aa0b525b34f35d142938e29bddf2ec190b
-DIST vivaldi-1.12.955.48_p1-amd64.deb 50790158 BLAKE2B 873c6246c0b5392332e220c4f1dd6549be6134c8f3e0475972edd55fafe5fdda59e4f23f26d8337502663085175878466ae680caf075da807233660842837724 SHA512 c3075ce2711859f547d79f6b8a22b253a308f702bcff841b707601fa19665d220b8851f202d96a57f28f387087875055a8b94a3798e7e6176398854ab5d32d58
-DIST vivaldi-1.12.955.48_p1-i386.deb 51640720 BLAKE2B 413574323c847a249b7ddf7c545aa495fe69eb0e97d3a5e60ab81fb5f7c5ac171fc00445f1aa6d9ff1c62d3131f208c6798725f694327fda6fa88ac961aee287 SHA512 8a59fa3b4efcdcae82ffafe2ec0b6506d42cd96d6f72c9317708222f2bd94391744b38b1a267702c80144cc6aa842cddcd2b963871306825f403d9a50ddd3f29
 DIST vivaldi-1.13.1008.32_p1-amd64.deb 49248234 BLAKE2B 8c9051fd749e37b85f601fe9ba4fd1ac7a5251ef4acd0584fd929ff29d8cd9f70a7e121b56325ffe857774a972cf378541bd81a56f1311b77f0cbb4414c7cbae SHA512 a8f003c2391b80cdaf64feaeef09fed318f03806276bfc2a40369ad6aea0acd70cdb18e674d3407a9ebd6bf1920998461531795d6eac676fae5a94118e4913b5
 DIST vivaldi-1.13.1008.32_p1-i386.deb 50138250 BLAKE2B 4e76e4d78fc2ac0093d25750fc38b0594784d85673d8520f520bca8788d6515bf7bb83148e994f52a61a31c72f79ce6b5152c38e06fed58aabe6453c3d05106b SHA512 ef0024038a35cc35e083f0652c5025e327ab39c653d3e44cb188949b8c75704b6cb7e325a87cf17999e8045f6f398841d523fc6bce215dc2caebaf9d63f56653
-EBUILD vivaldi-1.12.955.48_p1.ebuild 2916 BLAKE2B ab452509400aaaca54630e110d266bf6f8a42c832f8c3115a11280c366f5aba18c71c5c9ba58950104d01df36c4020c91ae2510409193d1b41e9e877b6c27607 SHA512 76aaed471d635675853c878a4d1f8b21e78ed1651009bb0eb035b4a9a272736fc4ec5522a6e37c7960092d23b9058571cbf7d2ebe076cb1c3d3e0d511f066dcc
-EBUILD vivaldi-1.13.1008.32_p1.ebuild 2919 BLAKE2B c423155ba080115e243c5f366c9aa046fe4a11e0aec687d11cbc792fe8d40d74d41c51b9cebe91e91b3cacee54006aba4273cd4f1a17ed510b8b0fd908ef631b SHA512 27b3373067d21e6570993c29c42874017151a93892222131db2146a5d3f9256a970b9cc5c08d4d7704b5e779e2061169d579b12f44893a8dc62ea4a765774f79
+EBUILD vivaldi-1.13.1008.32_p1.ebuild 2917 BLAKE2B 30630b87430a448a41b9fa2d8f3c99c37e85e4752342b18200b2f18b45d36818da6c039ed6a1f1af6fc3b6d582b66ebe31a29cf46ccfa0a0dd9b4adf28871784 SHA512 10031a6d17ce7293109ffbb8d6e040fe3c58bc0f420084e081dc67be4917cfae3b2bd2386a0202518f9a66455f07ea4e6d9c2bfe86250be8a3590f02d5e7013f
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch
deleted file mode 100644
index a0861913d335..000000000000
--- a/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/opt/vivaldi/vivaldi
-+++ b/opt/vivaldi/vivaldi
-@@ -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 order that they are most likely to appear.
- # 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/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- 
diff --git a/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild
deleted file mode 100644
index d177d9c59bed..000000000000
--- a/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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_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 )
-	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/${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.11.917.43_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
-}
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
index 83d658c050df..be50c11e15d7 100644
--- a/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="