Solving the tdemultimedia multiple build problem

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

19 files changed, 206 insertions, 277 deletions

diff --git a/trinity-base/kaudiocreator/kaudiocreator-14.0.12.ebuild b/trinity-base/kaudiocreator/kaudiocreator-14.0.12.ebuild
index 6d058bdf..0be46794 100644
--- a/trinity-base/kaudiocreator/kaudiocreator-14.0.12.ebuild
+++ b/trinity-base/kaudiocreator/kaudiocreator-14.0.12.ebuild
@@ -14,6 +14,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 IUSE="encode flac mp3 vorbis"
 DEPEND="~trinity-base/libkcddb-${PV}
+	~trinity-base/libkscd-${PV}
 	media-sound/cdparanoia"
 
 # External encoders used - no optional compile-time support
@@ -23,36 +24,15 @@ RDEPEND="${RDEPEND}
 			flac? ( media-libs/flac )
 			mp3? ( media-sound/lame ) )"
 
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_LIBKCDDB=yes
-		-DBUILD_KSCD=yes
-	)
-
-	trinity-meta-2_src_configure
+src_prepare() {
+	sed -i 's/kcddb-shared/kcddb/' "${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/if( NOT BUILD_KSCD )/if( BUILD_KSCD )/' "${S}/CMakeLists.txt" || die
+	sed -i -e 's/kcompactdisc-static/kcompactdisc/' -e 's/workman-static/workman/' "${S}/${PN}/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
 }
 
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with libkcddb and kscd.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r "${D}"/usr/trinity/14/include/
-	rm -r "${D}"/usr/trinity/14/lib64/
-	rm -r "${D}"/usr/trinity/14/bin/kscd
-	rm -r "${D}"/usr/trinity/14/bin/workman2cddb.pl
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/128x128
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/48x48
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/64x64
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
-	rm -r "${D}"/usr/trinity/14/share/apps/profiles/
-	rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/kscd/
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	append-ldflags "-L${TDEDIR}/$(get_libdir)/kscd"
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
index 751c54fd..4ab79244 100644
--- a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
@@ -7,7 +7,7 @@ TRINITY_MODULE_TYPE="core"
 TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libkcddb/ kscd/"
 
-inherit trinity-meta-2
+inherit flag-o-matic trinity-meta-2
 
 DESCRIPTION="TDE CD ripper and audio encoder frontend"
 if [[ ${PV} != *9999* ]] ; then
@@ -15,6 +15,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 IUSE="encode flac mp3 vorbis"
 DEPEND="~trinity-base/libkcddb-${PV}
+	~trinity-base/libkscd-${PV}
 	media-sound/cdparanoia"
 
 # External encoders used - no optional compile-time support
@@ -24,38 +25,15 @@ RDEPEND="${RDEPEND}
 			flac? ( media-libs/flac )
 			mp3? ( media-sound/lame ) )"
 
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_LIBKCDDB=yes
-		-DBUILD_KSCD=yes
-	)
-
-	trinity-meta-2_src_configure
+src_prepare() {
+        sed -i 's/kcddb-shared/kcddb/' "${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/if( NOT BUILD_KSCD )/if( BUILD_KSCD )/' "${S}/CMakeLists.txt" || die
+	sed -i -e 's/kcompactdisc-static/kcompactdisc/' -e 's/workman-static/workman/' "${S}/${PN}/CMakeLists.txt" || die
+        trinity-meta-2_src_prepare
 }
 
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with libkcddb and kscd.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r "${D}"/usr/trinity/14/include/
-	rm -r "${D}"/usr/trinity/14/lib64/
-	rm -r "${D}"/usr/trinity/14/bin/kscd
-	rm -r "${D}"/usr/trinity/14/bin/workman2cddb.pl
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/128x128
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/48x48
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/64x64
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
-	rm -r "${D}"/usr/trinity/14/share/apps/profiles/
-	rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/kscd/
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kcontrol/cddb
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kscd
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	append-ldflags "-L${TDEDIR}/$(get_libdir)/kscd"
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/krec/krec-14.0.12.ebuild b/trinity-base/krec/krec-14.0.12.ebuild
index 8a02e9e1..187bf281 100644
--- a/trinity-base/krec/krec-14.0.12.ebuild
+++ b/trinity-base/krec/krec-14.0.12.ebuild
@@ -19,37 +19,25 @@ DEPEND="~trinity-base/tdemultimedia-arts-${PV}
 			vorbis? ( media-libs/libvorbis ) )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's/NOT BUILD_ARTS/BUILD_ARTS/' "${S}/CMakeLists.txt" || die
+	sed -i -e 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		-e 's/artscontrolsupport-shared/artscontrolsupport/' \
+		-e 's/artsgui_kde-shared/artsgui_kde/g'  \
+		-e 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		-e 's/soundserver_idl/soundserver_idl artsgui_idl/' \
+		"${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		"${S}/${PN}/mp3_export/CMakeLists.txt" || die
+	sed -i 's/artsmoduleseffects-shared/artsmoduleseffects/' "${S}/${PN}/ogg_export/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_LAME="$(usex mp3)"
 		-DWITH_VORBIS="$(usex vorbis)"
-		-DBUILD_ARTS=yes
 	)
 
 	trinity-meta-2_src_configure
 }
-
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with tdemultimedia-arts.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r ${D}/usr/trinity/14/share/apps/artscontrol/
-	rm -r ${D}/usr/trinity/14/share/apps/artsbuilder/
-	rm -r ${D}/usr/trinity/14/include/
-	rm -r ${D}/usr/trinity/14/lib64/libarts*
-	rm -r ${D}/usr/trinity/14/lib64/mcop/arts*
-	rm -r ${D}/usr/trinity/14/lib64/mcop/Arts/
-	rm -r ${D}/usr/trinity/14/share/icons/*/*/apps/artscontrol.png
-	rm -r ${D}/usr/trinity/14/share/icons/*/*/apps/artsbuilder.png
-	rm -r ${D}/usr/trinity/14/share/icons/hicolor/scalable/
-	rm -r ${D}/usr/trinity/14/share/icons/crystalsvg/
-	rm -r ${D}/usr/trinity/14/share/applications/tde/artscontrol.desktop
-	rm -r ${D}/usr/trinity/14/share/applications/tde/artsbuilder.desktop
-	rm -r ${D}/usr/trinity/14/bin/artscontrol
-	rm -r ${D}/usr/trinity/14/bin/artsbuilder
-	rm -r ${D}/usr/trinity/14/bin/midisend
-	rm -r ${D}/usr/trinity/14/share/mimelnk/
-	rm -r ${D}/usr/trinity/14/share/apps/kicker/
-}
diff --git a/trinity-base/krec/krec-9999.ebuild b/trinity-base/krec/krec-9999.ebuild
index f0b40654..40e96e25 100644
--- a/trinity-base/krec/krec-9999.ebuild
+++ b/trinity-base/krec/krec-9999.ebuild
@@ -20,38 +20,25 @@ DEPEND="~trinity-base/tdemultimedia-arts-${PV}
 			vorbis? ( media-libs/libvorbis ) )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's/NOT BUILD_ARTS/BUILD_ARTS/' "${S}/CMakeLists.txt" || die
+	sed -i -e 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		-e 's/artscontrolsupport-shared/artscontrolsupport/' \
+		-e 's/artsgui_kde-shared/artsgui_kde/g'  \
+		-e 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		"${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/artsmoduleseffects-shared/artsmoduleseffects/' \
+		"${S}/${PN}/mp3_export/CMakeLists.txt" || die
+	sed -i 's/artsmoduleseffects-shared/artsmoduleseffects/' "${S}/${PN}/ogg_export/CMakeLists.txt" || die
+	sed -i 's/soundserver_idl/soundserver_idl artsgui_idl/' "${S}/${PN}/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_LAME="$(usex mp3)"
 		-DWITH_VORBIS="$(usex vorbis)"
-		-DBUILD_ARTS=yes
 	)
 
 	trinity-meta-2_src_configure
 }
-
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with tdemultimedia-arts.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/artscontrol/
-	rm -r "${D}"/usr/trinity/14/share/apps/artsbuilder/
-	rm -r "${D}"/usr/trinity/14/include/
-	rm -r "${D}"/usr/trinity/14/lib64/libarts*
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/arts*
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/Arts/
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artscontrol.png
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artsbuilder.png
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/scalable/
-	rm -r "${D}"/usr/trinity/14/share/icons/crystalsvg/
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artscontrol.desktop
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artsbuilder.desktop
-	rm -r "${D}"/usr/trinity/14/bin/artscontrol
-	rm -r "${D}"/usr/trinity/14/bin/artsbuilder
-	rm -r "${D}"/usr/trinity/14/bin/midisend
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/
-	rm -r "${D}"/usr/trinity/14/share/apps/kicker/
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/artsbuilder
-}
diff --git a/trinity-base/kscd/kscd-14.0.11.ebuild b/trinity-base/kscd/kscd-14.0.11.ebuild
index 1f2d740f..45070814 100644
--- a/trinity-base/kscd/kscd-14.0.11.ebuild
+++ b/trinity-base/kscd/kscd-14.0.11.ebuild
@@ -9,7 +9,7 @@ TSM_EXTRACT_ALSO="libkcddb/"
 
 inherit trinity-meta-2
 
-DESCRIPTION="Trinity mixer GUI"
+DESCRIPTION="Audio CD player for Trinity"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
diff --git a/trinity-base/kscd/kscd-14.0.12.ebuild b/trinity-base/kscd/kscd-14.0.12.ebuild
index 6fbd03b4..4f73f6b3 100644
--- a/trinity-base/kscd/kscd-14.0.12.ebuild
+++ b/trinity-base/kscd/kscd-14.0.12.ebuild
@@ -7,9 +7,9 @@ TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
 TSM_EXTRACT_ALSO="libkcddb/"
 
-inherit trinity-meta-2
+inherit flag-o-matic trinity-meta-2
 
-DESCRIPTION="Trinity mixer GUI"
+DESCRIPTION="Audio CD player for Trinity"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
@@ -17,23 +17,12 @@ fi
 DEPEND="x11-libs/libXext
 	~trinity-base/libkcddb-${PV}"
 
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_LIBKCDDB=yes
-	)
-
-	trinity-meta-2_src_configure
+src_prepare() {
+	sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
 }
 
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with libkcddb.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r ${D}/usr/trinity/14/share/apps/tdeconf_update/
-	rm -r ${D}/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r ${D}/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r ${D}/usr/trinity/14/include/
-	rm -r ${D}/usr/trinity/14/lib64/
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kscd/kscd-9999.ebuild b/trinity-base/kscd/kscd-9999.ebuild
index eb30ee26..dc3528f0 100644
--- a/trinity-base/kscd/kscd-9999.ebuild
+++ b/trinity-base/kscd/kscd-9999.ebuild
@@ -8,9 +8,9 @@ TRINITY_MODULE_TYPE="core"
 TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libkcddb/"
 
-inherit trinity-meta-2
+inherit flag-o-matic trinity-meta-2
 
-DESCRIPTION="Trinity mixer GUI"
+DESCRIPTION="Audio CD player for Trinity"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -18,24 +18,14 @@ fi
 DEPEND="x11-libs/libXext
 	~trinity-base/libkcddb-${PV}"
 
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_LIBKCDDB=yes
-	)
 
-	trinity-meta-2_src_configure
+src_prepare() {
+	sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
 }
 
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with libkcddb.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/tdeconf_update/
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r "${D}"/usr/trinity/14/include/
-	rm -r "${D}"/usr/trinity/14/lib64/
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kcontrol/cddb
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	trinity-meta-2_src_configure
 }
