gentoo resync : 22.01.2021

3 files changed, 106 insertions, 29 deletions

diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index a9c556102d46..e442e1997286 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,6 +1,8 @@
 AUX otter-1.0.01-qtgui-5.15.0.patch 342 BLAKE2B f28197b1ccc6ed970594638228e1345cebdc50bb3db809fa0dfe8038b74f2e7ae89b3d7c2291e66089afc709bcc51d6cd6dc2f93dd902a893a2d0883358dd7a3 SHA512 6462158bd09f86867644a25a78579db7c7d6669b9c917f6c02fba817e3b69cf9e62038e8f0e6fab232af13b4f1a3649249ee6ba60601f9fcd28b004fa46c0f77
 AUX otter-1.0.01-webengine.patch 1062 BLAKE2B f3387e091afacf07c305e965c1d571658a49c924c484312cc89212d636fa3cfd8fde74477feab974def25ad93d2f01437d5c82896cac33ccddc879fdbaf41543 SHA512 cab5895aa92fa09415d4c60f75501a8e319dd24810319cc8ac50b872d153525b710ad32a9a5398a62fb9305653c21710b5dd181470938de339a547248bbb8bfb
 DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
+DIST otter-1.0.02.tar.gz 4940331 BLAKE2B 686547b4302e79e882c5c4967680992faf54b5330896207ae98b1633fa6eb2df70793bfd0c8da5c7b5b8be39c5b9528f32303f69026dcd43f12fd528923b9011 SHA512 5b142486298f2ef1f0613363c7a4de3340544ecd82406efc64225e78eb958337ea4045c0c44553fe3b29a0836bd5f6cdab37d615ebf98756108f9aa5473360a1
 EBUILD otter-1.0.01-r1.ebuild 1743 BLAKE2B febc145b4cd0a7839ceb21375750fb4ba6b7faf58101528ac02dc7e9a09bedb1762e5fce62093dcbbe6bf4b1c7139d8512a863d11995b3aee8d4d86f7d20f07b SHA512 30e09797cc1194a89bf165af51d2606b731477ee16d3b4fb37c421aa8b015801893853133453708d226d12c748789cd5390a29aaab9090451f681c948135ff31
-EBUILD otter-9999.ebuild 1605 BLAKE2B 8218d52a3e8c3a024b62637d98467ed7277e5a7af4433be86be91b15ff54d6766f6851e4f095abfe4bfd6a5ae61119b502a69d3e9184f0f466e9ab12304a5625 SHA512 8268abe9942fc4df8aec7abcd894b6eae6f26a341b8548abbab12883e5e563db53e9e6ee6bc4aae1e47e49c8e6998425a85a339306d4be48dd3477c28a423ba8
+EBUILD otter-1.0.02.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
+EBUILD otter-9999.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
 MISC metadata.xml 258 BLAKE2B 08a65741cdd1898d88a1dafdac3ea04ed28d3ce096c31dc03b02668d5ea145f87f0b59c73afd556d07e68600ce0e843ee7a37309d447c08bdfc32ad773a0b559 SHA512 a85a366fc538dcadd861ef021552c19bac761bbe1e31f2177ec468278bb320ef2bd2850491e011e76ede92e89e5677672956d08de92e11a99f821799d969fc2e
diff --git a/www-client/otter/otter-1.0.02.ebuild b/www-client/otter/otter-1.0.02.ebuild
new file mode 100644
index 000000000000..79cb3672b464
--- /dev/null
+++ b/www-client/otter/otter-1.0.02.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~x86"
+	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
+}
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild
index 7b5172796e7e..79cb3672b464 100644
--- a/www-client/otter/otter-9999.ebuild
+++ b/www-client/otter/otter-9999.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake desktop git-r3 xdg-utils
+
+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 ~ppc64 ~x86"
+	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/"
-EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="spell"
+IUSE="+dbus +spell"
 
 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
@@ -27,13 +34,14 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-	>=dev-qt/qtwebengine-5.9:5[widgets]
-"
-RDEPEND="
-	${DEPEND}
+	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
 )
@@ -52,16 +60,14 @@ src_prepare() {
 			fi
 		done
 	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
 }
 
 src_configure() {
-	mycmakeargs=(
-		-DENABLE_QTWEBENGINE=true
-		-DENABLE_QTWEBKIT=false
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_QTWEBENGINE=yes
+		-DENABLE_QTWEBKIT=no
+		-DENABLE_SPELLCHECK=$(usex spell)
 	)
 
 	cmake_src_configure
@@ -71,13 +77,3 @@ src_install() {
 	cmake_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
-}