Various requested fixes

1 files changed, 32 insertions, 12 deletions

diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
index c5c25b8a..7d46668a 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
@@ -19,9 +19,10 @@ SLOT="${TRINITY_VER}"
 
 # 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
+IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +idn +shm elogind
+	networkmanager openexr pcsc-lite aspell sudo tiff utempter elficons +ssl pkcs11 kernel_linux
 	upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
+
 KEYWORDS="~amd64 ~x86"
 
 MY_DEPEND="=dev-tqt/tqtinterface-${PV}
@@ -39,6 +40,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 		!libressl? ( dev-libs/openssl:= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	shm? ( x11-libs/libxshmfence )
 	idn? ( net-dns/libidn )
 	pcre? ( dev-libs/libpcre )
 	svg? ( =media-libs/libart_lgpl-${PV} )
@@ -49,7 +51,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	jpeg2k? ( media-libs/jasper )
 	lua? ( dev-lang/lua:* )
 	openexr? ( media-libs/openexr )
-	spell? ( app-dicts/aspell-en app-text/aspell )
+	aspell? ( app-dicts/aspell-en app-text/aspell )
 	sudo? ( app-admin/sudo )
 	tiff? ( media-libs/tiff:= )
 	utempter? ( sys-libs/libutempter )
@@ -62,29 +64,38 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}
 	hwlib? (
+		acct-group/plugdev
 		!udevil? ( !udisks? ( !old_udisks? ( 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:= )
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
 		old_udisks? ( sys-fs/udisks:0 )
 		udisks? ( sys-fs/udisks:2 )
 		udevil? ( sys-apps/udevil )
 	)"
 
 src_configure() {
+	local enable_logind="OFF"
+	if use systemd || use elogind; then
+		enable_logind="ON"
+	fi
+
 	mycmakeargs=(
 		-DTDE_MALLOC="$(usex malloc)"
 		-DTDE_MALLOC_FULL="$(usex malloc)"
 		-DTDE_MALLOC_DEBUG="$(usex debug)"
-		-DWITH_LIBIDN=ON
-		-DWITH_MITSHM=ON
 		-DWITH_HSPELL=OFF
 		-DWITH_HAL=OFF
 		-DWITH_DEVKITPOWER=OFF
 		-DWITH_OLD_XDG_STD=OFF
 		-DWITH_KDE4_MENU_SUFFIX=OFF
+		-DWITH_LIBIDN="$(usex idn)"
+		-DWITH_MITSHM="$(usex shm)"
 		-DWITH_PCRE="$(usex pcre)"
 		-DWITH_LIBART="$(usex svg)"
 		-DWITH_SSL="$(usex ssl)"
@@ -94,21 +105,26 @@ src_configure() {
 		-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)"
 		-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_ASPELL="$(usex spell)"
+		-DWITH_PCSC="$(usex pcsc-lite)"
+		-DWITH_ASPELL="$(usex aspell)"
 		-DWITH_GAMIN="$(usex fam)"
 		-DWITH_TIFF="$(usex tiff)"
 		-DWITH_UTEMPTER="$(usex utempter)"
+		-DUTEMPTER_HELPER="/usr/sbin/utempter"
 		-DWITH_UPOWER="$(usex upower)"
+		-DWITH_PKCS="$(usex pkcs11)"
 		-DWITH_CONSOLEKIT="$(usex consolekit)"
-		-DWITH_LOGINDPOWER="$(usex systemd)"
+		-DWITH_LOGINDPOWER="${enable_logind}"
 		-DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)"
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 		-DWITH_XRANDR="$(usex xrandr)"
@@ -168,11 +184,11 @@ pkg_postinst () {
 		einfo "It can be overriden on a user-level by adding:"
 		einfo "  [super-user-command]"
 		einfo "    super-user-command=su"
-		einfo "to the kdeglobals config file which is should be usually"
+		einfo "to the kdeglobals config file, which is 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 "You have build TDE with its 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."
@@ -181,9 +197,13 @@ pkg_postinst () {
 	if ! use hwlib; then
 		for flag in consolekit networkmanager upower systemd old_udisks udisks udevil; 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."
+				ewarn "USE=\"$flag\" is passed, but it doesn't change anything because" && \
+				ewarn "$flag support in ${P} takes effect only if the TDE hwlib is enabled."
 		done
 
 	fi
+	if use hwlib; then
+		einfo "Please add your user to the plugdev group to be able"
+		einfo "to use the features of the TDE hwlibdaemons like suspend."
+	fi
 }