Added handbook assembly in subpackages for the tdemultimedia metapackage

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

13 files changed, 40 insertions, 41 deletions

diff --git a/trinity-base/juk/juk-9999.ebuild b/trinity-base/juk/juk-9999.ebuild
index 2e669858..afaaba67 100644
--- a/trinity-base/juk/juk-9999.ebuild
+++ b/trinity-base/juk/juk-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 inherit trinity-meta-2
 
 DESCRIPTION="Jukebox and music manager for TDE"
diff --git a/trinity-base/kaboodle/kaboodle-9999.ebuild b/trinity-base/kaboodle/kaboodle-9999.ebuild
index da6c56fc..32970569 100644
--- a/trinity-base/kaboodle/kaboodle-9999.ebuild
+++ b/trinity-base/kaboodle/kaboodle-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 inherit trinity-meta-2
 
 DESCRIPTION="The Lean TDE Media Player"
diff --git a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
index 0637d2e6..751c54fd 100644
--- a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libkcddb/ kscd/"
 
 inherit trinity-meta-2
@@ -55,4 +56,6 @@ src_install() {
 	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
 }
diff --git a/trinity-base/kmix/kmix-9999.ebuild b/trinity-base/kmix/kmix-9999.ebuild
index c6ef4cc9..cb9cfcda 100644
--- a/trinity-base/kmix/kmix-9999.ebuild
+++ b/trinity-base/kmix/kmix-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity mixer GUI"
diff --git a/trinity-base/krec/krec-9999.ebuild b/trinity-base/krec/krec-9999.ebuild
index 68c958e2..f0b40654 100644
--- a/trinity-base/krec/krec-9999.ebuild
+++ b/trinity-base/krec/krec-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="arts oggvorbis_artsplugin"
 
 inherit trinity-meta-2
@@ -35,21 +36,22 @@ 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/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-9999.ebuild b/trinity-base/kscd/kscd-9999.ebuild
index 800dc6d0..eb30ee26 100644
--- a/trinity-base/kscd/kscd-9999.ebuild
+++ b/trinity-base/kscd/kscd-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libkcddb/"
 
 inherit trinity-meta-2
@@ -31,9 +32,10 @@ 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/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
 }
diff --git a/trinity-base/libkcddb/libkcddb-9999.ebuild b/trinity-base/libkcddb/libkcddb-9999.ebuild
index fc17a5d4..c8147e22 100644
--- a/trinity-base/libkcddb/libkcddb-9999.ebuild
+++ b/trinity-base/libkcddb/libkcddb-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 
 inherit trinity-meta-2
 
diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild
index 3bf14a68..966c2da2 100644
--- a/trinity-base/noatun/noatun-9999.ebuild
+++ b/trinity-base/noatun/noatun-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="arts mpeglib"
 inherit trinity-meta-2
 
diff --git a/trinity-base/tdemid/tdemid-9999.ebuild b/trinity-base/tdemid/tdemid-9999.ebuild
index 40b27a8e..53aa08c7 100644
--- a/trinity-base/tdemid/tdemid-9999.ebuild
+++ b/trinity-base/tdemid/tdemid-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="8"
 
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 inherit trinity-meta-2
 
 DESCRIPTION="TDE MIDI and karaoke player"
diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
index 5c1bcaf5..b07e23c2 100644
--- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
+++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
@@ -7,6 +7,7 @@ EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
 TRINITY_SUBMODULE="arts mpeglib"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="akode_artsplugin audiofile_artsplugin mpeglib_artsplug xine_artsplugin"
 inherit trinity-meta-2
 
diff --git a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
deleted file mode 100644
index 9c7ef769..00000000
--- a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Copyright 2020 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"
-inherit trinity-meta-2
-
-DESCRIPTION="Documentaion for tdemultimedia-derived packages"
-if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	~trinity-base/khelpcenter-${PV}"
-
diff --git a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
index 8ea86067..3e13a2ca 100644
--- a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
+++ b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
@@ -29,6 +29,5 @@ RDEPEND="arts? ( ~trinity-base/juk-${PV}
 	~trinity-base/libkcddb-${PV}
 	~trinity-base/tdemid-${PV}
 	~trinity-base/tdemultimedia-kappfinder-data-${PV}
-	~trinity-base/tdemultimedia-doc-${PV}
 	~trinity-base/tdemultimedia-tdeioslaves-${PV}
 	~trinity-base/tdemultimedia-tdefile-plugins-${PV}"
diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
index 0212bf68..db067c6f 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
@@ -7,6 +7,7 @@ EAPI="8"
 TRINITY_MODULE_NAME="tdemultimedia"
 TRINITY_MODULE_TYPE="core"
 TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT="kscd libkcddb tdeioslave"
 inherit trinity-meta-2
 
@@ -46,4 +47,7 @@ src_install() {
 	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
 }
+