[gentoo-commits] repo/proj/guru:master commit in: net-client/kristall/

[Andrew Ammerlaan]

commit:     798a59c407a8472f936f49482f7fbcf48968d8d2
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Oct 10 17:35:28 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 17:35:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=798a59c4

net-client/kristall: add 0.4, drop 9999

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

 net-client/kristall/Manifest                       |  1 +
 .../{kristall-9999.ebuild => kristall-0.4.ebuild}  | 36 ++++++++++++++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/net-client/kristall/Manifest b/net-client/kristall/Manifest
index a597b1137..54cc28d75 100644
--- a/net-client/kristall/Manifest
+++ b/net-client/kristall/Manifest
@@ -1 +1,2 @@
 DIST kristall-0.3.tar.gz 7535712 BLAKE2B 
3e00243cf455ad810e8d51333b63186e637de1c292a116dbb4273825c51b1c1bf1921bfd243acb97e13dc201b3dcce7240f3c66368b66b607e5c207a2d901934
 SHA512 
21c102e25235f3a7c1a4128d84215a2444603b4b9bc680e94100148d143dc50744bb86450c22b8848453c5e183ae4708a1594240486951614d4e4af2706cd2e8
+DIST kristall-0.4.tar.gz 22015746 BLAKE2B 
262742ae96829773883337e258f52e89d102fc2cb543438b964a0e59fef91f5316a8a586e447657fd472a2346bf7b1490c1d913d47528272d3c04bd6da113b88
 SHA512 
f0355db2dfee4e40b532835fc4d511ac19d88751a42e7cf5d8a21b6c8a9468274613d717a83fa9aef230180fe9314e3bc8ef4482fb1aff8867f8d1d24caa6e6b

diff --git a/net-client/kristall/kristall-9999.ebuild 
b/net-client/kristall/kristall-0.4.ebuild
similarity index 50%
rename from net-client/kristall/kristall-9999.ebuild
rename to net-client/kristall/kristall-0.4.ebuild
index 9664da960..98748ddb1 100644
--- a/net-client/kristall/kristall-9999.ebuild
+++ b/net-client/kristall/kristall-0.4.ebuild
@@ -1,43 +1,61 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit out-of-source qmake-utils xdg
+inherit edo out-of-source qmake-utils xdg
 
 DESCRIPTION="Visual cross-platform gemini browser"
 HOMEPAGE="https://github.com/MasterQ32/kristall";
+
 if [ "${PV}" == "9999" ]; then
        inherit git-r3
-
-       EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git";
+       EGIT_REPO_URI="https://github.com/MasterQ32/${PN}.git";
 else
        SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64"
-       PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
+       app-text/cmark:=
+       dev-libs/gumbo
        dev-libs/openssl:=
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtmultimedia:5[widgets]
        dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtsvg:5
        dev-qt/qtwidgets:5
+       media-libs/libglvnd
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+       default
+
+       sed 's/$(shell cd $$PWD; git describe --tags)/'${PV}'/' \
+               -i src/kristall.pro || die
+}
+
+my_src_configure() {
+       eqmake5 "${S}"/src/kristall.pro CONFIG+="external-cmark 
external-gumbo-parser"
+}
+
 my_src_compile() {
-       eqmake5 "${S}"/src/kristall.pro
        emake
+       cp kristall "${S}" || die
+}
+
+src_compile() {
+       out-of-source_src_compile
+
+       cd doc || die
+       edo sh gen-man.sh
 }
 
 src_install() {
-       cp "${BUILD_DIR}"/kristall . || die
-       emake -o kristall DESTDIR="${D}" INSTALL="install -D" 
PREFIX="${EPREFIX}/usr" install
+       emake -o kristall DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
        einstalldocs
 }