Added tdemultimedia-meta metapackage with dependencies

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

28 files changed, 285 insertions, 28 deletions

diff --git a/trinity-base/juk/juk-9999.ebuild b/trinity-base/juk/juk-9999.ebuild
index 071238f4..b1ff2b88 100644
--- a/trinity-base/juk/juk-9999.ebuild
+++ b/trinity-base/juk/juk-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="Jukebox and music manager for TDE"
-
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="gstreamer musicbrainz taglib"
 
 RDEPEND="media-libs/akode
diff --git a/trinity-base/juk/metadata.xml b/trinity-base/juk/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/juk/metadata.xml
+++ b/trinity-base/juk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/kaboodle/kaboodle-9999.ebuild b/trinity-base/kaboodle/kaboodle-9999.ebuild
index d917ae44..9d909814 100644
--- a/trinity-base/kaboodle/kaboodle-9999.ebuild
+++ b/trinity-base/kaboodle/kaboodle-9999.ebuild
@@ -8,5 +8,8 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="The Lean TDE Media Player"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
diff --git a/trinity-base/kaboodle/metadata.xml b/trinity-base/kaboodle/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/kaboodle/metadata.xml
+++ b/trinity-base/kaboodle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
new file mode 100644
index 00000000..446fb91b
--- /dev/null
+++ b/trinity-base/kaudiocreator/kaudiocreator-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+TRINITY_MODULE_NAME="tdemultimedia"
+TSM_EXTRACT_ALSO="libkcddb/ kscd/"
+
+inherit trinity-meta-2
+
+DESCRIPTION="TDE CD ripper and audio encoder frontend"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="encode flac mp3 vorbis"
+DEPEND="~trinity-base/libkcddb-${PV}
+	media-sound/cdparanoia"
+
+# External encoders used - no optional compile-time support
+RDEPEND="${RDEPEND}
+	~trinity-base/tdemultimedia-tdeioslaves-${PV}
+	encode? ( vorbis? ( media-sound/vorbis-tools )
+			flac? ( media-libs/flac )
+			mp3? ( media-sound/lame ) )"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_LIBKCDDB=yes
+		-DBUILD_KSCD=yes
+	)
+
+	trinity-meta-2_src_configure
+}
+
+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/
+}
diff --git a/trinity-base/kmix/kmix-9999.ebuild b/trinity-base/kmix/kmix-9999.ebuild
index 78ab5deb..93670580 100644
--- a/trinity-base/kmix/kmix-9999.ebuild
+++ b/trinity-base/kmix/kmix-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity mixer GUI"
-
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="alsa"
 
 DEPEND="alsa? ( media-libs/alsa-lib )"
diff --git a/trinity-base/kmix/metadata.xml b/trinity-base/kmix/metadata.xml
index 6e9f5e4a..689e1534 100644
--- a/trinity-base/kmix/metadata.xml
+++ b/trinity-base/kmix/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fatzer2@gmail.com</email>
-		<name>Alexander Golubev</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/krec/krec-9999.ebuild b/trinity-base/krec/krec-9999.ebuild
new file mode 100644
index 00000000..5f7d6fab
--- /dev/null
+++ b/trinity-base/krec/krec-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+TRINITY_MODULE_NAME="tdemultimedia"
+TSM_EXTRACT_ALSO="arts oggvorbis_artsplugin"
+
+inherit trinity-meta-2
+
+DESCRIPTION="TDE sound recorder"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="encode mp3 vorbis"
+
+DEPEND="~trinity-base/tdemultimedia-arts-${PV}
+	encode? ( mp3? ( media-sound/lame )
+			vorbis? ( media-libs/libvorbis ) )"
+RDEPEND="${DEPEND}"
+
+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/metadata.xml b/trinity-base/krec/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/krec/metadata.xml
+++ b/trinity-base/krec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/kscd/kscd-9999.ebuild b/trinity-base/kscd/kscd-9999.ebuild
new file mode 100644
index 00000000..78608495
--- /dev/null
+++ b/trinity-base/kscd/kscd-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Foundation
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+TRINITY_MODULE_NAME="tdemultimedia"
+TSM_EXTRACT_ALSO="libkcddb/"
+
+inherit trinity-meta-2
+
+DESCRIPTION="Trinity mixer GUI"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="x11-libs/libXext
+	~trinity-base/libkcddb-${PV}"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_LIBKCDDB=yes
+	)
+
+	trinity-meta-2_src_configure
+}
+
+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/
+}
diff --git a/trinity-base/kscd/metadata.xml b/trinity-base/kscd/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/kscd/metadata.xml
+++ b/trinity-base/kscd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/libkcddb/libkcddb-9999.ebuild b/trinity-base/libkcddb/libkcddb-9999.ebuild
new file mode 100644
index 00000000..2378c623
--- /dev/null
+++ b/trinity-base/libkcddb/libkcddb-9999.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Foundation
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+TRINITY_MODULE_NAME="tdemultimedia"
+
+inherit trinity-meta-2
+
+DESCRIPTION="KDE library for CDDB"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/libkcddb/metadata.xml b/trinity-base/libkcddb/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/libkcddb/metadata.xml
+++ b/trinity-base/libkcddb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/noatun/metadata.xml b/trinity-base/noatun/metadata.xml
index 6f49eba8..689e1534 100644
--- a/trinity-base/noatun/metadata.xml
+++ b/trinity-base/noatun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemid/metadata.xml b/trinity-base/tdemid/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/tdemid/metadata.xml
+++ b/trinity-base/tdemid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemid/tdemid-9999.ebuild b/trinity-base/tdemid/tdemid-9999.ebuild
index 5cb4ba1d..2057521a 100644
--- a/trinity-base/tdemid/tdemid-9999.ebuild
+++ b/trinity-base/tdemid/tdemid-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="TDE MIDI and karaoke player"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdemultimedia-arts/metadata.xml b/trinity-base/tdemultimedia-arts/metadata.xml
index 401aaee9..e035d689 100644
--- a/trinity-base/tdemultimedia-arts/metadata.xml
+++ b/trinity-base/tdemultimedia-arts/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="akode">Enable support for common audio formats via <pkg>media-libs/akode</pkg></flag>
-	</use>
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
+  <use>
+    <flag name="akode">Enable support for common audio formats via <pkg>media-libs/akode</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
index c54a1c11..d6671ee8 100644
--- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
+++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
@@ -9,7 +9,9 @@ TRINITY_SUBMODULE="arts mpeglib mpeglib_artsplug"
 inherit trinity-meta-2
 
 DESCRIPTION="The aRts pipeline builder and other tools"
