[gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/

[Michał Górny]

commit:     c36ab58ac6a228a2b396c663d4ed374b47353c95
Author:     Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com>
AuthorDate: Mon May  8 08:08:42 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  8 17:02:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36ab58a

media-sound/gmusicbrowser: sync release & git (9999) ebuilds

Closes: https://github.com/gentoo/gentoo/pull/4452

 .../gmusicbrowser-1.1.15_p20160530.ebuild          | 18 ++++++++++-----
 .../gmusicbrowser/gmusicbrowser-9999.ebuild        | 27 +++++++++++-----------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
index b352d2a875f..f5ce7149e05 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -3,17 +3,25 @@
 
 EAPI=6
 
-GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
-
 inherit eutils fdo-mime gnome2-utils
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/squentin/gmusicbrowser.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	SRC_URI="https://github.com/squentin/gmusicbrowser/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
-SRC_URI="https://github.com/squentin/gmusicbrowser/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
 GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
@@ -38,8 +46,6 @@ RDEPEND="dev-lang/perl
 DEPEND="sys-devel/gettext
 	doc? ( dev-perl/Text-Markdown )"
 
-S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-
 src_compile() {
 	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
 }

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index c1e4914b4f0..f5ce7149e05 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -3,15 +3,25 @@
 
 EAPI=6
 
-inherit eutils fdo-mime git-r3 gnome2-utils
+inherit eutils fdo-mime gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/squentin/gmusicbrowser.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	SRC_URI="https://github.com/squentin/gmusicbrowser/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
 
 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"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
 GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
@@ -50,20 +60,9 @@ src_install() {
 	einstalldocs
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
-
-	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}"
 }
 
 pkg_postrm() {