From 847ca6ea8c55e74c3f482436c7644a607e332c8c Mon Sep 17 00:00:00 2001
From: ormorph <roma251078@mail.ru>
Date: Sun, 31 Jul 2022 12:51:48 +0200
Subject: Added python-tqt packages and fixed shortcomings

Signed-off-by: ormorph <roma251078@mail.ru>
---
 x11-libs/tqscintilla/tqscintilla-14.0.12.ebuild | 39 +++++------------------
 x11-libs/tqscintilla/tqscintilla-9999.ebuild    | 41 +++++--------------------
 2 files changed, 15 insertions(+), 65 deletions(-)

(limited to 'x11-libs')

diff --git a/x11-libs/tqscintilla/tqscintilla-14.0.12.ebuild b/x11-libs/tqscintilla/tqscintilla-14.0.12.ebuild
index db381aba..76c1ace2 100644
--- a/x11-libs/tqscintilla/tqscintilla-14.0.12.ebuild
+++ b/x11-libs/tqscintilla/tqscintilla-14.0.12.ebuild
@@ -22,37 +22,12 @@ RDEPEND="${DEPEND}"
 
 TQBASE="/usr/tqt3"
 
-src_prepare() {
-	sed -i -e "s|include/tqt|include/tqt ${TQBASE}/include|" "${S}/qt/qscintilla.pro" || die
-	eapply_user
-}
-
 src_configure() {
-	echo 'QMAKE_CXXFLAGS += -std=c++98' >>"designer/designer.pro"
-	echo 'QMAKE_LIBS += -L${S}/lib' >>"designer/designer.pro"
-	pushd  qt || die
-		tqmake "DESTDIR=${S}/lib" || die
-	popd
-	pushd  designer || die
-                tqmake || die
-	popd
-}
-
-src_compile() {
-	emake -C qt
-	emake -C designer
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}" -C qt install
-	insinto "${TQBASE}/$(get_libdir)"
-	insopts "-m 0755"
-	doins  lib/*
-	insinto "${TQBASE}/plugins/designer"
-	doins designer/*.so
-	insopts "-m 0644"
-	insinto "${TQBASE}/include/private"
-	doins include/*.h
-	insinto "${TDEDIR}/share/doc/tde/HTML/en/tqscintilla"
-	doins doc/html/*
+	local mycmakeargs
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${TQBASE}"
+		-DHTML_INSTALL_DIR="${TDEDIR}/share/doc/tde/HTML"
+		-DBUILD_ALL=ON
+	)
+	trinity-base-2_src_configure
 }
diff --git a/x11-libs/tqscintilla/tqscintilla-9999.ebuild b/x11-libs/tqscintilla/tqscintilla-9999.ebuild
index fa04832e..89a1e87b 100644
--- a/x11-libs/tqscintilla/tqscintilla-9999.ebuild
+++ b/x11-libs/tqscintilla/tqscintilla-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -22,37 +22,12 @@ RDEPEND="${DEPEND}"
 
 TQBASE="/usr/tqt3"
 
-src_prepare() {
-	sed -i -e "s|include/tqt|include/tqt ${TQBASE}/include|" "${S}/qt/qscintilla.pro" || die
-	eapply_user
-}
-
 src_configure() {
-	echo 'QMAKE_CXXFLAGS += -std=c++98' >>"designer/designer.pro"
-	echo 'QMAKE_LIBS += -L${S}/lib' >>"designer/designer.pro"
-	pushd  qt || die
-		tqmake "DESTDIR=${S}/lib" || die
-	popd
-	pushd  designer || die
-                tqmake || die
-	popd
-}
-
-src_compile() {
-	emake -C qt
-	emake -C designer
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}" -C qt install
-	insinto "${TQBASE}/$(get_libdir)"
-	insopts "-m 0755"
-	doins  lib/*
-	insinto "${TQBASE}/plugins/designer"
-	doins designer/*.so
-	insopts "-m 0644"
-	insinto "${TQBASE}/include/private"
-	doins include/*.h
-	insinto "${TDEDIR}/share/doc/tde/HTML/en/tqscintilla"
-	doins doc/html/*
+	local mycmakeargs
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${TQBASE}"
+		-DHTML_INSTALL_DIR="${TDEDIR}/share/doc/tde/HTML"
+		-DBUILD_ALL=ON
+	)
+	trinity-base-2_src_configure
 }
-- 
cgit v1.2.1