gentoo resync : 08.06.2019

3 files changed, 3 insertions, 72 deletions

diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 443c13e2ba5d..7db14288211e 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,4 @@
-DIST gmusicbrowser-1.1.15.tar.gz 2349451 BLAKE2B 8967e404360dd59b8cb59bfdfde8a9b8771be9deb2d449800fd2515b65c5b06d935db828030aeb8e839305781f799e1fd2ee8f975c1ce479ed0211fa71a84731 SHA512 9176be8f2b1b6c832099feff87a7a526efaa3c512c9b7b6d433f1a157ac1185adb05185f52f9ce1b3b41afc967c37345d216a090b472927a661747e25479cbdc
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
-EBUILD gmusicbrowser-1.1.15-r3.ebuild 1674 BLAKE2B a3e1f4009928db8f10561e06e353e0d706533060d0c9ac2b5fff97872da89822aca223fbd6e1ce59eb347751132eea2a2743fc2d112c81871a773dbc6e720f37 SHA512 02c101547fc328b22c4504e3be3d089e5cbef29b104d1cb4ed1b5fa697d6d6d096384d3585d19118d5413c7fbd044549800c6ea90fad99ba6fddf075d54d8ef0
-EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1736 BLAKE2B 7fd8ffdfd09ff37aa681b6a4dd4d8b9ab11478f4a4053b3c3322f22ca09d66fa4da3141975fa4405928d74aa7e535c62e0982facb960d3b9bd5b736f5153fa6b SHA512 ba837fc226673b0b5a1ad1972fc5ccdf8223df5f96e7dbac6bd9cd63649ed594ced80656ae7042edbe9482c92ffe3d77f909373ca8289c1e8d32cadd1ee9640e
+EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1739 BLAKE2B 013e8256f27e0b9f4ddd9640d85d87a50a10d9f92cd14636bbda07e370cb4a08daca6658005a1fb1bb9f49aad5a7a2f933a3540cce86fd47bcae8aa0baaed956 SHA512 b52b905916fbed1875c74222626150f8a2bcee8552aee9515d2e854cc4898015312d3520c14b78696d6d09b5b3fc57817848dac77911f4ee85399a8bbb83bb6f
 EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
deleted file mode 100644
index 439186eb3b9d..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-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"
-
-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} ) )
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext"
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D%/}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_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() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
index 5812aee33a2a..6e832b7bc9fa 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -9,11 +9,11 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 else
 	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi