commit: 7e3840d0a33eba3b7023468e86c23661fc0c8b90 Author: Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com> AuthorDate: Tue Oct 25 07:27:29 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Nov 6 19:32:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3840d0
media-sound/gmusicbrowser: rework to utilize USE flags fully also update pkg_postinst message Closes: https://github.com/gentoo/gentoo/pull/2661 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...-9999.ebuild => gmusicbrowser-1.1.15-r2.ebuild} | 45 ++++++++-------------- .../gmusicbrowser/gmusicbrowser-9999.ebuild | 30 ++++++--------- media-sound/gmusicbrowser/metadata.xml | 3 ++ 3 files changed, 30 insertions(+), 48 deletions(-) diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild similarity index 56% copy from media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild copy to media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild index 3ac52e6..8f43b04 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild @@ -4,16 +4,16 @@ EAPI=5 -inherit eutils fdo-mime git-2 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="doc" +KEYWORDS="~amd64 ~x86" +IUSE="dbus extras gstreamer libnotify mplayer" GSTREAMER_DEPEND=" dev-perl/GStreamer @@ -31,18 +31,13 @@ RDEPEND="dev-lang/perl dev-perl/gtk2-perl virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) - || ( - ( ${GSTREAMER_DEPEND} ) - ( ${MPLAYER_DEPEND} ) - ( ${MPV_DEPEND} ) - ( ${OTHER_DEPEND} ) - )" -DEPEND="sys-devel/gettext - doc? ( dev-perl/Text-Markdown )" - -src_compile() { - emake MARKDOWN=$(usex doc "Markdown.pl" "echo") -} + dbus? ( dev-perl/Net-DBus ) + gstreamer? ( ${GSTREAMER_DEPEND} ) + mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) + !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) + extras? ( dev-perl/gnome2-wnck ) + libnotify? ( dev-perl/Gtk2-Notify )" +DEPEND="sys-devel/gettext" src_install() { emake \ @@ -51,7 +46,7 @@ src_install() { iconsdir="${D}/usr/share/icons/hicolor" \ install - use doc && dohtml layout_doc.html + dohtml layout_doc.html } pkg_preinst() { @@ -64,18 +59,10 @@ pkg_postinst() { elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." elog "for audio playback. Needed dependencies:" - elog "Gstreamer: ${GSTREAMER_DEPEND}" - elog "mplayer: ${MPLAYER_DEPEND}" - elog "mpv: ${MPV_DEPEND}" - elog "mpg123/ogg123...: ${OTHER_DEPEND}" - elog - elog "This ebuild just ensures at least one implementation is installed!" - elog - elog "other optional dependencies:" - elog " dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)" - elog " dev-perl/Gtk2-WebKit (for Web context plugin)" - elog " dev-perl/Gtk2-Notify (for Notify plugin)" - elog " dev-perl/gnome2-wnck (for Titlebar plugin)" + elog " Gstreamer: ${GSTREAMER_DEPEND}" + elog " mplayer: ${MPLAYER_DEPEND}" + elog " mpv: ${MPV_DEPEND}" + elog " mpg123/ogg123...: ${OTHER_DEPEND}" } pkg_postrm() { diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index 3ac52e6..d83ca18 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -13,7 +13,7 @@ EGIT_REPO_URI="git://github.com/squentin/${PN}.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="doc" +IUSE="dbus doc extras gstreamer libnotify mplayer" GSTREAMER_DEPEND=" dev-perl/GStreamer @@ -31,12 +31,12 @@ RDEPEND="dev-lang/perl dev-perl/gtk2-perl virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) - || ( - ( ${GSTREAMER_DEPEND} ) - ( ${MPLAYER_DEPEND} ) - ( ${MPV_DEPEND} ) - ( ${OTHER_DEPEND} ) - )" + dbus? ( dev-perl/Net-DBus ) + gstreamer? ( ${GSTREAMER_DEPEND} ) + mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) + !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) + extras? ( dev-perl/gnome2-wnck ) + libnotify? ( dev-perl/Gtk2-Notify )" DEPEND="sys-devel/gettext doc? ( dev-perl/Text-Markdown )" @@ -64,18 +64,10 @@ pkg_postinst() { elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." elog "for audio playback. Needed dependencies:" - elog "Gstreamer: ${GSTREAMER_DEPEND}" - elog "mplayer: ${MPLAYER_DEPEND}" - elog "mpv: ${MPV_DEPEND}" - elog "mpg123/ogg123...: ${OTHER_DEPEND}" - elog - elog "This ebuild just ensures at least one implementation is installed!" - elog - elog "other optional dependencies:" - elog " dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)" - elog " dev-perl/Gtk2-WebKit (for Web context plugin)" - elog " dev-perl/Gtk2-Notify (for Notify plugin)" - elog " dev-perl/gnome2-wnck (for Titlebar plugin)" + elog " Gstreamer: ${GSTREAMER_DEPEND}" + elog " mplayer: ${MPLAYER_DEPEND}" + elog " mpv: ${MPV_DEPEND}" + elog " mpg123/ogg123...: ${OTHER_DEPEND}" } pkg_postrm() { diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml index 99330a6..6c2c0dc 100644 --- a/media-sound/gmusicbrowser/metadata.xml +++ b/media-sound/gmusicbrowser/metadata.xml @@ -10,4 +10,7 @@ <email>[email protected]</email> <name>Gentoo Sound project</name> </maintainer> + <use> + <flag name="extras">Install some extra deps for plugins (ex. Titlebar)</flag> + </use> </pkgmetadata>
