gentoo resync : 18.12.2020

4 files changed, 152 insertions, 103 deletions

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 091c65fe09d9..d4216a6a56da 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,4 @@
-DIST opera-stable_72.0.3815.320_amd64.deb 69733316 BLAKE2B 45756e60e507bbcde9d88a1f6f77b392443daecfd9d899a8078f136f968f2e8aeac6c2fe3a543c7dc69537ec4759203884a66bb953e7828c5bcf9d70fc8b9006 SHA512 2d991ed7fd5728bed926de85aed7cc8c1aeb9ef57ee58d5a77afdb99ad9982a9d195da148ad135560f6428120bc47d3a026a1f1f43595eb368948bebc972ec0e
-EBUILD opera-72.0.3815.320.ebuild 2048 BLAKE2B f632effb0d532d684311c3fec83333b37d2ea3eb6df9e0a81411e52d1a5612f6dddbbd470514c79e243abb3dcfb20d4bd767b0505bb376143d456bc5a47f4ce6 SHA512 d579752283fbb2fe05120cb5a9a23b35a998eafbf94a6bf958278d98386a3685c61466df69cdb83959fec9d3fb97436d42480ed9a5707d8da70f7ef8b6d7532c
-MISC metadata.xml 374 BLAKE2B 105fa27c014eb9646e08b9f9dce6c514c9b2119c0cd2a8e1eaccb5a6c1d1a4e95608bb4f505965887cec57520418051a55f13306a9ee3bfd8b688c36df71b629 SHA512 d3c461f617afd3aa86df8b186bb8dc3f46312ea3e189311ebd1e23b7d97836f3782f49befc880d413d6280ff21f830ec01e2f790c059fbc6a0a60879890febdc
+DIST opera-ffmpeg-codecs-87.0.4280.88.tar.xz 1361732 BLAKE2B 1a4fa468d472bca80e7c7f79d6dd5b4e58ff6566cea546febf3ac56fc9eb89d663d3f11a4a05883f377f7cb73101353dcfc0fba875e9300d2e2d0b749ed3232c SHA512 6f5e8616a0995b51218b5117619eac74419c5631f559ffacf71c51318e407430f1509e84114eb4945353d6a2b95097d3aae5083f73ddab76d55263e185b9c204
+DIST opera-stable_73.0.3856.284_amd64.deb 70760608 BLAKE2B b0c7ea860e4ee1849e71656aad16288407c80604553277f325b36c22bedc9ca7d88318a597ece606b160854c4ec89b95e4ba3624e41ddf3a4ce628487af6bc43 SHA512 a321f06db3b2fc1ea232344556973dc5c66f34abe75a0a830807416d4c90fa31ad5232e372f4ac031537dba9f7f910894b98fd2260c6e484a5b6fc09e0f65b84
+EBUILD opera-73.0.3856.284-r1.ebuild 3268 BLAKE2B 8ef678bd7bf39b4e33b07ade6acb7046a46c744f5db5e4b2a77f52cc93532055b4815b7643791691813a0e03ebd678803d7dcfdbadf33693450844305954d825 SHA512 deec1e7319d2fda84d1c239439025c24ed707a3553af254a6bd9e28d6169d0da66618c11aef13b2d57d170ae19efa7a5d7920179b912999b6547ebe3b660f6eb
+MISC metadata.xml 687 BLAKE2B ebfff0bde22208ffea6584bccc5dcbf3b8682cdb10e95b43150d872bef72c6e4325697adbcc659ea3376977a21aba1a90d9f9d71b30bdc1a5d850996116cda55 SHA512 43bd26c1b891583955107a111bf7e8d81619d03dc4cd0c67210909c8f26b3bac9112fc59e31d5c422c7464c8ac699107977c34b57a0f27585786ca1636d704cb
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 677f013b705a..3185f8a2f83f 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
+	<maintainer type="project">
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
+	<longdescription>
 Opera is a graphical Web browser available on several platforms. The desktop
 version runs on GNU/Linux and FreeBSD. Versions for Macintosh and
 Windows are also available.
-</longdescription>
+	</longdescription>
+	<use>
+		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
+		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/opera/opera-72.0.3815.320.ebuild b/www-client/opera/opera-72.0.3815.320.ebuild
deleted file mode 100644
index 023eaa59bfcf..000000000000
--- a/www-client/opera/opera-72.0.3815.320.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 unpacker xdg
-
-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="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libxcb
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	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() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera/opera-73.0.3856.284-r1.ebuild b/www-client/opera/opera-73.0.3856.284-r1.ebuild
new file mode 100644
index 000000000000..8dd3db974120
--- /dev/null
+++ b/www-client/opera/opera-73.0.3856.284-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+
+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/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+FFMPEG_VERSION="87.0.4280.88"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/${PN}/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid widevine"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	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 desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# symlink widevine
+	rm "${OPERA_HOME}/resources/widevine_config.json" || die
+	if use widevine; then
+		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
+			"${OPERA_HOME}/resources/widevine_config.json" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}