-
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="akode alsa audiofile mpeg vorbis xine"
 
 DEPEND="
diff --git a/trinity-base/tdemultimedia-doc/metadata.xml b/trinity-base/tdemultimedia-doc/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/tdemultimedia-doc/metadata.xml
+++ b/trinity-base/tdemultimedia-doc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
index df220f29..9227d408 100644
--- a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
+++ b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdemultimedia"
 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-kappfinder-data/metadata.xml b/trinity-base/tdemultimedia-kappfinder-data/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/tdemultimedia-kappfinder-data/metadata.xml
+++ b/trinity-base/tdemultimedia-kappfinder-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild b/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild
index 0cc00254..a84c3c7d 100644
--- a/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild
+++ b/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="Kappfinder data from tdemultimedia"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdemultimedia-meta/metadata.xml b/trinity-base/tdemultimedia-meta/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/tdemultimedia-meta/metadata.xml
+++ b/trinity-base/tdemultimedia-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
new file mode 100644
index 00000000..74a06512
--- /dev/null
+++ b/trinity-base/tdemultimedia-meta/tdemultimedia-meta-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Foundation
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit trinity-functions-2
+
+set-trinityver
+DESCRIPTION="tdemultimedia - merge this to pull in all tdemultimedia-derived packages"
+HOMEPAGE="http://www.trinitydesktop.org/"
+LICENSE="|| ( GPL-2 GPL-3 )"
+
+SLOT="${TRINITY_VER}"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="arts"
+
+#Some packages use hacky workarounds to make up for not being able to
+#install only a subset of files.
+RDEPEND="arts? ( ~trinity-base/juk-${PV}
+		~trinity-base/kaboodle-${PV}
+		~trinity-base/tdemultimedia-arts-${PV} )
+	~trinity-base/kaudiocreator-${PV}
+	~trinity-base/kmix-${PV}
+	~trinity-base/krec-${PV}
+	~trinity-base/kscd-${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-tdefile-plugins/metadata.xml b/trinity-base/tdemultimedia-tdefile-plugins/metadata.xml
index 7a38bb90..689e1534 100644
--- a/trinity-base/tdemultimedia-tdefile-plugins/metadata.xml
+++ b/trinity-base/tdemultimedia-tdefile-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild b/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild
index e748af9c..d33497fe 100644
--- a/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild
+++ b/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
 DESCRIPTION="tdefile plugins from tdemultimedia"
-
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="taglib theora vorbis"
 
 DEPEND="
diff --git a/trinity-base/tdemultimedia-tdeioslaves/metadata.xml b/trinity-base/tdemultimedia-tdeioslaves/metadata.xml
index e3be416e..4b080cd2 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/metadata.xml
+++ b/trinity-base/tdemultimedia-tdeioslaves/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="cdparanoia">Enable cdparanoia (audio CD ripper) support</flag>
-	</use>
+  <maintainer type="project">
+    <email>team-gentoo@trinitydesktop.org</email>
+    <name>Trinity Gentoo ebuilds project</name>
+  </maintainer>
+  <use>
+    <flag name="cdparanoia">Enable cdparanoia (audio CD ripper) support</flag>
+  </use>
 </pkgmetadata>
diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
index 2f17aed9..8822b679 100644
--- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild
@@ -10,7 +10,9 @@ TSM_EXTRACT="tdeioslave"
 inherit trinity-meta-2
 
 DESCRIPTION="Multimedia Trinity TDEIOslaves"
-
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="cdparanoia flac"
 
 DEPEND="