gentoo resync : 15.01.2020

3 files changed, 75 insertions, 28 deletions

diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 7db14288211e..aac6966d4d3c 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,6 @@
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
+DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
 EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1739 BLAKE2B 013e8256f27e0b9f4ddd9640d85d87a50a10d9f92cd14636bbda07e370cb4a08daca6658005a1fb1bb9f49aad5a7a2f933a3540cce86fd47bcae8aa0baaed956 SHA512 b52b905916fbed1875c74222626150f8a2bcee8552aee9515d2e854cc4898015312d3520c14b78696d6d09b5b3fc57817848dac77911f4ee85399a8bbb83bb6f
-EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
+EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
+EBUILD gmusicbrowser-9999.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
new file mode 100644
index 000000000000..e3ecb295b17b
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils gnome2-utils xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
+	SRC_URI="https://github.com/squentin/${PN}/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="https://gmusicbrowser.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	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
+	doc? ( dev-perl/Text-Markdown )"
+
+src_compile() {
+	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index 3d144fcc11c7..e3ecb295b17b 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
@@ -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
-}