gentoo resync : 21.09.2018

3 files changed, 3 insertions, 86 deletions

diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index b78d5b3557ec..8ed35f8e0e1f 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-mplayer-1.0.8.tar.gz 1062691 BLAKE2B 0ff843b26ffdaffa7240c04a55f15f8534e657610f6483da9fa92d054e748187a288deb8e330032ae0d2e774d3e4d7b913680669ccf0b8fa9202c98fee686295 SHA512 795530313a6b8135e328e0cb8f5d9081b0b5caf8f81b1ab182a2876241bd662b96d2ef25164dc6f436fb66168472f3716e033697f0aeffe5f84c59cd8de420c2
 DIST gnome-mplayer-1.0.9.tar.gz 1082199 BLAKE2B c2219b5a6902c9e2c9849dd3a31a29e2270b7ca513945a5e9684fa429073f42e360f6ef698f42b93e61a3d39edef1215f657e92cfab1c9fe3b19d5ea85eac839 SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d
-EBUILD gnome-mplayer-1.0.8.ebuild 1806 BLAKE2B 307dc849ae9e5c42fad05e46ac988aaa350cadb3ec0bf6a0b580e4e0d8a8bbfbe519907cd37523d6a1651ddab2a4c808821ac4e78f4c3488d075b310349dc8df SHA512 90b98fdb269d35030cd565e579e60c1249c7e7ff120421b4d2a85b32cea932843a097d4dfa2dfb6363ba99e1dd9964a352eff1544a0cf0525acfc19bfe762b93
-EBUILD gnome-mplayer-1.0.9.ebuild 1920 BLAKE2B 3c779d5faa4e322df4f1d98226de4ff4063797b983c691c8880e0745178bdbf20e20ca52c7b706890459d4dd0758ad52cefb660dd05e8b97c075871988b03d0e SHA512 fc42f38928001d4f844afdfebbd66ff2ad9a258fd9c6e92cfea0c20424536ab8e2cb60885f787a3ce0284d4d5bbe66394e994546ea3a11743e503c13b801fa6d
+EBUILD gnome-mplayer-1.0.9-r1.ebuild 1831 BLAKE2B bdf0def0efec4fbc85a5894dfebb021368f2cf697b074e942a2754530eb7e17529967c7622d3969f92ecf3bfabec58f144747c265a17fbcc1564e3caf7c2dd1c SHA512 57766faefaa347e2a660a4efdb4168ac3f04aaf88096dece82f7690181f86628a887a9e42cfee5794ed68dcea189dbdb42d1db551e931e7e41a60ed51da5d614
 MISC metadata.xml 398 BLAKE2B e6cef861c1aa0178c3ff271532dc97bef997513cf5f5c37ab4a41dfe0e3430d5b2f7fdfcf0f7952a5ff6811a96520139531d23b8a446b226e21f57d6df739a4f SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
deleted file mode 100644
index e3cfb34a9eb0..000000000000
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ interface to MPlayer"
-HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	>=media-libs/gmtk-${PV}[dconf=]
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( >=dev-libs/dbus-glib-0.100 )
-	gda? ( gnome-extra/libgda:5 )
-	gnome? ( gnome-base/nautilus )
-	ipod? ( >=media-libs/libgpod-0.7 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	musicbrainz? (
-		media-libs/musicbrainz:3
-		net-misc/curl
-		)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	>=media-video/mplayer-1.0_rc4_p20100101[libass]"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*.txt"
-
-src_configure() {
-	econf \
-		--enable-gtk3 \
-		$(use_enable gnome nautilus) \
-		--with-gio \
-		$(use_with dbus) \
-		$(use_with gda libgda) \
-		$(use_with alsa) \
-		$(use_with pulseaudio) \
-		$(use_with libnotify) \
-		$(use_with ipod libgpod) \
-		$(use_with musicbrainz libmusicbrainz3)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
index b6473af07344..bd9fa8ca7f6d 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
+IUSE="alsa +dbus +dconf gda gnome ipod libnotify pulseaudio"
 
 COMMON_DEPEND=">=dev-libs/glib-2.30
 	>=media-libs/gmtk-${PV}[dconf=]
@@ -24,10 +24,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.30
 	gnome? ( gnome-base/nautilus )
 	ipod? ( >=media-libs/libgpod-0.7 )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
-	musicbrainz? (
-		media-libs/musicbrainz:3
-		net-misc/curl
-		)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
@@ -51,7 +47,7 @@ src_configure() {
 		$(use_with pulseaudio) \
 		$(use_with libnotify) \
 		$(use_with ipod libgpod) \
-		$(use_with musicbrainz libmusicbrainz3)
+		--without-libmusicbrainz3
 }
 
 src_install() {