Live ebuilds: More options, fixed dependencies and cleanup.

TQt:

- Add USE for:
  xrandr, tablet, tools, glib, mng and fontconfig.
- Get ride of forced -g flag (thanks to @selk).
- Make hiddenvisibility a choice.
- Do not dlopen libGL.
- Less debug if building without debug.
- Build sqlite3 plugin too, if build with sqlite.
- Add -xshape -xkb -xcursor for building.
- Fix dependencies and polish.

General:

- DrKonqi: Add USE for hwlib.
- KControl: Add USE for svg.
- TDM: Add USE for svg and hwlib.
- KSMServer: Add USE for hwlib, remove upower.
- Make hwlib USE flag default option.
- Fix dependencies in general.
- Remove avahi USE mask, because fixed.

TDELibs:

- Add USE for:
  svg, pkcs11, elficons, malloc, udisks,
  ssl, udevil, systemd, debug, pcre, idn.
- Use shared memory for pixmap loading.
- Depend on ca-certificates only with ssl USE.
- Ebuild polish and cleanup.
- Messages for informations.
- Remove redundant multilib eclass.
- Add back old_udisks, udisks and udevil USE.

Signed-off-by: Chris <[email protected]>

7 files changed, 100 insertions, 48 deletions

diff --git a/trinity-base/drkonqi/drkonqi-9999.ebuild b/trinity-base/drkonqi/drkonqi-9999.ebuild
index 728396a5..2df7e7de 100644
--- a/trinity-base/drkonqi/drkonqi-9999.ebuild
+++ b/trinity-base/drkonqi/drkonqi-9999.ebuild
@@ -9,4 +9,14 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
 
+IUSE="+hwlib"
+
 RDEPEND="sys-devel/gdb"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_TDEHWLIB="$(usex hwlib)"
+	)
+
+	trinity-meta-2_src_configure
+}
\ No newline at end of file
diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild
index 285794c6..1c868560 100644
--- a/trinity-base/kcontrol/kcontrol-9999.ebuild
+++ b/trinity-base/kcontrol/kcontrol-9999.ebuild
@@ -9,7 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Control Center"
 
-IUSE="samba logitech-mouse ieee1394 hwlib +xrandr "
+IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr "
 
 DEPEND="x11-libs/libX11
 	x11-libs/libXrender
@@ -17,7 +17,6 @@ DEPEND="x11-libs/libX11
 	samba? ( net-fs/samba )
 	logitech-mouse? ( virtual/libusb:0 )
 	ieee1394? ( sys-libs/libraw1394 )
-	xrandr? ( x11-libs/libXrandr )
 	=trinity-base/tdelibs-${PV}[xrandr?]
 	=trinity-base/libkonq-${PV}
 	=trinity-base/kicker-${PV}"
@@ -28,7 +27,8 @@ RDEPEND="${DEPEND}
 	=trinity-base/tdebase-data-${PV}
 	=trinity-base/tdesu-${PV}
 	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}"
+	=trinity-base/khotkeys-${PV}
+	svg? ( =media-libs/libart_lgpl-${PV} )"
 
 TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
 
@@ -42,6 +42,7 @@ src_configure() {
 		-DWITH_LIBRAW1394="$(usex ieee1394)"
 		-DWITH_XRANDR="$(usex xrandr)"
 		-DWITH_TDEHWLIB="$(usex hwlib)"
+		-DWITH_LIBART="$(usex svg)"
 		-DXSCREENSAVER_DIR="/usr/$(get_libdir)/misc/xscreensaver"
 	)
 
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index e9c2e17c..7d432165 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-9999.ebuild
@@ -12,6 +12,7 @@ IUSE="pam xscreensaver"
 
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
+	=dev-libs/dbus-1-tqt-${PV}
 	=trinity-base/libkonq-${PV}
 	=trinity-base/kcontrol-${PV}
 	xscreensaver? ( x11-libs/libXScrnSaver )"
diff --git a/trinity-base/ksmserver/ksmserver-9999.ebuild b/trinity-base/ksmserver/ksmserver-9999.ebuild
index deff4082..70cb75b9 100644
--- a/trinity-base/ksmserver/ksmserver-9999.ebuild
+++ b/trinity-base/ksmserver/ksmserver-9999.ebuild
@@ -8,18 +8,11 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6"
-IUSE="upower"
-
-DEPEND="
-	=dev-libs/dbus-tqt-${PV}
-	upower? ( =dev-libs/dbus-1-tqt-${PV} ) "
-
-RDEPEND="${DEPEND}
-	upower? ( sys-power/upower ) "
+IUSE="+hwlib"
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_UPOWER="$(usex upower)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
 	)
 
 	trinity-meta-2_src_configure
diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild
index cd538bd6..716b6415 100644
--- a/trinity-base/ksysguard/ksysguard-9999.ebuild
+++ b/trinity-base/ksysguard/ksysguard-9999.ebuild
@@ -9,7 +9,10 @@ inherit trinity-meta-2
 
 DESCRIPTION="A network enabled task manager/system monitor"
 
-IUSE=" dell-laptop lm_sensors"
+IUSE="dell-laptop lm_sensors"
+
+DEPEND="lm_sensors? ( sys-apps/lm-sensors )"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild
index ec224dbd..2b0dc2f6 100644
--- a/trinity-base/tdelibs/tdelibs-9999.ebuild
+++ b/trinity-base/tdelibs/tdelibs-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 TRINITY_MODULE_NAME="tdelibs"
 
-inherit trinity-base-2 multilib
+inherit trinity-base-2
 
 set-trinityver
 
@@ -17,60 +17,84 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 
 SLOT="${TRINITY_VER}"
 
-IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua 
-	lzma networkmanager openexr pcsc-lite spell sudo tiff 
-	utempter upower xcomposite hwlib libressl +xrandr "
+# NOTE: Building without tdehwlib segfaults, but you can try and report.
+
+IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +idn
+	networkmanager openexr pcsc-lite spell sudo tiff utempter elficons +ssl pkcs11 kernel_linux
+	upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
 
 MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
-	dev-libs/libpcre
-	net-dns/libidn
 	app-text/ghostscript-gpl
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	app-misc/ca-certificates
 	media-libs/fontconfig
 	media-libs/freetype
-	=media-libs/libart_lgpl-${PV}
 	=dev-libs/dbus-1-tqt-${PV}
+	x11-libs/libxshmfence
 	x11-libs/libXrender
