From 069b3ccd7c13a84218de705a7034fda34cf4b31c Mon Sep 17 00:00:00 2001 From: ormorph Date: Tue, 12 Jul 2022 18:16:28 +0000 Subject: Solving the tdemultimedia multiple build problem Signed-off-by: ormorph --- trinity-base/noatun/noatun-9999.ebuild | 46 ++++++---------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) (limited to 'trinity-base/noatun/noatun-9999.ebuild') diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild index 966c2da2..bffcb346 100644 --- a/trinity-base/noatun/noatun-9999.ebuild +++ b/trinity-base/noatun/noatun-9999.ebuild @@ -1,5 +1,5 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020 The Trinity Desktop Project +# Copyright 1999-2022 Gentoo Authors +# Copyright 2022 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -16,47 +16,15 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi -RDEPEND="~trinity-base/tdemultimedia-arts-${PV}" +RDEPEND="~trinity-base/tdemultimedia-arts-${PV}[mpeg]" DEPEND="${RDEPEND} x11-libs/libXext " -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 +src_prepare() { + sed -i 's/mpeg-shared/mpeg/' "${S}/${PN}/CMakeLists.txt" || die + sed -i 's/mpeg-shared/mpeg Xext/' "${S}/${PN}/library/noatunarts/CMakeLists.txt" + trinity-meta-2_src_prepare } #KMCOMPILEONLY="arts" -- cgit v1.2.1