gentoo resync : 16.09.2021

3 files changed, 40 insertions, 16 deletions

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8afd94c6c9e4..5e24707e4e76 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
-DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
-DIST opera-stable_78.0.4093.184_amd64.deb 77080724 BLAKE2B 72166332c29711611b41c056add5f149ffd3ed224657d5ada1a555a4f19e13b77308b91ccead33918abf4a867cb29b4387d0393a8b4e6ecd08cde789f5766ddb SHA512 cbb3b14d8fee419c5a0bec71cc4891fb490ffa788e2176d1be319699112d4f53db1def179d522f8aae1f65070c9e3299ebfb0798f1ef888a245bd661551a9d14
-EBUILD opera-78.0.4093.184.ebuild 3044 BLAKE2B a2f33ffec142c1e74d77cca0f82a8687a285d1c2fa50a3b97aa5fb462db54cf74bca2c40805371dbc6448672ed39719291c63c13ded9dd4e29c7b3f12975f052 SHA512 3e685f1fa86970b788d425d365ca1ebda3c623374cbf8745cfb4123f2b2f32b9467ca1a891e2256e432ef928fffec3b38327bf57e21f09e0f780a6fb4e4f01c4
-MISC metadata.xml 589 BLAKE2B 6264d0b26100282d9399d5922ef7a49b99add9ebad066559201db4fddf7e33598eb5f8c1f8b4bf569ff9e636154be2d377df1326b653633a5bd7764302cf1a29 SHA512 2c3a8e587d5548372f0d27246aa439b532f9b61387a35dbf9752060ad9f013f7996c7524217e426498f3eb4b983a4fd674116f124a4b680ca78b328c02647f45
+DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
+DIST opera-stable_79.0.4143.22_amd64.deb 77553332 BLAKE2B 2f94947198e6e0953ded7cdda0f75be34f9041a65d5f87242e310e2b456299d038497fb00eb0c0bbc906986a97de8272fe8f541ddaba3ef377fd3a7b5c77adb3 SHA512 2d00bc4b63d5dab3d356d27f68f1babbf43033ca909ba83f3ccde1190c5d82a5320881852f1ec6c37c66ccc5e85377c2237ef066c22cd98519b79c56ce98e1ea
+EBUILD opera-79.0.4143.22.ebuild 3619 BLAKE2B f98165d607c674be96a0d2263fbd99deafa4af65e9c012c12140bc08ab508e0146b3ce4fd4a7d772f28280afe6928dfa14f1f24e71ee0614ef4b263eeb2f4ce0 SHA512 08a40d9c2907f9ae3b705dfb6d127b6d63838afde2f04bb0ba83d6539cc9d06793017317e5115aa38b8968c898c672b1a1996eaad9415c178dd5821e017093ca
+MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 4bd31c3621c6..330aad3c4844 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>chromium@gentoo.org</email>
diff --git a/www-client/opera/opera-78.0.4093.184.ebuild b/www-client/opera/opera-79.0.4143.22.ebuild
index 9992d91bd2a7..632893a0d6f2 100644
--- a/www-client/opera/opera-78.0.4093.184.ebuild
+++ b/www-client/opera/opera-79.0.4143.22.ebuild
@@ -1,13 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 CHROMIUM_LANGS="
 	be bg bn ca cs da de el en-GB en-US 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 multilib pax-utils unpacker xdg
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 multilib pax-utils ${OPERA_UNPACKER} xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -30,11 +42,11 @@ fi
 
 KEYWORDS="-* amd64"
 
-FFMPEG_VERSION="92.0.4515.20"
+FFMPEG_VERSION="93.0.4573.0"
 
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
 	)"
 
 IUSE="+proprietary-codecs suid"
@@ -90,21 +102,33 @@ src_unpack() {
 src_install() {
 	dodir /
 	cd "${ED}" || die
-	unpacker
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
 
 	# move to /opt, bug #573052
 	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
 	rm -r "usr/lib" || die
 
 	# disable auto update
 	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
 
-	rm -r "usr/share/lintian" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
 
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
 
 	# fix desktop file
 	sed -i \