trinity-base/noatun: Various fixes to 14.0.8, add missing live ebuild

- Fix DESCRIPTION to 80 char maximum
- Add missing metadata.xml
- local mycmakeargs
- Always quote ${D}
- Add missing || die
- Cleanup superfluous blank line

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <[email protected]>

3 files changed, 99 insertions, 29 deletions

diff --git a/trinity-base/noatun/metadata.xml b/trinity-base/noatun/metadata.xml
new file mode 100644
index 00000000..6f49eba8
--- /dev/null
+++ b/trinity-base/noatun/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/trinity-base/noatun/noatun-14.0.8.ebuild b/trinity-base/noatun/noatun-14.0.8.ebuild
index 09713640..15fe6de1 100644
--- a/trinity-base/noatun/noatun-14.0.8.ebuild
+++ b/trinity-base/noatun/noatun-14.0.8.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdemultimedia"
 
+TRINITY_MODULE_NAME="tdemultimedia"
 inherit trinity-meta-2
 
-DESCRIPTION="A modular media player for KDE, featuring audio effects, graphic equalizer and network transparency."
+DESCRIPTION="Media player featuring audio effects, graphic equalizer and network transparency"
+HOMEPAGE="https://trinitydesktop.org/"
+
 KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://www.trinitydesktop.org/"
 
 RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
 DEPEND="${RDEPEND}
-	x11-libs/libXext"
+	x11-libs/libXext
+"
 
 TSM_EXTRACT_ALSO="arts mpeglib"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_ARTS=ON
 		-DBUILD_MPEGLIB=ON
 	)
@@ -32,34 +34,33 @@ 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/arts/
-	rm -r ${D}/usr/trinity/14/include/mpeglib/
-	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/lib64/libmpeg*
-	rm -r ${D}/usr/trinity/14/lib64/libyaf*
-	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/*/actions/arts*
-	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/yaf*
-	rm -r ${D}/usr/trinity/14/bin/midisend
-	rm -r ${D}/usr/trinity/14/share/mimelnk/application/x-artsbuilder.desktop
-	rm -r ${D}/usr/trinity/14/share/apps/kicker/
+	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
 }
 
-
 #KMCOMPILEONLY="arts"
 
 #src_compile() {
 #	# fix bug 128884
 #	filter-flags -fomit-frame-pointer
 #	kde-meta_src_compile
-#} 
+#}
diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild
new file mode 100644
index 00000000..b77c3f5a
--- /dev/null
+++ b/trinity-base/noatun/noatun-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 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="Media player featuring audio effects, graphic equalizer and network transparency"
+HOMEPAGE="https://trinitydesktop.org/"
+
+RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
+DEPEND="${RDEPEND}
+	x11-libs/libXext
+"
+
+TSM_EXTRACT_ALSO="arts mpeglib"
+
+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
+}
+
+#KMCOMPILEONLY="arts"
+
+#src_compile() {
+#	# fix bug 128884
+#	filter-flags -fomit-frame-pointer
+#	kde-meta_src_compile
+#}