media-sound/gmusicbrowser: 1.1.15_p20190315 and 9999 cleanup
authorMiroslav Šulc <fordfrog@gentoo.org>
Wed, 25 Dec 2019 12:22:01 +0000 (13:22 +0100)
committerMiroslav Šulc <fordfrog@gentoo.org>
Wed, 25 Dec 2019 12:23:24 +0000 (13:23 +0100)
1) eapi7
2) xdg-utils -> xdg
3) removed all unnecessary variables (they are used only once)

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild

index 168d43232cb4cf2bfdbbbe5eb0fe80969bd2f2c1..e3ecb295b17b1f780185ccab7507d3f8d7ce2b84 100644 (file)
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils xdg-utils
+inherit eutils gnome2-utils xdg
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
@@ -24,23 +24,20 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
-MPLAYER_DEPEND="media-video/mplayer"
-MPV_DEPEND="media-video/mpv"
-OTHER_DEPEND="
-       media-sound/alsa-utils
-       media-sound/flac123
-       || ( media-sound/mpg123 media-sound/mpg321 )
-       media-sound/vorbis-tools"
-
 RDEPEND="dev-lang/perl
        dev-perl/Gtk2
        virtual/perl-MIME-Base64
        || ( net-misc/wget dev-perl/AnyEvent-HTTP )
        dbus? ( dev-perl/Net-DBus )
-       gstreamer? ( ${GSTREAMER_DEPEND} )
-       mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
-       !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+       gstreamer? ( dev-perl/Glib-Object-Introspection )
+       mplayer? ( || ( media-video/mplayer media-video/mpv ) )
+       !gstreamer? ( !mplayer? (
+                       media-sound/alsa-utils
+                       media-sound/flac123
+                       || ( media-sound/mpg123 media-sound/mpg321 )
+                       media-sound/vorbis-tools
+               )
+       )
        extras? ( dev-perl/gnome2-wnck )
        libnotify? ( dev-perl/Gtk2-Notify )"
 DEPEND="sys-devel/gettext
@@ -53,19 +50,9 @@ src_compile() {
 src_install() {
        emake \
                DESTDIR="${D}" \
-               iconsdir="${D%/}/usr/share/icons/hicolor" \
+               iconsdir="${D}/usr/share/icons/hicolor" \
                install
 
        use doc && local HTML_DOCS=( layout_doc.html )
        einstalldocs
 }
-
-pkg_postinst() {
-       xdg_desktop_database_update
-       gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       gnome2_icon_cache_update
-}
index 168d43232cb4cf2bfdbbbe5eb0fe80969bd2f2c1..e3ecb295b17b1f780185ccab7507d3f8d7ce2b84 100644 (file)
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils xdg-utils
+inherit eutils gnome2-utils xdg
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
@@ -24,23 +24,20 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
-MPLAYER_DEPEND="media-video/mplayer"
-MPV_DEPEND="media-video/mpv"
-OTHER_DEPEND="
-       media-sound/alsa-utils
-       media-sound/flac123
-       || ( media-sound/mpg123 media-sound/mpg321 )
-       media-sound/vorbis-tools"
-
 RDEPEND="dev-lang/perl
        dev-perl/Gtk2
        virtual/perl-MIME-Base64
        || ( net-misc/wget dev-perl/AnyEvent-HTTP )
        dbus? ( dev-perl/Net-DBus )
-       gstreamer? ( ${GSTREAMER_DEPEND} )
-       mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
-       !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+       gstreamer? ( dev-perl/Glib-Object-Introspection )
+       mplayer? ( || ( media-video/mplayer media-video/mpv ) )
+       !gstreamer? ( !mplayer? (
+                       media-sound/alsa-utils
+                       media-sound/flac123
+                       || ( media-sound/mpg123 media-sound/mpg321 )
+                       media-sound/vorbis-tools
+               )
+       )
        extras? ( dev-perl/gnome2-wnck )
        libnotify? ( dev-perl/Gtk2-Notify )"
 DEPEND="sys-devel/gettext
@@ -53,19 +50,9 @@ src_compile() {
 src_install() {
        emake \
                DESTDIR="${D}" \
-               iconsdir="${D%/}/usr/share/icons/hicolor" \
+               iconsdir="${D}/usr/share/icons/hicolor" \
                install
 
        use doc && local HTML_DOCS=( layout_doc.html )
        einstalldocs
 }
-
-pkg_postinst() {
-       xdg_desktop_database_update
-       gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       gnome2_icon_cache_update
-}