gentoo resync : 10.09.2021

2 files changed, 37 insertions, 18 deletions

diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 740805d81a3e..68abdebc8099 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,9 +1,8 @@
-DIST opera-developer_80.0.4150.0_amd64.rpm 76215956 BLAKE2B 443b86a84615c9b7412baf929138703d9c0a8b52e9b82a23c36c927cd2594e19e1713a4062c945054def4e9b3702b2b6a40c1fa23e9b38722dd8e93cf5db1174 SHA512 2021cc6d1b6cec5801baf1973fabbe6643bfcae437792c38f98c4753e9c16787f49c07079ed68f3820e277013c179f3690bd5c7a0be8ab8d03aae7c2c7243e6c
 DIST opera-developer_80.0.4157.0_amd64.deb 79823544 BLAKE2B e39570f48b85efe5dfed9eee765964b876ab6d7b824b012132ac344cd863fe3396dda705b188123822fde0ba37784df65b3f05d1cebdfa6433bc640c942ad88d SHA512 441de56f3863044091e87849a36b31dda7385971322e31b99e66664a26ba744d38b83fe986c23d10d9cfc3997f8951d7f61dcc901b30bf742f30cb3650e3b2c2
 DIST opera-developer_80.0.4162.0_amd64.deb 79608536 BLAKE2B 23900af1f692c650b71cfe3f4f1b94c5e9ef9c8f161657596763e5bb75b1a1ad0c1fa98cd95002e73831661800f512527ca7bef6452fba83fea82f27c6b82552 SHA512 79a365ca877826ae795e7bd05b3fcc8478fd45048cb0831d7a03de1545632eaf8c9210f0fd908670ec4306c173cfc91e2cb299afa5aa159f3632aeac06f8213a
-DIST opera-ffmpeg-codecs-94.0.4590.0.tar.xz 1388672 BLAKE2B 736debcdbdfa63f0e5afa3bca70783aadaad5db5751666099ff290b8bde1ba1ef8ab12612a5dc2f4db3ba3b79ed7bdd7b6091480639578c9610058d2dc3584fd SHA512 c6fabd319b048b068f6763cf99406f4431c22311cb14159af673ee4b8f39a3f4376cb299746de9e797ee1965dde1f597ef5a733c5fcf8e527ce59964c85921dd
+DIST opera-developer_80.0.4170.0_amd64.rpm 76951444 BLAKE2B d8ac71a974641f8c40af38c4c115cec90ad8e3aa65952fdd3e6a3af3588a8b85813337231c2c86e902a96f5ef23523f1d53a44296f32f6f011abdbc68bf46102 SHA512 5bd6e42e9e6fd84f77e2dd7d566d536385d989f68c5bc0b1470847414e4efe0b75e4207b0ad0c00a8c72fa1f4eceed84b1bc54ae3e889b83cc0aeded54edd5b2
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-developer-80.0.4150.0.ebuild 3214 BLAKE2B 2b2923ad1a4f1ffb4d440a061d8b91289a410567ea3b3789c6adc5d77ddafbe5387d6fb9f2ff3514b799b327236b0f5d3944529f3ca6af3c4933f40bfdc2f5ab SHA512 a1d1fdb2b0eedf1aad8372bd04bf04118176f2ac85854bb66979eecc556e7643e3fece4faa0f8175b358266081838db392c5090efa822bc6092109a926bd7249
 EBUILD opera-developer-80.0.4157.0.ebuild 3613 BLAKE2B f4b01de34aa2ec09d69828f7c6ec5a6e7981f5215515a439880bb1e8667ffb2e7faced40030a675ae597dcc9a910b43210168e251852dae558057f62bef3b988 SHA512 11a9124916cebcf441111fde3dceaed2b3159fb1fce3cb68d440a01ece085260c93e36473a82b579565fde4b311e5d42bc6fc708bb7c48dad17f37d19693aeba
 EBUILD opera-developer-80.0.4162.0.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
+EBUILD opera-developer-80.0.4170.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-80.0.4150.0.ebuild b/www-client/opera-developer/opera-developer-80.0.4170.0.ebuild
index 9eb2b8a22a14..705285545fdc 100644
--- a/www-client/opera-developer/opera-developer-80.0.4150.0.ebuild
+++ b/www-client/opera-developer/opera-developer-80.0.4170.0.ebuild
@@ -1,14 +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
-inherit chromium-2 multilib pax-utils rpm xdg
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=yes}
+
+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/"
@@ -31,11 +42,11 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="94.0.4590.0"
+FFMPEG_VERSION="94.0.4603.0"
 
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.rpm}
+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"
@@ -91,24 +102,33 @@ src_unpack() {
 src_install() {
 	dodir /
 	cd "${ED}" || die
-	rpm_src_unpack "${A[0]}"
-#	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/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-#	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
-	rm "${OPERA_HOME}/setup_repo.sh" || 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 \