14.0.8 ebuilds for tdebase, tdeartwork, tdeutils, and their dependencies (also 14.0.7 ebuild for kworldclock), and removal of obsolete 14.0.6 ebuilds.

Also removed all references to ispell (no longer in main portage tree, aspell provides same functionality) and streamlined spelling flags in general.

Signed-off-by: E. Liddell <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>

2 files changed, 21 insertions, 14 deletions

diff --git a/trinity-base/tdelibs/Manifest b/trinity-base/tdelibs/Manifest
index 29ad8b3c..20aabcd9 100644
--- a/trinity-base/tdelibs/Manifest
+++ b/trinity-base/tdelibs/Manifest
@@ -1,2 +1,3 @@
 DIST tdelibs-trinity-14.0.6.tar.xz 15288368 BLAKE2B a271bcf95a42d9324cd335668691319b6158e3b34e8ffddc2e77b9f0ba065f64297f6ba57b7e282fa6ae5d712007273983fa6a567e8db386235817f810c54798 SHA512 3b976e7ac57a0a1e6b9571d1ab1e97976f551cacb3dc1b980f564d935f04054bc622a67ea085891d681554c2450d2ba96e6fca5210fbd58830ac2e127fd51fb5
 DIST tdelibs-trinity-14.0.7.tar.xz 15302920 BLAKE2B 38e794a91afab9fbbfd6eeb3d7a005b9a96d86f2304a92fffe3b627ffd08de8bff87303d554cfdaeffdc264fad37a22a62a48012d635fd1da0bea49b1fb8db1b SHA512 b1c3ba3c8ebeb1a6ece5823546e0769a2f239420649a589d7defb7e3bdf484024737c10a49c2bcfd150ccbcdd08bf546a8a9ee0487185ae8ee61e2338ce36c58
+DIST tdelibs-trinity-14.0.8.tar.xz 15286968 BLAKE2B f7d149f47027f4db3ce221c186f142d2f5b5e85f16d525e3d39944d2cb7f246b0c50f501c36803c8499738c591e0f06e2bbcc649dbc1578c9a855c5195ef393c SHA512 82c06d17aef37b5f562d1f56ea7e21b750216831da41a4975145ed0f517b1a49cf079918491d9943f6b997decaa2df26d4fdcffd3c40fd1ed7d8058b3697fab4
diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild
index 92c8d157..cd3330b6 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_MODULE_NAME="tdelibs"
-inherit trinity-base-2 multilib
+inherit trinity-base-2
 
 set-trinityver
 
@@ -15,14 +15,14 @@ DESCRIPTION="Trinity libraries needed by all TDE programs"
 HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="${TRINITY_VER}"
 KEYWORDS="~amd64 ~x86"
+SLOT="${TRINITY_VER}"
 
 # NOTE: Building without tdehwlib segfaults, but you can try and report.
-IUSE+=" alsa aspell consolekit cups debug elogind fam +hwlib +idn jpeg2k
-kernel_linux libressl lua lzma +malloc networkmanager old-udisks openexr +pcre
-+shm +ssl sudo +svg systemd tiff udisks upower utempter xcomposite +xrandr
-zeroconf"
+
+IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
+	networkmanager openexr sudo tiff utempter elficons +ssl kernel_linux
+	upower xcomposite +hwlib libressl +xrandr +malloc systemd old-udisks udisks +pcre debug spell"
 
 COMMON_DEPEND="
 	app-text/ghostscript-gpl
@@ -32,11 +32,8 @@ COMMON_DEPEND="
 	~dev-tqt/tqtinterface-${PV}
 	media-libs/fontconfig
 	media-libs/freetype
-	x11-libs/libxshmfence
-	x11-libs/libXcursor
 	x11-libs/libXrender
 	alsa? ( media-libs/alsa-lib )
-	aspell? ( app-dicts/aspell-en app-text/aspell )
 	cups? ( net-print/cups )
 	debug? ( sys-libs/binutils-libs:= )
 	fam? ( virtual/fam )
@@ -48,6 +45,7 @@ COMMON_DEPEND="
 	openexr? ( media-libs/openexr )
 	pcre? ( dev-libs/libpcre )
 	shm? ( x11-libs/libxshmfence )
+	spell? ( app-text/aspell )
 	ssl? (
 		app-misc/ca-certificates
 		!libressl? ( dev-libs/openssl:= )
@@ -59,7 +57,7 @@ COMMON_DEPEND="
 	utempter? ( sys-libs/libutempter )
 	xcomposite? ( x11-libs/libXcomposite )
 	xrandr? ( x11-libs/libXrandr )
-	zeroconf? ( net-dns/avahi )
+	zeroconf? ( ~dev-tqt/avahi-tqt-${PV} )
 "
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}
@@ -75,7 +73,7 @@ RDEPEND+=" ${COMMON_DEPEND}
 		upower? ( sys-power/upower )
 	)"
 
-#Revisit these USE flags and dependencies for 14.0.8
+#Revisit these USE flags and dependencies for 14.0.9
 #pkcs11 pcsc-lite udevil cryptsetup
 #		pcsc-lite? ( sys-apps/pcsc-lite )
 #		pkcs11? ( dev-libs/pkcs11-helper )
@@ -116,7 +114,7 @@ src_configure() {
 		-DWITH_LUA="$(usex lua)"
 		-DWITH_LZMA="$(usex lzma)"
 		-DWITH_OPENEXR="$(usex openexr)"
-		-DWITH_ASPELL="$(usex aspell)"
+		-DWITH_ASPELL="$(usex spell)"
 		-DWITH_GAMIN="$(usex fam)"
 		-DWITH_TIFF="$(usex tiff)"
 		-DWITH_UTEMPTER="$(usex utempter)"
@@ -132,7 +130,7 @@ src_configure() {
 	)
 
 	#These options are not available in this version of the package.
-	#Revisit for 14.0.8.
+	#Revisit for 14.0.9.
 
 	#		-DWITH_UDEVIL="$(usex udevil)"
 	#		-DWITH_CRYPTSETUP="$(usex cryptsetup)"
@@ -187,30 +185,38 @@ EOF
 
 pkg_postinst () {
 	if use sudo; then
+		echo
 		einfo "Remember that the sudo use flag sets only the default superuser command."
 		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 usually"
 		einfo "located in the ~/.trinity/share/config/ directory."
+		echo
 	fi
 	if use malloc; then
+		echo
 		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."
 		einfo "If you remove the malloc USE flag, GLIBC's malloc will be used."
+		echo
 	fi
 	if ! use hwlib; then
-		for flag in consolekit networkmanager upower systemd old-udisks udisks udevil; do
+		for flag in consolekit networkmanager upower systemd elogind old-udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do
 			use $flag && \
+				echo
 				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."
+				echo
 		done
 
 	fi
 	if use hwlib; then
+		echo
 		einfo "Please add your user to the plugdev group to be able"
 		einfo "to use the features of the TDE hwlibdaemons like suspend."
+		echo
 	fi
 }