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

["Anna Vyalkova" <cyber+gentoo@sysrq.in>]

commit:     1a8688ed4869113de4b53791c2196709f774859e
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon May 30 20:53:53 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon May 30 20:53:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a8688ed

net-client/kristall: fix build

Closes: https://bugs.gentoo.org/840490
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 ...kristall-0.3-r1.ebuild => kristall-0.3-r2.ebuild} | 20 ++++++++++++++------
 net-client/kristall/kristall-9999.ebuild             | 20 +++++++++++++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/net-client/kristall/kristall-0.3-r1.ebuild b/net-client/kristall/kristall-0.3-r2.ebuild
similarity index 62%
rename from net-client/kristall/kristall-0.3-r1.ebuild
rename to net-client/kristall/kristall-0.3-r2.ebuild
index 0d5efcd77..9664da960 100644
--- a/net-client/kristall/kristall-0.3-r1.ebuild
+++ b/net-client/kristall/kristall-0.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit xdg
+inherit out-of-source qmake-utils xdg
 
 DESCRIPTION="Visual cross-platform gemini browser"
 HOMEPAGE="https://github.com/MasterQ32/kristall"
@@ -14,22 +14,30 @@ if [ "${PV}" == "9999" ]; then
 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="
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qtcore" # qmake
 
-PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
+my_src_compile() {
+	eqmake5 "${S}"/src/kristall.pro
+	emake
+}
 
 src_install() {
-	emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+	cp "${BUILD_DIR}"/kristall . || die
+	emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
 	einstalldocs
 }

diff --git a/net-client/kristall/kristall-9999.ebuild b/net-client/kristall/kristall-9999.ebuild
index e255fe2b1..9664da960 100644
--- a/net-client/kristall/kristall-9999.ebuild
+++ b/net-client/kristall/kristall-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit xdg
+inherit out-of-source qmake-utils xdg
 
 DESCRIPTION="Visual cross-platform gemini browser"
 HOMEPAGE="https://github.com/MasterQ32/kristall"
@@ -14,20 +14,30 @@ if [ "${PV}" == "9999" ]; then
 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="
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qtcore" # qmake
+
+my_src_compile() {
+	eqmake5 "${S}"/src/kristall.pro
+	emake
+}
 
 src_install() {
-	emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+	cp "${BUILD_DIR}"/kristall . || die
+	emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
 	einstalldocs
 }