gentoo resync : 04.05.2019

3 files changed, 2 insertions, 116 deletions

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 5c7e0d7855c0..2b2f005b0c05 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,7 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_60.0.3255.59_amd64.deb 66570178 BLAKE2B 0dcd5890c03a4d919c7ee9df6755f603196626f075b15b94610d68738043f1488bd4d11a06150150c3936a3771edc0f6d12bbb9c4c0e4811bf9c1b4ba12cf2c5 SHA512 d4cad9ea145d603be9541e664e601dd10f4042e894a4362b346bc105c143e2a40d82d6fbb0f3a60b363e435248d85d440674dee3a87eb1a59339d2be7ec97eae
 DIST opera-stable_60.0.3255.70_amd64.deb 66757270 BLAKE2B 53d7089a148837e1a47e8a18d23b7f5c3354a00a43083883e5dbae362edfa7010821c34abb7d2ebd0934f78c04ed284cbff12b9534baa82956b506e228b3197d SHA512 744c42ef7604da8d5ac1b350a8b5ebfd1f2f45fa9ceba3112b3d8623ba720c779955cc76f69d7bcb227e5cf619f2b44916a4a840add2c3fc682e876a4d068bf9
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-60.0.3255.59.ebuild 2302 BLAKE2B 1b7fc128e1c58421587f13b7720fb10788ff8338981b93c4a7cb302cbb45eb45850f9a8e269913c703fdc101beaaac054b58c8a9187323834bc1a4456c8e7921 SHA512 69900db9fa4e439a541c0d0cc7cf7beef2ff5cc3e07ea273342eab5a7d842e9c59163ca93014d705baf8de6b93d55b3e5d42e450979a17b76ee647fcf6faf068
-EBUILD opera-60.0.3255.70.ebuild 2248 BLAKE2B 76738e731a1cc29be4aad25601dbcce538ee9378558f91defd942d37e31abeaea3c3b072dbcba61a8776ccf4dca75803bd229326de3411c960a20d55126b4125 SHA512 cf9c17804e1a27553691d88c16b8e1988f5ff3ad58e8ad4ae064d98295dd31a4762cf3e0f08c4284a49ca626d4378cabbf795a9e65c6fcd638043d8d9e7a5851
+EBUILD opera-60.0.3255.70.ebuild 2247 BLAKE2B 734f9eba1988a021e8d03509e5fcd235de1895afc79d5e27cdaa7eb106f86b9b0e278885598a16a3ab63c25faded81d5285771ec4c96bb221f34f543c3617dca SHA512 644ce5f2adf8d47b8bbf04287f3a085ceb701730d97f74de95e630f976004812ab18f245c6f84d72350e8ed102f3b18b25f04066ad5dfa6a94654d742fbfdc93
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-60.0.3255.59.ebuild b/www-client/opera/opera-60.0.3255.59.ebuild
deleted file mode 100644
index 3e9910b03ccd..000000000000
--- a/www-client/opera/opera-60.0.3255.59.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
-	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
-	zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	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/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-60.0.3255.70.ebuild b/www-client/opera/opera-60.0.3255.70.ebuild
index 72f8b6bbb496..a7067728cb05 100644
--- a/www-client/opera/opera-60.0.3255.70.ebuild
+++ b/www-client/opera/opera-60.0.3255.70.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/expat