EAPI 7 for tqt, tqtinterface, dbus-1-tqt, tdelibs live ebuilds; modified USE flags and deps for tdelibs-9999

Signed-off-by: E. Liddell <[email protected]>

5 files changed, 41 insertions, 18 deletions

diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild
index eec87c0d..48444b81 100644
--- a/dev-tqt/tqt/tqt-9999.ebuild
+++ b/dev-tqt/tqt/tqt-9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 TQTBASE="/usr/tqt3"
 
 pkg_setup() {
-	export QTDIR="${S}"
+	export TQTDIR="${S}"
 
 	CXX=$(tc-getCXX)
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
diff --git a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
index 6448acb0..d308a69e 100644
--- a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
 TRINITY_MODULE_NAME="${PN}"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="Interface and abstraction library for TQt and Trinity"
 HOMEPAGE="http://trinitydesktop.org/"
@@ -21,13 +21,13 @@ DEPEND="~dev-tqt/tqt-${PV}
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	export QTDIR="/usr/tqt3"
+	export TQTDIR="/usr/tqt3"
 }
 
 src_configure() {
 	mycmakeargs=(
 		-DUSE_QT3=ON
-		-DQT_PREFIX_DIR="$QTDIR"
+		-DQT_PREFIX_DIR="$TQTDIR"
 	 )
 
 	 cmake-utils_src_configure
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
new file mode 100644
index 00000000..a8f93fd9
--- /dev/null
+++ b/profiles/package.use.mask
@@ -0,0 +1,15 @@
+# unmask this if we will support powerpc
+trinity-base/kmilo powerbook-laptop
+
+dev-qt/tqtinterface qt4
+trinity-base/kdelibs avahi
+trinity-base/tdelibs avahi
+
+#doesn't really work
+>dev-qt/tqtinterface-14.0.0 qt3
+
+# FIXME: FTBFS
+=trinity-base/ksmserver-9999 hal
+
+#broken but being fixed as of Jan. 2019
+trinity-base/tdelibs cryptsetup
\ No newline at end of file
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
new file mode 100644
index 00000000..7b650d10
--- /dev/null
+++ b/profiles/use.local.desc
@@ -0,0 +1,3 @@
+trinity-base/tdelibs:hwlib - Media support via tdehwlib and dbus
+trinity-base/tdelibs:pcsc-lite - Smartcard support via pcsc-lite
+trinity-base/tdelibs:cryptsetup - Support for sys-fs/cryptsetup
diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild
index baf32b50..d95ea4f5 100644
--- a/trinity-base/tdelibs/tdelibs-9999.ebuild
+++ b/trinity-base/tdelibs/tdelibs-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 TRINITY_MODULE_NAME="$PN"
 
-inherit trinity-base multilib
+inherit trinity-base-2 multilib
 
 set-trinityver
 
@@ -15,8 +15,9 @@ HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="${TRINITY_VER}"
 KEYWORDS=
-IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma networkmanager openexr
-	spell sudo tiff utempter upower udisks old_udisks xcomposite +xrandr"
+IUSE+=" alsa avahi cups consolekit cryptsetup fam hwlib jpeg2k lua 
+	lzma networkmanager openexr pcsc-lite spell sudo tiff 
+	utempter upower xcomposite +xrandr"
 
 MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	>=dev-libs/libxslt-1.1.16
@@ -34,11 +35,13 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	x11-libs/libXrender
 	alsa? ( media-libs/alsa-lib )
 	avahi? ( net-dns/avahi )
+	cryptsetup? ( sys-fs/cryptsetup )
 	cups? ( >=net-print/cups-1.1.19 )
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
 	lua? ( dev-lang/lua:* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	pcsc-lite? ( sys-apps/pcsc-lite )
 	spell? ( >=app-dicts/aspell-en-6.0.0 >=app-text/aspell-0.60.5 )
 	sudo? ( app-admin/sudo )
 	tiff? ( media-libs/tiff:= )
@@ -53,36 +56,35 @@ DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}
 	consolekit? ( sys-auth/consolekit )
 	upower? ( sys-power/upower )
-	udisks? ( sys-fs/udisks:2 )
-	old_udisks? ( sys-fs/udisks:0 )"
+	hwlib? ( || ( sys-fs/udisks sys-apps/udevil sys-apps/pmount ) )"
 
 src_configure() {
 	mycmakeargs=(
-		-DMALLOC_FULL=ON
+		-TDE_DMALLOC_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_TDEHWLIB=OFF
+		-DWITH_PKCS=OFF
+		-DWITH_TDEHWLIB="$(usex hwlib)"
+		-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
 		-DWITH_ARTS=OFF
 		-DWITH_ALSA="$(usex alsa)"
 		-DWITH_AVAHI="$(usex avahi)"
+		-DWITH_CRYPTSETUP="$(usex cryptsetup)"
 		-DWITH_CUPS="$(usex cups)"
 		-DWITH_INOTIFY="$(usex kernel_linux)"
 		-DWITH_JASPER="$(usex jpeg2k)"
 		-DWITH_LUA="$(usex lua)"
 		-DWITH_LZMA="$(usex lzma)"
 		-DWITH_OPENEXR="$(usex openexr)"
+		-DWITH_PCSC="$(usex pcsc-lite)"
 		-DWITH_ASPELL="$(usex spell)"
 		-DWITH_GAMIN="$(usex fam)"
 		-DWITH_TIFF="$(usex tiff)"
 		-DWITH_UTEMPTER="$(usex utempter)"
 		-DWITH_UPOWER="$(usex upower)"
-		-DWITH_UDISKS="$(usex old_udisks)"
-		-DWITH_UDISKS2="$(usex udisks)"
 		-DWITH_CONSOLEKIT="$(usex consolekit)"
 		-DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)"
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
@@ -90,6 +92,9 @@ src_configure() {
 		-DWITH_SUDO_TDESU_BACKEND="$(usex sudo)"
 	)
 
+#		-DWITH_XCURSOR=ON
+#		-DKDE4_DEFAULT_HOME=.kde4
+
 	trinity-base_src_configure
 }
 
@@ -97,10 +102,10 @@ src_install() {
 	trinity-base_src_install
 
 	dodir /etc/env.d
-	# KDE implies that the install path is listed first in TDEDIRS and the user
-	# directory (implicitly added) to be the last entry. Doing otherwise breaks
+	# TDE expects that the install path is listed first in TDEDIRS and the user
+	# directory (implicitly added) is the last entry. Doing otherwise breaks
 	# certain functionality. Do not break this (once again *sigh*), but read the code.
-	# KDE saves the installed path implicitly and so this is not needed, /usr
+	# TDE saves the installed path implicitly and so this is not needed, /usr
 	# is set in ${TDEDIR}/share/config/kdeglobals and so TDEDIRS is not needed.
 
 	# List all the multilib libdirs