gentoo resync : 08.06.2019

3 files changed, 11 insertions, 130 deletions

diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 98885bd32f84..ee5cbb7411c6 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_60.0.3255.103_amd64.deb 67440172 BLAKE2B 8c3304ae40cdb289297e836dacc16aafa49bfb47287da7dfaebf5e967a0905a478bc060ba5be6b2709c30f530724b73e10986d15b838c3c0bb4b0958cd3c6d72 SHA512 b42bb9988a194aa50e359228031b38f4a00aefbb30d3b90edf6f3253a891a4b01d1ab8b99152fe2bfc3e91ebc1f9d4a433c62ed55d80d528e30cdf6272324ddb
-DIST opera-beta_60.0.3255.79_amd64.deb 68344076 BLAKE2B f8617cd2840d2682c8ea8bdbf20c2cd2d579f17d62e9e005cc864d666317787b205cdb5f741398b9476dfd7ca078caac8f38feedd7ca4e00274396ebea86aa89 SHA512 e7de5f9cefa7c04afc34aef6f377cd90ccf87b6362e4ac94125245a845c3e9bf6d7d9d7a99dcd4187de7aa576fa6929c110de9a774fcea5da6dde13f488908dd
-EBUILD opera-beta-60.0.3255.103.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
-EBUILD opera-beta-60.0.3255.79.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+DIST opera-beta_62.0.3331.5_amd64.deb 66671778 BLAKE2B 7fde67b73c0af74aeeab4318ea326369c24a0d9ec72b755ff978d7d952b7c24b5bb1a119746282adfde1aba456c48ae8785a0c6e7b8a4f46fa37effdad1d27d9 SHA512 4c78b25910602b05ce4aa2b3bab5d962fc583a38fa409dfa231320f1be9fe5abd4c4d0265a5c3686f4888f5808b12a5ff09b7a2381e6a786db24caa32e15844c
+EBUILD opera-beta-62.0.3331.5.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-60.0.3255.79.ebuild b/www-client/opera-beta/opera-beta-60.0.3255.79.ebuild
deleted file mode 100644
index d6081fb28694..000000000000
--- a/www-client/opera-beta/opera-beta-60.0.3255.79.ebuild
+++ /dev/null
@@ -1,116 +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 es-419 fi fil fr fr-CA 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/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-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
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || 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-beta/opera-beta-60.0.3255.103.ebuild b/www-client/opera-beta/opera-beta-62.0.3331.5.ebuild
index d6081fb28694..59a8587ec4bd 100644
--- a/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
+++ b/www-client/opera-beta/opera-beta-62.0.3331.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CHROMIUM_LANGS="
 	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA 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
+inherit chromium-2 multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -60,14 +60,17 @@ RDEPEND="
 
 QA_PREBUILT="*"
 S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
 
 src_unpack() {
 	unpack_deb ${A}
 }
 
 src_prepare() {
-	epatch_user
+	default
 
 	case ${ARCH} in
 		amd64)
@@ -99,18 +102,14 @@ src_install() {
 	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }