Fixed tdemultimedia-tdeioslaves, fix for issue #208

Signed-off-by: ormorph <roma251078@mail.ru>

4 files changed, 83 insertions, 46 deletions

diff --git a/trinity-base/kaudiocreator/kaudiocreator-14.0.11.ebuild b/trinity-base/kaudiocreator/kaudiocreator-14.0.11.ebuild
index 022eab86..687a98e4 100644
--- a/trinity-base/kaudiocreator/kaudiocreator-14.0.11.ebuild
+++ b/trinity-base/kaudiocreator/kaudiocreator-14.0.11.ebuild
@@ -38,21 +38,21 @@ 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/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/
 }
diff --git a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
index 23a31581..babcdb88 100644
--- a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
@@ -38,21 +38,21 @@ 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/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/
 }
diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.11.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.11.ebuild
index 7920b4bd..030409b6 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.11.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-14.0.11.ebuild
@@ -6,26 +6,45 @@ EAPI="7"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
-TRINITY_SUBMODULE="tdeioslave"
-TSM_EXTRACT="tdeioslave"
+TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
+TSM_EXTRACT="kscd libkcddb tdeioslave"
 inherit trinity-meta-2
 
 DESCRIPTION="Multimedia Trinity TDEIOslaves"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
-IUSE="cdparanoia flac"
+IUSE="flac"
 
-DEPEND="~trinity-base/kscd-${PV}
-	cdparanoia? ( media-sound/cdparanoia )
+DEPEND="~trinity-base/libkcddb-${PV}
+	media-sound/cdparanoia
 	flac? ( media-libs/flac )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_FLAC=$(usex flac)
-		-DWITH_CDPARANOIA=$(usex cdparanoia)
+		-DWITH_CDPARANOIA=ON
 	)
 
 	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 26f0044b..2a7e4387 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
@@ -6,26 +6,44 @@ EAPI="7"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
-TRINITY_SUBMODULE="tdeioslave"
-TSM_EXTRACT="tdeioslave"
+TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
+TSM_EXTRACT="kscd libkcddb tdeioslave"
 inherit trinity-meta-2
 
 DESCRIPTION="Multimedia Trinity TDEIOslaves"
 if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="cdparanoia flac"
+IUSE="flac"
 
-DEPEND="~trinity-base/kscd-${PV}
-	cdparanoia? ( media-sound/cdparanoia )
+DEPEND="~trinity-base/libkcddb-${PV}
+	media-sound/cdparanoia
 	flac? ( media-libs/flac )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_FLAC=$(usex flac)
-		-DWITH_CDPARANOIA=$(usex cdparanoia)
+		-DWITH_CDPARANOIA=ON
 	)
 
 	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
+}