From 34d7a43415173e2f11a716f5b2c8ccb55eb6f596 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 19 Feb 2026 03:57:50 +0300 Subject: trinity-base/tdemultimedia-arts: add missing dir to TSM_EXTRACT Also use TSM_EXTRACT instead of TSM_EXTRACT_ALSO to install documentation from *_artsplugin subdirs Signed-off-by: Alexander Golubev --- .../tdemultimedia-arts-14.1.2-r1.ebuild | 43 ++++++++++++++++++++++ .../tdemultimedia-arts-14.1.2.ebuild | 42 --------------------- .../tdemultimedia-arts-14.1.4-r1.ebuild | 42 +++++++++++++++++++++ .../tdemultimedia-arts-14.1.4.ebuild | 41 --------------------- .../tdemultimedia-arts-14.1.5.ebuild | 3 +- .../tdemultimedia-arts-9999.ebuild | 5 ++- 6 files changed, 90 insertions(+), 86 deletions(-) create mode 100644 trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2-r1.ebuild delete mode 100644 trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2.ebuild create mode 100644 trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4-r1.ebuild delete mode 100644 trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4.ebuild diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2-r1.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2-r1.ebuild new file mode 100644 index 00000000..0ecee7f0 --- /dev/null +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2026 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="arts mpeglib" +TRINITY_HANDBOOK="optional" +TSM_EXTRACT="${TRINITY_SUBMODULE} akode_artsplugin audiofile_artsplugin + mpeglib_artsplug oggvorbis_artsplugin xine_artsplugin" +inherit trinity-meta-2 + +DESCRIPTION="The aRts pipeline builder and other tools" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi +IUSE="akode alsa audiofile mpeg vorbis xine" + +DEPEND=" + ~trinity-base/arts-${PV} + akode? ( ~media-libs/akode-${PV} ) + alsa? ( media-libs/alsa-lib ) + audiofile? ( media-libs/audiofile ) + vorbis? ( media-libs/libvorbis ) + xine? ( media-libs/xine-lib ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DWITH_ALSA="$(usex alsa)" + -DWITH_ARTS_AKODE="$(usex akode)" + -DWITH_ARTS_AUDIOFILE="$(usex audiofile)" + -DWITH_ARTS_MPEGLIB="$(usex mpeg)" + -DBUILD_MPEGLIB="$(usex mpeg)" + -DWITH_ARTS_XINE="$(usex xine)" + -DWITH_VORBIS="$(usex vorbis)" + ) + + trinity-meta-2_src_configure +} diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2.ebuild deleted file mode 100644 index 35df760c..00000000 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Copyright 2020-2024 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="arts mpeglib" -TRINITY_HANDBOOK="optional" -TSM_EXTRACT_ALSO="akode_artsplugin audiofile_artsplugin mpeglib_artsplug xine_artsplugin" -inherit trinity-meta-2 - -DESCRIPTION="The aRts pipeline builder and other tools" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi -IUSE="akode alsa audiofile mpeg vorbis xine" - -DEPEND=" - ~trinity-base/arts-${PV} - akode? ( ~media-libs/akode-${PV} ) - alsa? ( media-libs/alsa-lib ) - audiofile? ( media-libs/audiofile ) - vorbis? ( media-libs/libvorbis ) - xine? ( media-libs/xine-lib ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DWITH_ALSA="$(usex alsa)" - -DWITH_ARTS_AKODE="$(usex akode)" - -DWITH_ARTS_AUDIOFILE="$(usex audiofile)" - -DWITH_ARTS_MPEGLIB="$(usex mpeg)" - -DBUILD_MPEGLIB="$(usex mpeg)" - -DWITH_ARTS_XINE="$(usex xine)" - -DWITH_VORBIS="$(usex vorbis)" - ) - - trinity-meta-2_src_configure -} diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4-r1.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4-r1.ebuild new file mode 100644 index 00000000..7e4eb9e3 --- /dev/null +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Copyright 2020-2026 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="arts mpeglib" +TSM_EXTRACT="${TRINITY_SUBMODULE} akode_artsplugin audiofile_artsplugin + mpeglib_artsplug oggvorbis_artsplugin xine_artsplugin" +inherit trinity-meta-2 + +DESCRIPTION="The aRts pipeline builder and other tools" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi +IUSE="akode alsa audiofile mpeg vorbis xine" + +DEPEND=" + ~trinity-base/arts-${PV} + akode? ( ~media-libs/akode-${PV} ) + alsa? ( media-libs/alsa-lib ) + audiofile? ( media-libs/audiofile ) + vorbis? ( media-libs/libvorbis ) + xine? ( media-libs/xine-lib ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DWITH_ALSA="$(usex alsa)" + -DWITH_ARTS_AKODE="$(usex akode)" + -DWITH_ARTS_AUDIOFILE="$(usex audiofile)" + -DWITH_ARTS_MPEGLIB="$(usex mpeg)" + -DBUILD_MPEGLIB="$(usex mpeg)" + -DWITH_ARTS_XINE="$(usex xine)" + -DWITH_VORBIS="$(usex vorbis)" + ) + + trinity-meta-2_src_configure +} diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4.ebuild deleted file mode 100644 index 35f48230..00000000 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020-2025 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="arts mpeglib" -TSM_EXTRACT_ALSO="akode_artsplugin audiofile_artsplugin mpeglib_artsplug xine_artsplugin" -inherit trinity-meta-2 - -DESCRIPTION="The aRts pipeline builder and other tools" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi -IUSE="akode alsa audiofile mpeg vorbis xine" - -DEPEND=" - ~trinity-base/arts-${PV} - akode? ( ~media-libs/akode-${PV} ) - alsa? ( media-libs/alsa-lib ) - audiofile? ( media-libs/audiofile ) - vorbis? ( media-libs/libvorbis ) - xine? ( media-libs/xine-lib ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DWITH_ALSA="$(usex alsa)" - -DWITH_ARTS_AKODE="$(usex akode)" - -DWITH_ARTS_AUDIOFILE="$(usex audiofile)" - -DWITH_ARTS_MPEGLIB="$(usex mpeg)" - -DBUILD_MPEGLIB="$(usex mpeg)" - -DWITH_ARTS_XINE="$(usex xine)" - -DWITH_VORBIS="$(usex vorbis)" - ) - - trinity-meta-2_src_configure -} diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.5.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.5.ebuild index 24f85504..7e4eb9e3 100644 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.5.ebuild +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-14.1.5.ebuild @@ -7,7 +7,8 @@ EAPI="8" TRINITY_MODULE_NAME="tdemultimedia" TRINITY_MODULE_TYPE="core" TRINITY_SUBMODULE="arts mpeglib" -TSM_EXTRACT_ALSO="akode_artsplugin audiofile_artsplugin mpeglib_artsplug xine_artsplugin" +TSM_EXTRACT="${TRINITY_SUBMODULE} akode_artsplugin audiofile_artsplugin + mpeglib_artsplug oggvorbis_artsplugin xine_artsplugin" inherit trinity-meta-2 DESCRIPTION="The aRts pipeline builder and other tools" diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild index 35f48230..7e4eb9e3 100644 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2020 Gentoo Authors -# Copyright 2020-2025 The Trinity Desktop Project +# Copyright 2020-2026 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -7,7 +7,8 @@ EAPI="8" TRINITY_MODULE_NAME="tdemultimedia" TRINITY_MODULE_TYPE="core" TRINITY_SUBMODULE="arts mpeglib" -TSM_EXTRACT_ALSO="akode_artsplugin audiofile_artsplugin mpeglib_artsplug xine_artsplugin" +TSM_EXTRACT="${TRINITY_SUBMODULE} akode_artsplugin audiofile_artsplugin + mpeglib_artsplug oggvorbis_artsplugin xine_artsplugin" inherit trinity-meta-2 DESCRIPTION="The aRts pipeline builder and other tools" -- cgit v1.2.3