Fixed tdemultimedia-tdeioslaves, fix for issue #208

Signed-off-by: ormorph <roma251078@mail.ru>
pull/244/head
ormorph 2 years ago
parent 4da4ad77c4
commit ed450c598c

@ -38,21 +38,21 @@ src_install() {
#Junk all the files that overlap with libkcddb and kscd. #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 #It would be cleaner not to let them install at all, but I wasn't
#able to pull that off. #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/apps/tdeconf_update/kcmcddb-emailsettings.upd
rm -r ${D}/usr/trinity/14/share/config.kcfg/libkcddb.kcfg 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/share/applications/tde/libkcddb.desktop
rm -r ${D}/usr/trinity/14/include/ rm -r "${D}"/usr/trinity/14/include/
rm -r ${D}/usr/trinity/14/lib64/ rm -r "${D}"/usr/trinity/14/lib64/
rm -r ${D}/usr/trinity/14/bin/kscd rm -r "${D}"/usr/trinity/14/bin/kscd
rm -r ${D}/usr/trinity/14/bin/workman2cddb.pl 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/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/*/apps/kscd.png
rm -r ${D}/usr/trinity/14/share/icons/hicolor/128x128 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/48x48
rm -r ${D}/usr/trinity/14/share/icons/hicolor/64x64 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/config.kcfg/kscd.kcfg
rm -r ${D}/usr/trinity/14/share/apps/profiles/ 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/konqueror/servicemenus/audiocd_play.desktop
rm -r ${D}/usr/trinity/14/share/apps/kscd/ rm -r "${D}"/usr/trinity/14/share/apps/kscd/
rm -r ${D}/usr/trinity/14/share/mimelnk/ rm -r "${D}"/usr/trinity/14/share/mimelnk/
} }

@ -38,21 +38,21 @@ src_install() {
#Junk all the files that overlap with libkcddb and kscd. #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 #It would be cleaner not to let them install at all, but I wasn't
#able to pull that off. #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/apps/tdeconf_update/kcmcddb-emailsettings.upd
rm -r ${D}/usr/trinity/14/share/config.kcfg/libkcddb.kcfg 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/share/applications/tde/libkcddb.desktop
rm -r ${D}/usr/trinity/14/include/ rm -r "${D}"/usr/trinity/14/include/
rm -r ${D}/usr/trinity/14/lib64/ rm -r "${D}"/usr/trinity/14/lib64/
rm -r ${D}/usr/trinity/14/bin/kscd rm -r "${D}"/usr/trinity/14/bin/kscd
rm -r ${D}/usr/trinity/14/bin/workman2cddb.pl 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/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/*/apps/kscd.png
rm -r ${D}/usr/trinity/14/share/icons/hicolor/128x128 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/48x48
rm -r ${D}/usr/trinity/14/share/icons/hicolor/64x64 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/config.kcfg/kscd.kcfg
rm -r ${D}/usr/trinity/14/share/apps/profiles/ 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/konqueror/servicemenus/audiocd_play.desktop
rm -r ${D}/usr/trinity/14/share/apps/kscd/ rm -r "${D}"/usr/trinity/14/share/apps/kscd/
rm -r ${D}/usr/trinity/14/share/mimelnk/ rm -r "${D}"/usr/trinity/14/share/mimelnk/
} }

