From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4932E1395E2 for ; Sun, 6 Nov 2016 19:33:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 526FBE0AE6; Sun, 6 Nov 2016 19:33:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D0FBE0AE6 for ; Sun, 6 Nov 2016 19:33:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B7E13418DE for ; Sun, 6 Nov 2016 19:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C958C24BE for ; Sun, 6 Nov 2016 19:33:20 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1478460774.7e3840d0a33eba3b7023468e86c23661fc0c8b90.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild media-sound/gmusicbrowser/metadata.xml X-VCS-Directories: media-sound/gmusicbrowser/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7e3840d0a33eba3b7023468e86c23661fc0c8b90 X-VCS-Branch: master Date: Sun, 6 Nov 2016 19:33:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b4c35f6f-7e2c-48bd-a461-8ea9b3253c30 X-Archives-Hash: 57b2025db4965d6e964c4a107ee40a26 commit: 7e3840d0a33eba3b7023468e86c23661fc0c8b90 Author: Sergiy Borodych gmail com> AuthorDate: Tue Oct 25 07:27:29 2016 +0000 Commit: David Seifert gentoo 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 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 @@ sound@gentoo.org Gentoo Sound project + + Install some extra deps for plugins (ex. Titlebar) +