diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-12-25 13:22:01 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-12-25 13:23:24 +0100 |
| commit | dca2364c07a70fc6792ecc66128f3e73502e6cb4 (patch) | |
| tree | 602d408d63ff43082d59652bafe69b362d0d2657 /media-sound | |
| parent | media-sound/gmusicbrowser: bump to newest git revision (2019-03-15) (diff) | |
| download | gentoo-dca2364c07a70fc6792ecc66128f3e73502e6cb4.tar.gz gentoo-dca2364c07a70fc6792ecc66128f3e73502e6cb4.tar.bz2 gentoo-dca2364c07a70fc6792ecc66128f3e73502e6cb4.zip | |
media-sound/gmusicbrowser: 1.1.15_p20190315 and 9999 cleanup
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>
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild | 37 | ||||
| -rw-r--r-- | media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild | 37 |
2 files changed, 24 insertions, 50 deletions
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild index 168d43232cb4..e3ecb295b17b 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild @@ -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 -} diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index 168d43232cb4..e3ecb295b17b 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -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 -} |