commit:     6a4c5389a72a2ee60b0030faac9d32d1b0b371fc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 23:58:07 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 23 23:58:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4c5389

www-client/otter: treeclean

Closes: https://bugs.gentoo.org/925722
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 profiles/package.mask                              |  5 --
 www-client/otter/Manifest                          |  1 -
 .../otter/files/otter-1.0.01-webengine.patch       | 11 ---
 www-client/otter/metadata.xml                      | 11 ---
 www-client/otter/otter-1.0.03-r1.ebuild            | 87 ----------------------
 www-client/otter/otter-9999.ebuild                 | 79 --------------------
 6 files changed, 194 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 96125d2f6844..9527895ec0fd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -274,11 +274,6 @@ sci-visualization/scidavis
 x11-libs/qwtplot3d
 x11-libs/qwt:5
 
-# Andreas Sturmlechner <[email protected]> (2025-04-24)
-# Requires Qt5WebEngine; bug #925722
-# Removal on 2025-05-24 - with a good chance to be kept if ported by then.
-www-client/otter
-
 # Michał Górny <[email protected]> (2025-04-22)
 # Metapackage used for pypy3 target in the past.
 # Removal on 2025-05-22.

diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
deleted file mode 100644
index f4f2abc24982..000000000000
--- a/www-client/otter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST otter-1.0.03.tar.gz 5144915 BLAKE2B 
7a2cc7f9b6cc1e50903af39ba1cbfe5089f2ba9b519886bd7d579bece3055d82e062da497d1e05ce4cd64a2c1e32041fdd2715aa79965412ae2846fcae82c103
 SHA512 
0a655305b20f8fbd8d9450cf987a297f931e6c8e5cc5d9ae6cc31d8949b0dc55d2c5fcfd3f6e90c92e9385a9558a70fde5f30fb3c06776145971d80676b51fbc

diff --git a/www-client/otter/files/otter-1.0.01-webengine.patch 
b/www-client/otter/files/otter-1.0.01-webengine.patch
deleted file mode 100644
index f8029d95f26e..000000000000
--- a/www-client/otter/files/otter-1.0.01-webengine.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/core/SettingsManager.cpp
-+++ b/src/core/SettingsManager.cpp
-@@ -73,7 +73,7 @@ void SettingsManager::createInstance(con
-       registerOption(AddressField_SuggestSearchOption, BooleanType, true);
-       registerOption(AddressField_SuggestSpecialPagesOption, BooleanType, 
true);
-       registerOption(Backends_PasswordsOption, EnumerationType, 
QLatin1String("file"), {QLatin1String("file")});
--      registerOption(Backends_WebOption, EnumerationType, 
QLatin1String("qtwebkit"), {QLatin1String("qtwebkit")}, 
(OptionDefinition::IsEnabledFlag | OptionDefinition::IsVisibleFlag | 
OptionDefinition::RequiresRestartFlag));
-+      registerOption(Backends_WebOption, EnumerationType, 
QLatin1String("qtwebengine"), {QLatin1String("qtwebengine")}, 
(OptionDefinition::IsEnabledFlag | OptionDefinition::IsVisibleFlag | 
OptionDefinition::RequiresRestartFlag));
-       registerOption(Browser_AlwaysAskWhereToSaveDownloadOption, BooleanType, 
true);
-       registerOption(Browser_EnableMouseGesturesOption, BooleanType, true);
-       registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, 
true);

diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
deleted file mode 100644
index cfeafda26330..000000000000
--- a/www-client/otter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Jimi Huotari</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">OtterBrowser/otter-browser</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/www-client/otter/otter-1.0.03-r1.ebuild 
b/www-client/otter/otter-1.0.03-r1.ebuild
deleted file mode 100644
index c36e112fff26..000000000000
--- a/www-client/otter/otter-1.0.03-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop flag-o-matic xdg
-
-if [[ ${PV} == 9999* ]] ; then
-       EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser";
-       inherit git-r3
-else
-       
SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~amd64"
-       S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-fi
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+dbus +spell"
-
-DEPEND="
-       dev-qt/qtconcurrent:5
-       dev-qt/qtcore:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtmultimedia:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtprintsupport:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxmlpatterns:5
-       dev-qt/qtwebengine:5[widgets]
-       dbus? ( dev-qt/qtdbus:5 )
-       spell? ( app-text/hunspell:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.0.01-webengine.patch
-)
-
-src_prepare() {
-       # -Werror=odr, -Werror=lto-type-mismatch
-       # https://bugs.gentoo.org/864130
-       #
-       # Compiles fine with otter-9999, BUT new versions are being tagged from 
a
-       # maintenance branch, not from master, so do check before trying to 
remove
-       # this.
-       filter-lto
-
-       cmake_src_prepare
-
-       if [[ -n ${LINGUAS} ]]; then
-               local lingua
-               for lingua in resources/translations/*.qm; do
-                       lingua=$(basename ${lingua})
-                       lingua=${lingua/otter-browser_/}
-                       lingua=${lingua/.qm/}
-                       if ! has ${lingua} ${LINGUAS}; then
-                               rm 
resources/translations/otter-browser_${lingua}.qm || die
-                       fi
-               done
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DENABLE_DBUS=$(usex dbus)
-               -DENABLE_QTWEBENGINE=yes
-               -DENABLE_QTWEBKIT=no
-               -DENABLE_SPELLCHECK=$(usex spell)
-       )
-
-       cmake_src_configure
-}
-
-src_install() {
-       cmake_src_install
-       domenu ${PN}-browser.desktop
-}

diff --git a/www-client/otter/otter-9999.ebuild 
b/www-client/otter/otter-9999.ebuild
deleted file mode 100644
index de7642a13f97..000000000000
--- a/www-client/otter/otter-9999.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-if [[ ${PV} == 9999* ]] ; then
-       EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser";
-       inherit git-r3
-else
-       
SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~amd64"
-       S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-fi
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+dbus +spell"
-
-DEPEND="
-       dev-qt/qtconcurrent:5
-       dev-qt/qtcore:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtmultimedia:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtprintsupport:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxmlpatterns:5
-       dev-qt/qtwebengine:5[widgets]
-       dbus? ( dev-qt/qtdbus:5 )
-       spell? ( app-text/hunspell:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.0.01-webengine.patch
-)
-
-src_prepare() {
-       cmake_src_prepare
-
-       if [[ -n ${LINGUAS} ]]; then
-               local lingua
-               for lingua in resources/translations/*.qm; do
-                       lingua=$(basename ${lingua})
-                       lingua=${lingua/otter-browser_/}
-                       lingua=${lingua/.qm/}
-                       if ! has ${lingua} ${LINGUAS}; then
-                               rm 
resources/translations/otter-browser_${lingua}.qm || die
-                       fi
-               done
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DENABLE_DBUS=$(usex dbus)
-               -DENABLE_QTWEBENGINE=yes
-               -DENABLE_QTWEBKIT=no
-               -DENABLE_SPELLCHECK=$(usex spell)
-       )
-
-       cmake_src_configure
-}
-
-src_install() {
-       cmake_src_install
-       domenu ${PN}-browser.desktop
-}

Reply via email to