commit: 390545adff45dcbe3404c2a3922dccaa3fa74ade Author: Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com> AuthorDate: Mon Feb 13 15:49:22 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Feb 14 21:43:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390545ad
media-sound/gmusicbrowser: drop gstreamer-0 support close bug #604684 Closes: https://github.com/gentoo/gentoo/pull/3955 ...-9999.ebuild => gmusicbrowser-1.1.15-r3.ebuild} | 25 ++++++---------------- .../gmusicbrowser/gmusicbrowser-9999.ebuild | 12 +++-------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild similarity index 70% copy from media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild copy to media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild index c2c17f37ff..6a5db39411 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild @@ -1,25 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 -inherit eutils fdo-mime git-r3 gnome2-utils +inherit fdo-mime gnome2-utils DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" HOMEPAGE="http://gmusicbrowser.org/"; -EGIT_REPO_URI="git://github.com/squentin/${PN}.git" +SRC_URI="http://${PN}.org/download/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="dbus doc extras gstreamer gstreamer-0 libnotify mplayer" +KEYWORDS="~amd64 ~x86" +IUSE="dbus doc extras gstreamer libnotify mplayer" GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection" -GSTREAMER0_DEPEND=" - dev-perl/GStreamer - dev-perl/GStreamer-Interfaces - media-plugins/gst-plugins-meta:0.10" MPLAYER_DEPEND="media-video/mplayer" MPV_DEPEND="media-video/mpv" OTHER_DEPEND=" @@ -34,17 +30,11 @@ RDEPEND="dev-lang/perl || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( ${GSTREAMER_DEPEND} ) - gstreamer-0? ( ${GSTREAMER0_DEPEND} ) mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) - !gstreamer? ( !gstreamer-0? ( !mplayer? ( ${OTHER_DEPEND} ) ) ) + !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )" -DEPEND="sys-devel/gettext - doc? ( dev-perl/Text-Markdown )" - -src_compile() { - emake MARKDOWN=$(usex doc "Markdown.pl" "echo") -} +DEPEND="sys-devel/gettext" src_install() { emake \ @@ -67,7 +57,6 @@ pkg_postinst() { elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." elog "for audio playback. Needed dependencies:" elog " Gstreamer: ${GSTREAMER_DEPEND}" - elog " Gstreamer-0.10: ${GSTREAMER0_DEPEND}" elog " mplayer: ${MPLAYER_DEPEND}" elog " mpv: ${MPV_DEPEND}" elog " mpg123/ogg123...: ${OTHER_DEPEND}" diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index c2c17f37ff..ad13158cc9 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,13 +13,9 @@ EGIT_REPO_URI="git://github.com/squentin/${PN}.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="dbus doc extras gstreamer gstreamer-0 libnotify mplayer" +IUSE="dbus doc extras gstreamer libnotify mplayer" GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection" -GSTREAMER0_DEPEND=" - dev-perl/GStreamer - dev-perl/GStreamer-Interfaces - media-plugins/gst-plugins-meta:0.10" MPLAYER_DEPEND="media-video/mplayer" MPV_DEPEND="media-video/mpv" OTHER_DEPEND=" @@ -34,9 +30,8 @@ RDEPEND="dev-lang/perl || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( ${GSTREAMER_DEPEND} ) - gstreamer-0? ( ${GSTREAMER0_DEPEND} ) mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) - !gstreamer? ( !gstreamer-0? ( !mplayer? ( ${OTHER_DEPEND} ) ) ) + !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )" DEPEND="sys-devel/gettext @@ -67,7 +62,6 @@ pkg_postinst() { elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." elog "for audio playback. Needed dependencies:" elog " Gstreamer: ${GSTREAMER_DEPEND}" - elog " Gstreamer-0.10: ${GSTREAMER0_DEPEND}" elog " mplayer: ${MPLAYER_DEPEND}" elog " mpv: ${MPV_DEPEND}" elog " mpg123/ogg123...: ${OTHER_DEPEND}"
