commit: 91f84cd6c1f3b7142ca4f89b524ba08f2d7801c6 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Dec 1 08:59:28 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Dec 1 09:25:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f84cd6
www-client/*: update opera stable packaging Opera decided to change the name of directories in stable. It actually more closely matches -beta and -dev now, but in order to ensure that these changes propagate as versions are promoted to stable all packages get an update. While we're there, drop the legacy `rpm` code - I've never seen a release that _wasn't_ available as a .deb, and it's in the history if we ever need it. No revbumps as packages were either broken (stable) or have not meaningfully changed. Closes: https://bugs.gentoo.org/966737 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> .../opera-beta/opera-beta-124.0.5705.12.ebuild | 47 ++++++---------------- .../opera-beta/opera-beta-124.0.5705.51.ebuild | 47 ++++++---------------- .../opera-developer-125.0.5707.0.ebuild | 47 ++++++---------------- .../opera-developer-125.0.5720.0.ebuild | 47 ++++++---------------- .../opera-developer-125.0.5727.1.ebuild | 47 ++++++---------------- www-client/opera/opera-124.0.5705.65.ebuild | 45 ++++++--------------- 6 files changed, 77 insertions(+), 203 deletions(-) diff --git a/www-client/opera-beta/opera-beta-124.0.5705.12.ebuild b/www-client/opera-beta/opera-beta-124.0.5705.12.ebuild index 24b047fc7d40..6a81320bb4db 100644 --- a/www-client/opera-beta/opera-beta-124.0.5705.12.ebuild +++ b/www-client/opera-beta/opera-beta-124.0.5705.12.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,15 +29,16 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt6" RESTRICT="bindist mirror strip" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \ diff --git a/www-client/opera-beta/opera-beta-124.0.5705.51.ebuild b/www-client/opera-beta/opera-beta-124.0.5705.51.ebuild index 24b047fc7d40..6a81320bb4db 100644 --- a/www-client/opera-beta/opera-beta-124.0.5705.51.ebuild +++ b/www-client/opera-beta/opera-beta-124.0.5705.51.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,15 +29,16 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt6" RESTRICT="bindist mirror strip" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \ diff --git a/www-client/opera-developer/opera-developer-125.0.5707.0.ebuild b/www-client/opera-developer/opera-developer-125.0.5707.0.ebuild index 24b047fc7d40..6a81320bb4db 100644 --- a/www-client/opera-developer/opera-developer-125.0.5707.0.ebuild +++ b/www-client/opera-developer/opera-developer-125.0.5707.0.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,15 +29,16 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt6" RESTRICT="bindist mirror strip" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \ diff --git a/www-client/opera-developer/opera-developer-125.0.5720.0.ebuild b/www-client/opera-developer/opera-developer-125.0.5720.0.ebuild index 24b047fc7d40..6a81320bb4db 100644 --- a/www-client/opera-developer/opera-developer-125.0.5720.0.ebuild +++ b/www-client/opera-developer/opera-developer-125.0.5720.0.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,15 +29,16 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt6" RESTRICT="bindist mirror strip" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \ diff --git a/www-client/opera-developer/opera-developer-125.0.5727.1.ebuild b/www-client/opera-developer/opera-developer-125.0.5727.1.ebuild index 24b047fc7d40..6a81320bb4db 100644 --- a/www-client/opera-developer/opera-developer-125.0.5727.1.ebuild +++ b/www-client/opera-developer/opera-developer-125.0.5727.1.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,15 +29,16 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt6" RESTRICT="bindist mirror strip" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \ diff --git a/www-client/opera/opera-124.0.5705.65.ebuild b/www-client/opera/opera-124.0.5705.65.ebuild index a5bfc1e6e92f..6a81320bb4db 100644 --- a/www-client/opera/opera-124.0.5705.65.ebuild +++ b/www-client/opera/opera-124.0.5705.65.ebuild @@ -9,18 +9,7 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -# These are intended for ebuild maintainer use to force RPM if DEB is not available. -: ${OPERA_FORCE_RPM=no} - -inherit chromium-2 pax-utils xdg - -if [[ ${OPERA_FORCE_RPM} == yes ]]; then - inherit rpm - OPERA_ARCHIVE_EXT="rpm" -else - inherit unpacker - OPERA_ARCHIVE_EXT="deb" -fi +inherit chromium-2 pax-utils unpacker xdg DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/"; @@ -40,10 +29,11 @@ else fi # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# or use the Chromicler opera version mapping output. TODO: Teach Chromicler to update and commit # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) # Does not need to be updated for every new version of Opera, only when it breaks CHROMIUM_VERSION="140" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}" S=${WORKDIR} LICENSE="OPERA-2018" @@ -87,7 +77,7 @@ RDEPEND=" " QA_PREBUILT="*" -OPERA_HOME="opt/opera${PN#opera}" +OPERA_HOME="opt/${MY_PN}" pkg_pretend() { # Protect against people using autounmask overzealously @@ -105,33 +95,22 @@ src_unpack() { src_install() { dodir / cd "${ED}" || die - if [[ ${OPERA_FORCE_RPM} == yes ]]; then - rpm_src_unpack "${A[0]}" - else - unpacker - fi + unpacker # move to /opt, bug #573052 - mkdir -p "${OPERA_HOME%${PN}}" - 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 + mkdir opt || die + mv "usr/lib/x86_64-linux-gnu/${MY_PN}" "${OPERA_HOME}" || die rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || 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 - fi + 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 \
