diff options
| author | ormorph <roma251078@mail.ru> | 2022-07-12 18:16:28 +0000 |
|---|---|---|
| committer | ormorph <roma251078@mail.ru> | 2022-07-12 19:20:10 +0000 |
| commit | 069b3ccd7c13a84218de705a7034fda34cf4b31c (patch) | |
| tree | 919165d6684a920c8642b822ed46fc3e00df3a6a /trinity-base/kscd | |
| parent | 43d268cffc49770ffa1bd8dfc59d68f862c6dbcd (diff) | |
| download | tde-packaging-gentoo-069b3ccd7c13a84218de705a7034fda34cf4b31c.tar.gz tde-packaging-gentoo-069b3ccd7c13a84218de705a7034fda34cf4b31c.zip | |
Solving the tdemultimedia multiple build problem
Signed-off-by: ormorph <roma251078@mail.ru>
Diffstat (limited to 'trinity-base/kscd')
| -rw-r--r-- | trinity-base/kscd/kscd-14.0.11.ebuild | 2 | ||||
| -rw-r--r-- | trinity-base/kscd/kscd-14.0.12.ebuild | 27 | ||||
| -rw-r--r-- | trinity-base/kscd/kscd-9999.ebuild | 28 |
3 files changed, 18 insertions, 39 deletions
diff --git a/trinity-base/kscd/kscd-14.0.11.ebuild b/trinity-base/kscd/kscd-14.0.11.ebuild index 1f2d740f..45070814 100644 --- a/trinity-base/kscd/kscd-14.0.11.ebuild +++ b/trinity-base/kscd/kscd-14.0.11.ebuild @@ -9,7 +9,7 @@ TSM_EXTRACT_ALSO="libkcddb/" inherit trinity-meta-2 -DESCRIPTION="Trinity mixer GUI" +DESCRIPTION="Audio CD player for Trinity" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi diff --git a/trinity-base/kscd/kscd-14.0.12.ebuild b/trinity-base/kscd/kscd-14.0.12.ebuild index 6fbd03b4..4f73f6b3 100644 --- a/trinity-base/kscd/kscd-14.0.12.ebuild +++ b/trinity-base/kscd/kscd-14.0.12.ebuild @@ -7,9 +7,9 @@ TRINITY_MODULE_NAME="tdemultimedia" TRINITY_MODULE_TYPE="core" TSM_EXTRACT_ALSO="libkcddb/" -inherit trinity-meta-2 +inherit flag-o-matic trinity-meta-2 -DESCRIPTION="Trinity mixer GUI" +DESCRIPTION="Audio CD player for Trinity" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi @@ -17,23 +17,12 @@ fi DEPEND="x11-libs/libXext ~trinity-base/libkcddb-${PV}" -src_configure() { - mycmakeargs=( - -DBUILD_LIBKCDDB=yes - ) - - trinity-meta-2_src_configure +src_prepare() { + sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die + trinity-meta-2_src_prepare } -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/ +src_configure() { + append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include" + trinity-meta-2_src_configure } diff --git a/trinity-base/kscd/kscd-9999.ebuild b/trinity-base/kscd/kscd-9999.ebuild index eb30ee26..dc3528f0 100644 --- a/trinity-base/kscd/kscd-9999.ebuild +++ b/trinity-base/kscd/kscd-9999.ebuild @@ -8,9 +8,9 @@ TRINITY_MODULE_TYPE="core" TRINITY_HANDBOOK="optional" TSM_EXTRACT_ALSO="libkcddb/" -inherit trinity-meta-2 +inherit flag-o-matic trinity-meta-2 -DESCRIPTION="Trinity mixer GUI" +DESCRIPTION="Audio CD player for Trinity" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi @@ -18,24 +18,14 @@ fi DEPEND="x11-libs/libXext ~trinity-base/libkcddb-${PV}" -src_configure() { - mycmakeargs=( - -DBUILD_LIBKCDDB=yes - ) - trinity-meta-2_src_configure +src_prepare() { + sed -i 's/kcddb-shared/kcddb/' "${S}/kscd/CMakeLists.txt" || die + trinity-meta-2_src_prepare } -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/ - rm -r "${D}"/usr/trinity/14/share/doc/tde/HTML/en/kcontrol/cddb +src_configure() { + append-cxxflags "-I${TDEDIR}/include/libkcddb -I${TDEDIR}/include" + trinity-meta-2_src_configure } + |