gentoo resync : 25.11.2020

3 files changed, 5 insertions, 97 deletions

diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index da729e66a5bd..a9c556102d46 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -2,6 +2,5 @@ AUX otter-1.0.01-qtgui-5.15.0.patch 342 BLAKE2B f28197b1ccc6ed970594638228e1345c
 AUX otter-1.0.01-webengine.patch 1062 BLAKE2B f3387e091afacf07c305e965c1d571658a49c924c484312cc89212d636fa3cfd8fde74477feab974def25ad93d2f01437d5c82896cac33ccddc879fdbaf41543 SHA512 cab5895aa92fa09415d4c60f75501a8e319dd24810319cc8ac50b872d153525b710ad32a9a5398a62fb9305653c21710b5dd181470938de339a547248bbb8bfb
 DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
 EBUILD otter-1.0.01-r1.ebuild 1743 BLAKE2B febc145b4cd0a7839ceb21375750fb4ba6b7faf58101528ac02dc7e9a09bedb1762e5fce62093dcbbe6bf4b1c7139d8512a863d11995b3aee8d4d86f7d20f07b SHA512 30e09797cc1194a89bf165af51d2606b731477ee16d3b4fb37c421aa8b015801893853133453708d226d12c748789cd5390a29aaab9090451f681c948135ff31
-EBUILD otter-1.0.01.ebuild 1796 BLAKE2B e8b3717ef5019739ff4d02b44873e63fe9a029357e195d3c564d10951d368aadc6aaf1a7d2b5123a0310ce3e4589d1e0649b2c298e530ca29f83e3430c468bc7 SHA512 e954204e02f322ffae48c79df169aea0d50928efeb6aaeaef43d24a2fea8d720a5577cd919f65f35b45cd5b2ec937822070b12ce198064df69f9ba91b2e836a0
 EBUILD otter-9999.ebuild 1605 BLAKE2B 8218d52a3e8c3a024b62637d98467ed7277e5a7af4433be86be91b15ff54d6766f6851e4f095abfe4bfd6a5ae61119b502a69d3e9184f0f466e9ab12304a5625 SHA512 8268abe9942fc4df8aec7abcd894b6eae6f26a341b8548abbab12883e5e563db53e9e6ee6bc4aae1e47e49c8e6998425a85a339306d4be48dd3477c28a423ba8
-MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22
+MISC metadata.xml 258 BLAKE2B 08a65741cdd1898d88a1dafdac3ea04ed28d3ce096c31dc03b02668d5ea145f87f0b59c73afd556d07e68600ce0e843ee7a37309d447c08bdfc32ad773a0b559 SHA512 a85a366fc538dcadd861ef021552c19bac761bbe1e31f2177ec468278bb320ef2bd2850491e011e76ede92e89e5677672956d08de92e11a99f821799d969fc2e
diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
index 2fe0e982fcf1..27f621c30f06 100644
--- a/www-client/otter/metadata.xml
+++ b/www-client/otter/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<use>
-<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> as backend instead of <pkg>dev-qt/qtwebkit</pkg> (experimental)</flag>
-</use>
-<upstream>
-<remote-id type="github">OtterBrowser/otter-browser</remote-id>
-</upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">OtterBrowser/otter-browser</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/otter/otter-1.0.01.ebuild b/www-client/otter/otter-1.0.01.ebuild
deleted file mode 100644
index 4437dc69c96e..000000000000
--- a/www-client/otter/otter-1.0.01.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils desktop xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/"
-SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="webengine +webkit spell"
-REQUIRED_USE="
-	|| ( webengine webkit )
-"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus: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
-	spell? ( kde-frameworks/sonnet )
-	webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-
-src_prepare() {
-	cmake-utils_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
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_QTWEBENGINE="$(usex webengine)"
-		-DENABLE_QTWEBKIT="$(usex webkit)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}