@ -6,26 +6,45 @@ EAPI="7"
TRINITY_MODULE_NAME="tdemultimedia" TRINITY_MODULE_NAME="tdemultimedia"
TRINITY_MODULE_TYPE="core" TRINITY_MODULE_TYPE="core"
TRINITY_SUBMODULE="tdeioslave" TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
TSM_EXTRACT="tdeioslave" TSM_EXTRACT="kscd libkcddb tdeioslave"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="Multimedia Trinity TDEIOslaves" DESCRIPTION="Multimedia Trinity TDEIOslaves"
if [[ ${PV} != *9999* ]] ; then if [[ ${PV} != *9999* ]] ; then
KEYWORDS="~amd64 ~arm64 ~x86" KEYWORDS="~amd64 ~arm64 ~x86"
fi fi
IUSE="cdparanoia flac" IUSE="flac"
DEPEND="~trinity-base/kscd-${PV} DEPEND="~trinity-base/libkcddb-${PV}
cdparanoia? ( media-sound/cdparanoia ) media-sound/cdparanoia
flac? ( media-libs/flac )" flac? ( media-libs/flac )"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
-DWITH_FLAC=$(usex flac) -DWITH_FLAC=$(usex flac)
-DWITH_CDPARANOIA=$(usex cdparanoia) -DWITH_CDPARANOIA=ON
) )
trinity-meta-2_src_configure trinity-meta-2_src_configure
} }
src_install() {
trinity-meta-2_src_install
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/libkcddb
rm -r "${D}"/usr/trinity/14/lib64/libkcddb*
rm -r "${D}"/usr/trinity/14/lib64/trinity/kcm_cddb*
rm -r "${D}"/usr/share/doc/tdemultimedia-tdeioslaves-${PV}/kscd*
rm -r "${D}"/usr/trinity/14/bin
rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
rm -r "${D}"/usr/trinity/14/share/mimelnk/text/xmcd.desktop
rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
rm -r "${D}"/usr/trinity/14/share/apps/profiles/kscd.profile.xml
rm -r "${D}"/usr/trinity/14/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
}

@ -6,26 +6,44 @@ EAPI="7"
TRINITY_MODULE_NAME="tdemultimedia" TRINITY_MODULE_NAME="tdemultimedia"
TRINITY_MODULE_TYPE="core" TRINITY_MODULE_TYPE="core"
TRINITY_SUBMODULE="tdeioslave" TRINITY_SUBMODULE="kscd libkcddb tdeioslave"
TSM_EXTRACT="tdeioslave" TSM_EXTRACT="kscd libkcddb tdeioslave"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="Multimedia Trinity TDEIOslaves" DESCRIPTION="Multimedia Trinity TDEIOslaves"
if [[ ${PV} != *9999* ]] ; then if [[ ${PV} != *9999* ]] ; then
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
fi fi
IUSE="cdparanoia flac" IUSE="flac"
DEPEND="~trinity-base/kscd-${PV} DEPEND="~trinity-base/libkcddb-${PV}
cdparanoia? ( media-sound/cdparanoia ) media-sound/cdparanoia
flac? ( media-libs/flac )" flac? ( media-libs/flac )"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
-DWITH_FLAC=$(usex flac) -DWITH_FLAC=$(usex flac)
-DWITH_CDPARANOIA=$(usex cdparanoia) -DWITH_CDPARANOIA=ON
) )
trinity-meta-2_src_configure trinity-meta-2_src_configure
} }
src_install() {
trinity-meta-2_src_install
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/libkcddb
rm -r "${D}"/usr/trinity/14/lib64/libkcddb*
rm -r "${D}"/usr/trinity/14/lib64/trinity/kcm_cddb*
rm -r "${D}"/usr/share/doc/tdemultimedia-tdeioslaves-${PV}/kscd*
rm -r "${D}"/usr/trinity/14/bin
rm -r "${D}"/usr/trinity/14/share/icons/hicolor/*/apps/kscd.png
rm -r "${D}"/usr/trinity/14/share/config.kcfg/kscd.kcfg
rm -r "${D}"/usr/trinity/14/share/mimelnk/text/xmcd.desktop
rm -r "${D}"/usr/trinity/14/share/applications/tde/kscd.desktop
rm -r "${D}"/usr/trinity/14/share/apps/konqueror/servicemenus/audiocd_play.desktop
rm -r "${D}"/usr/trinity/14/share/apps/profiles/kscd.profile.xml
rm -r "${D}"/usr/trinity/14/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
}

Loading…
Cancel
Save