[gentoo-commits] repo/proj/guru:master commit in: kde-misc/geminipart/

[Andrew Ammerlaan]

commit:     cf8d276ee3dc9b88e11bc59196ff37083f22da21
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Nov 29 08:09:39 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 10:07:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf8d276e

kde-misc/geminipart: add 2021125, drop 20210921

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 kde-misc/geminipart/Manifest                       |  2 +-
 ...t-20210921.ebuild => geminipart-2021125.ebuild} | 27 +++++++++++-----------
 kde-misc/geminipart/metadata.xml                   |  3 ---
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/kde-misc/geminipart/Manifest b/kde-misc/geminipart/Manifest
index 027373728..2c6ec6b6f 100644
--- a/kde-misc/geminipart/Manifest
+++ b/kde-misc/geminipart/Manifest
@@ -1 +1 @@
-DIST geminipart-16adcdb6413b41489c47637a71a630021ea43a16.tar.gz 23209 BLAKE2B c41209841881099707d2b69b8e755e007b5d8d023a8edfc20f376498be9d95e34505e0385c28bdfd79e00e74116936b54f5430645086f38e260b8b8e4905ed87 SHA512 7d4196f9adcc6f107aa76cf2aac5c1d7778cd1de906b92b2b6e89de8f02d2d294a7082aea380dfcd921da4b98eb1d538f857d0ddcb6afd33e859ed9595f33f61
+DIST geminipart-117b525d7a33f7ecc3bb772323c7609c76a6aeb4.tar.gz 23164 BLAKE2B 4ce0eede9f7f54de416d715e2a1a9769f7371238e8520dfb7e0806227da709daf289636caaaa81918a35eb0e719d3f7d78957e00a89c1e9295f7880c1ce2f3d8 SHA512 eb74bff304a0847e2f67d8bb8da6b81d339acb75e9fdcb44fb18950de6bcd65e972ce88abb8b1c258d14a732cb51917d41746baab041ea0f8436e9d859e96fe5

diff --git a/kde-misc/geminipart/geminipart-20210921.ebuild b/kde-misc/geminipart/geminipart-2021125.ebuild
similarity index 66%
rename from kde-misc/geminipart/geminipart-20210921.ebuild
rename to kde-misc/geminipart/geminipart-2021125.ebuild
index 09e392c13..aea981eeb 100644
--- a/kde-misc/geminipart/geminipart-20210921.ebuild
+++ b/kde-misc/geminipart/geminipart-2021125.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-COMMIT="16adcdb6413b41489c47637a71a630021ea43a16"
+COMMIT="117b525d7a33f7ecc3bb772323c7609c76a6aeb4"
 ECM_TEST="forceoptional"
 KFMIN=5.77.0
 QTMIN=5.4.0
-inherit ecm
+inherit ecm optfeature
 
 DESCRIPTION="KPart for viewing text/gemini files"
 HOMEPAGE="https://gitlab.com/tobiasrautenkranz/geminipart"
@@ -17,7 +17,6 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="LGPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="konqueror"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -29,22 +28,22 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}
-	konqueror? (
-		kde-apps/konqueror:5
-		kde-misc/kio-gemini:5
-	)
-"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	export QT_QPA_PLATFORM=offscreen
 	ecm_src_test
 }
 
-src_install() {
-	ecm_src_install
+src_prepare() {
+	# Konqueror may not be installed, don't make it default text/gemini handler
+	sed "/MimeType=/d" -i integration/gemini-konqueror.desktop || die
+	ecm_src_prepare
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
 
-	if ! use konqueror ; then
-		rm "${ED}"/usr/share/applications/gemini-konqueror.desktop || die
-	fi
+	optfeature "handling gemini:// URLs in Konqueror browser" \
+		"kde-apps/konqueror kde-misc/kio-gemini"
 }

diff --git a/kde-misc/geminipart/metadata.xml b/kde-misc/geminipart/metadata.xml
index df8c8a25e..aefe25fb1 100644
--- a/kde-misc/geminipart/metadata.xml
+++ b/kde-misc/geminipart/metadata.xml
@@ -12,7 +12,4 @@
 		<email>cyber+gentoo@×××××.in</email>
 		<name>Anna</name>
 	</maintainer>
-	<use>
-		<flag name="konqueror">Make Konqueror handle gemini:// URLs</flag>
-	</use>
 </pkgmetadata>