commit:     0995299103784ed702b1c7dc40b25067904b264c
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 17:41:06 2020 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 17:42:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09952991

www-client/opera-beta: beta channel bump to 73.0.3856.283

Bug: https://bugs.gentoo.org/750929
Closes: https://bugs.gentoo.org/562038
Closes: https://bugs.gentoo.org/573052
Closes: https://bugs.gentoo.org/593404
Closes: https://bugs.gentoo.org/602670
Closes: https://bugs.gentoo.org/709652
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/opera-beta/Manifest                     |   5 +-
 www-client/opera-beta/metadata.xml                 |   6 +-
 .../opera-beta/opera-beta-72.0.3815.133.ebuild     | 103 ---------------
 .../opera-beta/opera-beta-72.0.3815.49.ebuild      | 103 ---------------
 .../opera-beta/opera-beta-72.0.3815.86.ebuild      | 103 ---------------
 .../opera-beta/opera-beta-73.0.3856.283.ebuild     | 138 +++++++++++++++++++++
 6 files changed, 145 insertions(+), 313 deletions(-)

diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index bdc88892d50..c9da3f468d6 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,2 @@
-DIST opera-beta_72.0.3815.133_amd64.deb 72345684 BLAKE2B 
d6d7e4b68b1a6dea879fd60cc908c4daea00a078915e78b03c13c56d6d5e9528885ef9d36b22eb4c9d5903ac005d9e6e44d4a64fa2ce8f7ff06ffcbf11cab337
 SHA512 
700ab96750e6dd46f218ee575998758c225f370c35731917e60adcee2cc9f76e566cb9a39f44cc0f145395fad7bb755b67bc8b114d9fb771b45700adc1912045
-DIST opera-beta_72.0.3815.49_amd64.deb 72273100 BLAKE2B 
55349662ab55f2954baaff2357cd19a31e6c39403655e01cabffa7b185f99caf8252fb3fe016b7a1660b6f9712e8f8cffa3f69c0b6f96069664742f3fa79f35a
 SHA512 
6c8c13d2906155f8b348afab0acc72c9b4e76f2f4580e74638a3ad8125dac4ac26970be14cffc543cd51ca332b53a943c0bb8983f762c7f288b1285c2fb4f641
-DIST opera-beta_72.0.3815.86_amd64.deb 72260088 BLAKE2B 
2e5446ae0ebc1c71a5d1191cbedf40125b204e400f470d990ccf54d2d869665666ae23a63890d4f7d90480d11e302d3f365f8cf983b96c5596f67af7de498792
 SHA512 
85860416e3159a209ea9d3d02fe994a664785fc28a1ddc412b638653a816a64d997c26af8ad9614b456fe309ba8d648c303428866f9af1b2d2ba968088b40347
+DIST opera-beta_73.0.3856.283_amd64.deb 70931480 BLAKE2B 
928db29de19c2b6d83920b8befb61f90a6fa860588ec59d8a0e6b0003cc1e8be4f71e9c53bccf05789063c23dffc11c709aae0b167b808e83cd197187a106860
 SHA512 
cf39d9b5bebc7d538eff69837a531f24e4134664a1242aa475812cc4e30ccb7441c46ae947a78ca9b62ad64ddb339cd9a53c041fc5625b28222ee4f784ca8a6f
+DIST opera-ffmpeg-codecs-87.0.4280.88.tar.xz 1361732 BLAKE2B 
1a4fa468d472bca80e7c7f79d6dd5b4e58ff6566cea546febf3ac56fc9eb89d663d3f11a4a05883f377f7cb73101353dcfc0fba875e9300d2e2d0b749ed3232c
 SHA512 
6f5e8616a0995b51218b5117619eac74419c5631f559ffacf71c51318e407430f1509e84114eb4945353d6a2b95097d3aae5083f73ddab76d55263e185b9c204

diff --git a/www-client/opera-beta/metadata.xml 
b/www-client/opera-beta/metadata.xml
index 6f49eba8f49..1e50dbfefe9 100644
--- a/www-client/opera-beta/metadata.xml
+++ b/www-client/opera-beta/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<!-- maintainer-needed -->
+       <!-- maintainer-needed -->
+       <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-beta/opera-beta-72.0.3815.133.ebuild 
b/www-client/opera-beta/opera-beta-72.0.3815.133.ebuild
deleted file mode 100644
index dff5217c967..00000000000
--- a/www-client/opera-beta/opera-beta-72.0.3815.133.ebuild
+++ /dev/null
@@ -1,103 +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 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 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/
-"
-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}
-
-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
-                       ;;
-               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
-}

diff --git a/www-client/opera-beta/opera-beta-72.0.3815.49.ebuild 
b/www-client/opera-beta/opera-beta-72.0.3815.49.ebuild
deleted file mode 100644
index dff5217c967..00000000000
--- a/www-client/opera-beta/opera-beta-72.0.3815.49.ebuild
+++ /dev/null
@@ -1,103 +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 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 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/
-"
-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}
-
-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
-                       ;;
-               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
-}

diff --git a/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild 
b/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild
deleted file mode 100644
index dff5217c967..00000000000
--- a/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild
+++ /dev/null
@@ -1,103 +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 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 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/
-"
-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}
-
-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
-                       ;;
-               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
-}

diff --git a/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild 
b/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
new file mode 100644
index 00000000000..dbad87a4077
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-73.0.3856.283.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/opera/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"
+}

Reply via email to