From caa72c95dead3dfe0a365b47d783393ae98e3f14 Mon Sep 17 00:00:00 2001
From: "E. Liddell" <ejlddll@warpmail.net>
Date: Sat, 4 Jan 2020 15:52:45 -0500
Subject: Moved EAPI 7 eclasses to trinity-[foo]-2.eclass; 14.0.6 ebuilds for
 tqt, tqtinterface, dbus-1-tqt, tdelibs amended to work with new eclasses

Signed-off-by: E. Liddell <ejlddll@warpmail.net>
---
 trinity-base/tdelibs/tdelibs-14.0.6.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'trinity-base')

diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
index 9b93b211..9f919b21 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 TRINITY_MODULE_NAME="$PN"
 
-inherit trinity-base multilib
+inherit trinity-base-2 multilib
 
 set-trinityver
 
@@ -58,14 +58,12 @@ RDEPEND+=" ${MY_DEPEND}
 
 src_configure() {
 	mycmakeargs=(
-		-DMALLOC_FULL=ON
+		-DTDE_MALLOC_FULL=ON
 		-DWITH_LIBIDN=ON
 		-DWITH_SSL=ON
 		-DWITH_LIBART=ON
 		-DWITH_PCRE=ON
-		-DWITH_XCURSOR=ON
 		-DWITH_HSPELL=OFF
-		-DKDE4_DEFAULT_HOME=.kde4
 		-DWITH_ARTS=OFF
 		-DWITH_ALSA="$(usex alsa)"
 		-DWITH_AVAHI="$(usex avahi)"
@@ -89,11 +87,14 @@ src_configure() {
 		-DWITH_SUDO_TDESU_BACKEND="$(usex sudo)"
 	)
 
-	trinity-base_src_configure
+#		-DWITH_XCURSOR=ON
+#		-DKDE4_DEFAULT_HOME=.kde4
+
+	trinity-base-2_src_configure
 }
 
 src_install() {
-	trinity-base_src_install
+	trinity-base-2_src_install
 
 	dodir /etc/env.d
 	# KDE implies that the install path is listed first in TDEDIRS and the user
@@ -125,8 +126,8 @@ cat <<EOF >"${D}/etc/revdep-rebuild/50-trinity-${SLOT}"
 SEARCH_DIRS="${TDEDIR}/bin ${TDEDIR}/lib*"
 EOF
 
-	trinity-base_create_tmp_docfiles
-	trinity-base_install_docfiles
+	trinity-base-2_create_tmp_docfiles
+	trinity-base-2_install_docfiles
 }
 
 pkg_postinst () {
-- 
cgit v1.2.1