media-sound/cadence: fixes

1) updated python-3
2) switched from xdg-utils to xdg
3) keeping more apps

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/media-sound/cadence/cadence-0.9.0-r1.ebuild b/media-sound/cadence/cadence-0.9.0-r2.ebuild
similarity index 87%
rename from media-sound/cadence/cadence-0.9.0-r1.ebuild
rename to media-sound/cadence/cadence-0.9.0-r2.ebuild
index 0bfc569c9cb8519d9d39d90309f6eb7aa5d499ac..c3fac92fcd8d253c161f478e4d1f889f86ba3e91 100644 (file)
--- a/media-sound/cadence/cadence-0.9.0-r1.ebuild
+++ b/media-sound/cadence/cadence-0.9.0-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit python-single-r1 xdg-utils desktop
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
 HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
@@ -17,6 +17,7 @@ IUSE="-pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
 RDEPEND="${PYTHON_DEPS}
        media-sound/jack2[dbus]
        dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
@@ -57,8 +58,6 @@ src_install() {
        rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
        rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
        rm -rf "${D}"/usr/share/applications/*.desktop
-       rm -rf "${D}"/usr/bin/{catarina,claudia*}
-       rm -rf "${D}"/usr/share/cadence/icons/claudia-hicolor/
 
        if use !pulseaudio; then
                rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
@@ -68,12 +67,5 @@ src_install() {
        # Replace desktop entries with QA issues with these
        make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
        make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
-}
-
-pkg_postinst() {
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
+       make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
 }

diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index f005484a5a4edd5cee539756eb6f21017c0e935c..b8f9be3297858146f6531e8d11fd0c7712dc1231 100644 (file)
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit git-r3 python-single-r1 xdg-utils desktop
+PYTHON_COMPAT=( python3_{6,7} )
+inherit git-r3 python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
 HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
@@ -17,6 +17,7 @@ IUSE="-pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
 RDEPEND="${PYTHON_DEPS}
        media-sound/jack2[dbus]
        dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
@@ -55,8 +56,6 @@ src_install() {
        rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
        rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
        rm -rf "${D}"/usr/share/applications/*.desktop
-       rm -rf "${D}"/usr/bin/{catarina,claudia*}
-       rm -rf "${D}"/usr/share/cadence/icons/claudia-hicolor/
 
        if use !pulseaudio; then
                rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
@@ -66,12 +65,5 @@ src_install() {
        # Replace desktop entries with QA issues with these
        make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
        make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
-}
-
-pkg_postinst() {
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
+       make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
 }