gentoo resync : 20.03.2021

4 files changed, 69 insertions, 17 deletions

diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 5ec8edc49eca..8cdb0050b706 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,6 @@
 DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
+DIST gmusicbrowser-1.1.16.tar.gz 2369434 BLAKE2B 952c4a75d8018b890a787e69cdde06f1c1d588384e220950ab46d0ddcd785cd30d477c52926421b72c7cae4078342e6f5f07fa0b41fe6d0ef2a0b4ec4e15c8ce SHA512 76213a6634208c66cff33ab947450553e656d121e8aff99e47bc983f752f6095019aa67bef834681594a81f6f5fdb241bb98d374027622704d961c1d816bd12a
 EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1438 BLAKE2B 42055af696aefcdcfe264353563f87544e52c041383954d0f90b0546a5efd82b88059961dfab2d4e39eda855d3e9fc1bfda803d372ac65273c0d814527bdfec6 SHA512 a1c8bd62631f1e28c8e6511a8a63a919d15845cfb35beb5ac4da32e787b44b169e5d92df1b1b18f533b6801fb3301d48e39eda6342692b6dfb4c5930076c933a
-EBUILD gmusicbrowser-9999.ebuild 1440 BLAKE2B 8d1611f9509e0e4404a2277afb900a8e071f3c35038d1c3e930a92e39577b7d745edd1d71132ac3e990e14f6d8211b1a613de6bd6c8eaf1d8d5a5e82fa65667b SHA512 acf5251d8a414ce24afa2abaacd5e3c0dce043efc0f0b8027f21ab0762f490941a4eaa143a7f6ff67504cd8c5834e9b948fbbf28a8019d00154e211084c4eb3b
-MISC metadata.xml 348 BLAKE2B b91fd147f7a4d685c51832b198e6508db2e62e5529168b9a27b78d0bb9bc2924a3e8a0ae182117882001631b028f28803082c3069f4a9bcd2d4ecc77279b3987 SHA512 a4c9a19bbcf91e47cfb0bc72bce2d01f4dc32f8ad34f0a430f98faa5822092aee3d139a06b7d8e8986553100bcab03194ca49e602371bdf2a1dba6d090dc9912
+EBUILD gmusicbrowser-1.1.16.ebuild 1174 BLAKE2B 08c9f2a8e8c051d7140fe001f7264c2fbe5e2c54e03edb2fe2ee896f505ed43cf6a6288843ae18141d01984cf128192fa849774a319214522c696c45c13d2887 SHA512 2e53db37a8a08d3acfa1e6ebdc9596bf65b31c8da5458ed77a9b73e5f0295b39f521509ace1296f8f9e8da9517930c7a630d3d15de1638ae310a3643a886f97d
+EBUILD gmusicbrowser-9999.ebuild 1292 BLAKE2B b4afccbea10450521e079aa4b69373a454b177baaea7c7f95cacd217cec81b8a66e69487e80ea257d55c3502a4436b0837667e973761d681d20b449aca0f0219 SHA512 a37a9f3c65866cd0586fa3f6470500dbf452bf7b70f152e1f993301a639bf5c4dfdb3c44a971cbf7a2dee73686872c73f5121a037474738db9c92789bb19a383
+MISC metadata.xml 479 BLAKE2B 920ff946c66abe6386665a9d8d4546359c4bc3d77fcc8bf6cc293f5e79dfe4b5259481ebc4d54b595c6a693e06de39c7eff63acef17b47149eab7903442ec772 SHA512 62897e2c761749f2587bccf4408060a2c7a8d07eb5122849d4d5f8d20445fbfc3debf6d336a38c54b2b472847ec25a9a3cabebdc879200b0738772cf39b5d222
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
new file mode 100644
index 000000000000..ea8fe1e9691b
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+SRC_URI="https://${PN}.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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="${RDEPEND}"
+
+src_prepare() {
+	default
+	# silence QA warnings
+	sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die
+}
+
+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 6813cf60326b..c6fdb5a5b4f9 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -3,28 +3,20 @@
 
 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=""
-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
+inherit git-r3 gnome2-utils xdg
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="https://gmusicbrowser.org/"
+EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus doc extras gstreamer libnotify mplayer"
 
+BDEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
 RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
+	dev-perl/Gtk3
 	virtual/perl-MIME-Base64
 	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
 	dbus? ( dev-perl/Net-DBus )
@@ -39,13 +31,18 @@ RDEPEND="dev-lang/perl
 	)
 	extras? ( dev-perl/gnome2-wnck )
 	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
 }
 
+src_prepare() {
+	default
+	# silence QA warnings
+	sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 1663c00e8552..00b4a88c802f 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>Sergiy.Borodych@gmail.com</email>
+		<name>Sergiy Borodych</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>