+
diff --git a/trinity-base/libkcddb/libkcddb-14.0.12.ebuild b/trinity-base/libkcddb/libkcddb-14.0.12.ebuild
index 943a4067..2af3130c 100644
--- a/trinity-base/libkcddb/libkcddb-14.0.12.ebuild
+++ b/trinity-base/libkcddb/libkcddb-14.0.12.ebuild
@@ -12,3 +12,9 @@ DESCRIPTION="KDE library for CDDB"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
+
+src_prepare() {
+	sed -e 's|${CMAKE_CURRENT_BINARY_DIR}/configbase.h|${CMAKE_CURRENT_BINARY_DIR}/configbase.h\n    ${CMAKE_CURRENT_BINARY_DIR}/cdinfodialogbase.h|' \
+	-i "${S}/libkcddb/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
diff --git a/trinity-base/libkcddb/libkcddb-9999.ebuild b/trinity-base/libkcddb/libkcddb-9999.ebuild
index c8147e22..cc9db547 100644
--- a/trinity-base/libkcddb/libkcddb-9999.ebuild
+++ b/trinity-base/libkcddb/libkcddb-9999.ebuild
@@ -13,3 +13,9 @@ DESCRIPTION="KDE library for CDDB"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
+
+src_prepare() {
+	sed -e 's|${CMAKE_CURRENT_BINARY_DIR}/configbase.h|${CMAKE_CURRENT_BINARY_DIR}/configbase.h\n    ${CMAKE_CURRENT_BINARY_DIR}/cdinfodialogbase.h|' \
+	-i "${S}/libkcddb/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
diff --git a/trinity-base/libkscd/Manifest b/trinity-base/libkscd/Manifest
new file mode 100644
index 00000000..64622896
--- /dev/null
+++ b/trinity-base/libkscd/Manifest
@@ -0,0 +1 @@
+DIST tdemultimedia-trinity-14.0.12.tar.xz 4833644 BLAKE2B 03c7f2a5940607baa3388f6f56660db1d01ccabe14581d1e6a929e3d6e1ea339533040820c2c53d7c6529823a367431604639d9870439dd96a7a75c68d295b34 SHA512 a78c7b6cbf62a39a012585e6f9e0851a5dbcd26fad2f6c62d1e19b8c08a6e4adacd2633279fa2b141346060d83938623805c3e05711da34e72e02b7e1c27577e
diff --git a/trinity-base/libkscd/libkscd-14.0.12.ebuild b/trinity-base/libkscd/libkscd-14.0.12.ebuild
new file mode 100644
index 00000000..113020d5
--- /dev/null
+++ b/trinity-base/libkscd/libkscd-14.0.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Copyright 2022 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+TRINITY_MODULE_NAME="tdemultimedia"
+TRINITY_MODULE_TYPE="core"
+TRINITY_SUBMODULE="kscd"
+TSM_EXTRACT_ALSO="libkcddb/"
+
+inherit flag-o-matic trinity-meta-2
+
+DESCRIPTION="Static library for audio CD player for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DEPEND="x11-libs/libXext
+	~trinity-base/libkcddb-${PV}"
+
+src_prepare() {
+	sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	trinity-meta-2_src_configure
+}
+
+src_install() {
+	insinto "${TDEDIR}/$(get_libdir)/kscd"
+	doins "${BUILD_DIR}/kscd/libwm/libworkman.a"
+	doins "${BUILD_DIR}/kscd/libkcompactdisc.a"
+	doins "${BUILD_DIR}/kscd/libwm/audio/libworkmanaudio.a"
+}
diff --git a/trinity-base/libkscd/libkscd-9999.ebuild b/trinity-base/libkscd/libkscd-9999.ebuild
new file mode 100644
index 00000000..d7e6e1af
--- /dev/null
+++ b/trinity-base/libkscd/libkscd-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Copyright 2022 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+TRINITY_MODULE_NAME="tdemultimedia"
+TRINITY_MODULE_TYPE="core"
+TRINITY_SUBMODULE="kscd"
+TSM_EXTRACT_ALSO="libkcddb/"
+
+inherit flag-o-matic trinity-meta-2
+
+DESCRIPTION="Static library for audio CD player for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="x11-libs/libXext
+	~trinity-base/libkcddb-${PV}"
+
+
+src_prepare() {
+	sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
+src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	trinity-meta-2_src_configure
+}
+
+src_install() {
+	insinto "${TDEDIR}/$(get_libdir)/kscd"
+	doins "${BUILD_DIR}/kscd/libwm/libworkman.a"
+	doins "${BUILD_DIR}/kscd/libkcompactdisc.a"
+	doins "${BUILD_DIR}/kscd/libwm/audio/libworkmanaudio.a"
+}
+
diff --git a/trinity-base/libkscd/metadata.xml b/trinity-base/libkscd/metadata.xml
new file mode 100644
index 00000000..689e1534
--- /dev/null
+++ b/trinity-base/libkscd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/trinity-base/noatun/noatun-14.0.12.ebuild b/trinity-base/noatun/noatun-14.0.12.ebuild
index 798fb2db..4351e307 100644
--- a/trinity-base/noatun/noatun-14.0.12.ebuild
+++ b/trinity-base/noatun/noatun-14.0.12.ebuild
@@ -15,47 +15,15 @@ if [[ ${PV} != *9999* ]] ; then
     KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
+RDEPEND="~trinity-base/tdemultimedia-arts-${PV}[mpeg]"
 DEPEND="${RDEPEND}
 	x11-libs/libXext
 "
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ARTS=ON
-		-DBUILD_MPEGLIB=ON
-	)
-
-	trinity-meta-2_src_configure
-}
-
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with tdemultimedia-arts.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/artscontrol/ || die
-	rm -r "${D}"/usr/trinity/14/share/apps/artsbuilder/ || die
-	rm -r "${D}"/usr/trinity/14/include/arts/ || die
-	rm -r "${D}"/usr/trinity/14/include/mpeglib/ || die
-	rm -r "${D}"/usr/trinity/14/lib64/libarts* || die
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/arts* || die
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/Arts/ || die
-	rm -r "${D}"/usr/trinity/14/lib64/libmpeg* || die
-	rm -r "${D}"/usr/trinity/14/lib64/libyaf* || die
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artscontrol.png || die
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artsbuilder.png || die
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/scalable/ || die
-	rm -r "${D}"/usr/trinity/14/share/icons/crystalsvg/*/actions/arts* || die
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artscontrol.desktop || die
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artsbuilder.desktop || die
-	rm -r "${D}"/usr/trinity/14/bin/artscontrol || die
-	rm -r "${D}"/usr/trinity/14/bin/artsbuilder || die
-	rm -r "${D}"/usr/trinity/14/bin/yaf* || die
-	rm -r "${D}"/usr/trinity/14/bin/midisend || die
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/application/x-artsbuilder.desktop || die
-	rm -r "${D}"/usr/trinity/14/share/apps/kicker/ || die
+src_prepare() {
+	sed -i 's/mpeg-shared/mpeg/' "${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/mpeg-shared/mpeg Xext/' "${S}/${PN}/library/noatunarts/CMakeLists.txt"
+	trinity-meta-2_src_prepare
 }
 
 #KMCOMPILEONLY="arts"
diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild
index 966c2da2..bffcb346 100644
--- a/trinity-base/noatun/noatun-9999.ebuild
+++ b/trinity-base/noatun/noatun-9999.ebuild
@@ -1,5 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
-# Copyright 2020 The Trinity Desktop Project
+# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -16,47 +16,15 @@ if [[ ${PV} != *9999* ]] ; then
     KEYWORDS="~amd64 ~x86"
 fi
 
-RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
+RDEPEND="~trinity-base/tdemultimedia-arts-${PV}[mpeg]"
 DEPEND="${RDEPEND}
 	x11-libs/libXext
 "
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ARTS=ON
-		-DBUILD_MPEGLIB=ON
-	)
-
-	trinity-meta-2_src_configure
-}
-
-src_install() {
-	trinity-meta-2_src_install
-
-	#Junk all the files that overlap with tdemultimedia-arts.
-	#It would be cleaner not to let them install at all, but I wasn't
-	#able to pull that off.
-	rm -r "${D}"/usr/trinity/14/share/apps/artscontrol/ || die
-	rm -r "${D}"/usr/trinity/14/share/apps/artsbuilder/ || die
-	rm -r "${D}"/usr/trinity/14/include/arts/ || die
-	rm -r "${D}"/usr/trinity/14/include/mpeglib/ || die
-	rm -r "${D}"/usr/trinity/14/lib64/libarts* || die
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/arts* || die
-	rm -r "${D}"/usr/trinity/14/lib64/mcop/Arts/ || die
-	rm -r "${D}"/usr/trinity/14/lib64/libmpeg* || die
-	rm -r "${D}"/usr/trinity/14/lib64/libyaf* || die
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artscontrol.png || die
-	rm -r "${D}"/usr/trinity/14/share/icons/*/*/apps/artsbuilder.png || die
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/scalable/ || die
-	rm -r "${D}"/usr/trinity/14/share/icons/crystalsvg/*/actions/arts* || die
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artscontrol.desktop || die
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/artsbuilder.desktop || die
-	rm -r "${D}"/usr/trinity/14/bin/artscontrol || die
-	rm -r "${D}"/usr/trinity/14/bin/artsbuilder || die
-	rm -r "${D}"/usr/trinity/14/bin/yaf* || die
-	rm -r "${D}"/usr/trinity/14/bin/midisend || die
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/application/x-artsbuilder.desktop || die
-	rm -r "${D}"/usr/trinity/14/share/apps/kicker/ || die
+src_prepare() {
+	sed -i 's/mpeg-shared/mpeg/' "${S}/${PN}/CMakeLists.txt" || die
+	sed -i 's/mpeg-shared/mpeg Xext/' "${S}/${PN}/library/noatunarts/CMakeLists.txt"
+	trinity-meta-2_src_prepare
 }
 
 #KMCOMPILEONLY="arts"
diff --git a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-14.0.12.ebuild b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-14.0.12.ebuild
index 66ae287c..9efa7491 100644
--- a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-14.0.12.ebuild
+++ b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-14.0.12.ebuild
@@ -21,7 +21,8 @@ IUSE="arts"
 #install only a subset of files.
 RDEPEND="arts? ( ~trinity-base/juk-${PV}
 		~trinity-base/kaboodle-${PV}
-		~trinity-base/tdemultimedia-arts-${PV} )
+		~trinity-base/tdemultimedia-arts-${PV}
+		~trinity-base/noatun-${PV} )
 	~trinity-base/kaudiocreator-${PV}
 	~trinity-base/kmix-${PV}
 	~trinity-base/krec-${PV}
diff --git a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
index 3e13a2ca..10f7824c 100644
--- a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
+++ b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
@@ -21,7 +21,8 @@ IUSE="arts"
 #install only a subset of files.
 RDEPEND="arts? ( ~trinity-base/juk-${PV}
 		~trinity-base/kaboodle-${PV}
-		~trinity-base/tdemultimedia-arts-${PV} )
+		~trinity-base/tdemultimedia-arts-${PV}
+		~trinity-base/noatun-${PV} )
 	~trinity-base/kaudiocreator-${PV}
 	~trinity-base/kmix-${PV}
 	~trinity-base/krec-${PV}
diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.12.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.12.ebuild
index e23d6a50..4a2e3850 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.12.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.12.ebuild
@@ -6,9 +6,9 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
-TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
+TRINITY_SUBMODULE="tdeioslave"
 TSM_EXTRACT="kscd libkcddb tdeioslave"
-inherit trinity-meta-2
+inherit flag-o-matic trinity-meta-2
 
 DESCRIPTION="Multimedia Trinity TDEIOslaves"
 if [[ ${PV} != *9999* ]] ; then
@@ -17,11 +17,23 @@ fi
 IUSE="flac"
 
 DEPEND="~trinity-base/libkcddb-${PV}
+	~trinity-base/libkscd-${PV}
 	media-sound/cdparanoia
 	flac? ( media-libs/flac )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's/NOT BUILD_KSCD/BUILD_KSCD/' "${S}/tdeioslave/CMakeLists.txt" || die
+	sed -i 's/kcddb-shared/kcddb/' "${S}/tdeioslave/audiocd/plugins/CMakeLists.txt" || die
+	sed -i 's/kcddb-shared/kcddb/' "${S}/tdeioslave/audiocd/CMakeLists.txt" || die
+	sed -i -e 's/kcompactdisc-static/kcompactdisc/' -e 's/workman-static/workman/' \
+	"${S}/tdeioslave/audiocd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	append-ldflags "-L${TDEDIR}/$(get_libdir) -L${TDEDIR}/$(get_libdir)/kscd"
 	local mycmakeargs=(
 		-DWITH_FLAC=$(usex flac)
 		-DWITH_CDPARANOIA=ON
@@ -29,22 +41,3 @@ src_configure() {
 
 	trinity-meta-2_src_configure
 }
-
-src_install() {
-	trinity-meta-2_src_install
-	rm -r "${D}"/usr/trinity/14/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r "${D}"/usr/trinity/14/include/libkcddb
-	rm -r "${D}"/usr/trinity/14/lib64/libkcddb*
-	rm -r "${D}"/usr/trinity/14/lib64/trinity/kcm_cddb*
-	rm -r "${D}"/usr/share/doc/tdemultimedia-tdeioslaves-${PV}/kscd*
-	rm -r "${D}"/usr/trinity/14/bin
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/text/xmcd.desktop
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/profiles/kscd.profile.xml
-	rm -r "${D}"/usr/trinity/14/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
-}
diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
index db067c6f..8f30f5be 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
@@ -6,10 +6,10 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
-TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
+TRINITY_SUBMODULE="tdeioslave"
 TRINITY_HANDBOOK="optional"
 TSM_EXTRACT="kscd libkcddb tdeioslave"
-inherit trinity-meta-2
+inherit flag-o-matic trinity-meta-2
 
 DESCRIPTION="Multimedia Trinity TDEIOslaves"
 if [[ ${PV} != *9999* ]] ; then
@@ -18,11 +18,23 @@ fi
 IUSE="flac"
 
 DEPEND="~trinity-base/libkcddb-${PV}
+	~trinity-base/libkscd-${PV}
 	media-sound/cdparanoia
 	flac? ( media-libs/flac )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's/NOT BUILD_KSCD/BUILD_KSCD/' "${S}/tdeioslave/CMakeLists.txt" || die
+	sed -i 's/kcddb-shared/kcddb/' "${S}/tdeioslave/audiocd/plugins/CMakeLists.txt" || die
+	sed -i 's/kcddb-shared/kcddb/' "${S}/tdeioslave/audiocd/CMakeLists.txt" || die
+	sed -i -e 's/kcompactdisc-static/kcompactdisc/' -e 's/workman-static/workman/' \
+	"${S}/tdeioslave/audiocd/CMakeLists.txt" || die
+	trinity-meta-2_src_prepare
+}
+
 src_configure() {
+	append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include"
+	append-ldflags "-L${TDEDIR}/$(get_libdir) -L${TDEDIR}/$(get_libdir)/kscd"
 	local mycmakeargs=(
 		-DWITH_FLAC=$(usex flac)
 		-DWITH_CDPARANOIA=ON
@@ -30,24 +42,3 @@ src_configure() {
 
 	trinity-meta-2_src_configure
 }
-src_install() {
-	trinity-meta-2_src_install
-	rm -r "${D}"/usr/trinity/14/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/libkcddb.kcfg
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/libkcddb.desktop
-	rm -r "${D}"/usr/trinity/14/include/libkcddb
-	rm -r "${D}"/usr/trinity/14/lib64/libkcddb*
-	rm -r "${D}"/usr/trinity/14/lib64/trinity/kcm_cddb*
-	rm -r "${D}"/usr/share/doc/tdemultimedia-tdeioslaves-${PV}/kscd*
-	rm -r "${D}"/usr/trinity/14/bin
-	rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
-	rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
-	rm -r "${D}"/usr/trinity/14/share/mimelnk/text/xmcd.desktop
-	rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
-	rm -r "${D}"/usr/trinity/14/share/apps/profiles/kscd.profile.xml
-	rm -r "${D}"/usr/trinity/14/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kcontrol/cddb
-	rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kscd
-}
-