+	ssl? (
+		app-misc/ca-certificates
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	idn? ( net-dns/libidn )
+	pcre? ( dev-libs/libpcre )
+	svg? ( =media-libs/libart_lgpl-${PV} )
 	alsa? ( media-libs/alsa-lib )
 	avahi? ( net-dns/avahi )
-	cryptsetup? ( sys-fs/cryptsetup )
 	cups? ( net-print/cups )
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
 	lua? ( dev-lang/lua:* )
 	openexr? ( media-libs/openexr )
-	pcsc-lite? ( sys-apps/pcsc-lite )
 	spell? ( app-dicts/aspell-en app-text/aspell )
 	sudo? ( app-admin/sudo )
 	tiff? ( media-libs/tiff:= )
 	utempter? ( sys-libs/libutempter )
-	networkmanager? ( net-misc/networkmanager )
 	lzma? ( app-arch/xz-utils )
 	xrandr? ( x11-libs/libXrandr )
-	xcomposite? ( x11-libs/libXcomposite )"
-# TODO: add elfres support via libr (not in portage now)
-# NOTE: Building without tdehwlib segfaults, so no choice until fixed.
+	xcomposite? ( x11-libs/libXcomposite )
+	elficons? ( =sys-libs/libr-${PV} )
+	debug? ( sys-libs/binutils-libs:= )"
+
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-	upower? ( sys-power/upower )
-	hwlib? ( || ( sys-fs/udisks sys-apps/udevil sys-apps/pmount ) )"
+	hwlib? (
+		sys-apps/pmount
+		pcsc-lite? ( sys-apps/pcsc-lite )
+		pkcs11? ( dev-libs/pkcs11-helper )
+		cryptsetup? ( sys-fs/cryptsetup )
+		networkmanager? ( net-misc/networkmanager )
+		consolekit? ( sys-auth/consolekit )
+		upower? ( sys-power/upower )
+		systemd? ( sys-apps/systemd:= )
+		old_udisks? ( sys-fs/udisks:0 )
+		udisks? ( sys-fs/udisks:2 )
+		udevil? ( sys-apps/udevil )
+	)"
 
 src_configure() {
 	mycmakeargs=(
-		-DTDE_MALLOC_FULL=ON
+		-DTDE_MALLOC="$(usex malloc)"
+		-DTDE_MALLOC_FULL="$(usex malloc)"
+		-DTDE_MALLOC_DEBUG="$(usex debug)"
 		-DWITH_LIBIDN=ON
-		-DWITH_SSL=ON
-		-DWITH_LIBART=ON
-		-DWITH_PCRE=ON
+		-DWITH_MITSHM=ON
 		-DWITH_HSPELL=OFF
-		-DWITH_PKCS=OFF
-		-DWITH_TDEHWLIB=ON
-		-DWITH_TDEHWLIB_DAEMONS=ON
+		-DWITH_HAL=OFF
+		-DWITH_DEVKITPOWER=OFF
+		-DWITH_OLD_XDG_STD=OFF
+		-DWITH_KDE4_MENU_SUFFIX=OFF
+		-DWITH_PCRE="$(usex pcre)"
+		-DWITH_LIBART="$(usex svg)"
+		-DWITH_SSL="$(usex ssl)"
+		-DWITH_LIBBFD="$(usex debug)"
+		-DWITH_ELFICON="$(usex elficons)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
+		-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
+		-DWITH_UDISKS="$(usex old_udisks)"
+		-DWITH_UDISKS2="$(usex udisks)"
+		-DWITH_UDEVIL="$(usex udevil)"
 		-DWITH_ALSA="$(usex alsa)"
 		-DWITH_AVAHI="$(usex avahi)"
 		-DWITH_CRYPTSETUP="$(usex cryptsetup)"
@@ -86,11 +110,14 @@ src_configure() {
 		-DWITH_TIFF="$(usex tiff)"
 		-DWITH_UTEMPTER="$(usex utempter)"
 		-DWITH_UPOWER="$(usex upower)"
+		-DWITH_PKCS="$(usex pkcs11)"
 		-DWITH_CONSOLEKIT="$(usex consolekit)"
+		-DWITH_LOGINDPOWER="$(usex systemd)"
 		-DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)"
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 		-DWITH_XRANDR="$(usex xrandr)"
 		-DWITH_SUDO_TDESU_BACKEND="$(usex sudo)"
+		-DWITH_TDEICONLOADER_DEBUG="$(usex debug)"
 	)
 
 	trinity-base-2_src_configure
@@ -99,9 +126,11 @@ src_configure() {
 src_install() {
 	trinity-base-2_src_install
 	
-	# Make TDE to use our system certificates
-	rm -f "${D}"${TDEDIR}/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt ${TDEDIR}/share/apps/kssl/ca-bundle.crt
+	if use ssl; then
+		# Make TDE to use our system certificates
+		rm -f "${D}"${TDEDIR}/share/apps/kssl/ca-bundle.crt || die
+		dosym /etc/ssl/certs/ca-certificates.crt ${TDEDIR}/share/apps/kssl/ca-bundle.crt
+	fi
 
 	dodir /etc/env.d
 	# TDE expects that the install path is listed first in TDEDIRS and the user
@@ -146,4 +175,19 @@ pkg_postinst () {
 		einfo "to the kdeglobals config file which is should be usually"
 		einfo "located in the ~/.trinity/share/config/ directory."
 	fi
+	if use malloc; then
+		einfo "You have build TDE with it's own malloc implementation."
+		einfo "That might result in better memory use for you when using TDE."
+		einfo "But it could also result in a slightly different performance."
+		einfo "With Gentoo you are free to choose what works better for you."
+		einfo "If you remove the malloc USE flag, GLIBC's malloc will be used."
+	fi
+	if ! use hwlib; then
+		for flag in consolekit networkmanager upower systemd old_udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do
+			use $flag && \
+				ewarn "USE=\"$flag\" is passed, but it doesn't change anything due to" && \
+				ewarn "$flag support in ${P} take effect only if the TDE hwlib is enabled."
+		done
+
+	fi
 }
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index 023fcb74..f35a1f5e 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -9,16 +9,15 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity login manager, similar to XDM and GDM"
 
-IUSE="pam xdmcp xcomposite sak +xrandr"
+IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg"
 
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
-	xrandr? ( x11-libs/libXrandr )
+	svg? ( =media-libs/libart_lgpl-${PV} )
 	=trinity-base/tdelibs-${PV}[xrandr?]
 	x11-libs/libXtst
-	=trinity-base/kcontrol-${PV}
-	=dev-libs/dbus-tqt-${PV}"
+	=trinity-base/kcontrol-${PV}"
 
 RDEPEND="${DEPEND}
 	=trinity-base/tdepasswd-${PV}
@@ -33,11 +32,12 @@ pkg_setup() {
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XTEST=ON
-		-DWITH_LIBART=ON
 		-DWITH_SHADOW=ON
+		-DWITH_LIBART="$(usex svg)"
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 		-DWITH_XDMCP="$(usex xdmcp)"
 		-DWITH_XRANDR="$(usex xrandr)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
 		-DWITH_PAM="$(usex pam)"
 		-DTDM_PAM_SERVICE=tde
 	)
@@ -80,7 +80,7 @@ pkg_postinst() {
 			sak_ok=no
 		else
 			if ! linux_chkconfig_present INPUT_UINPUT; then
-				eerror "You build tdm with sak feature enabled. "
+				eerror "You build TDM with SAK feature enabled. "
 				eerror "It requires the INPUT_UINPUT support enabled."
 				eerror "Please enable it:"
 				eerror "    CONFIG_INPUT_UINPUT=y"