gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 68 deletions

diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 374e0278736b..5713ef1aa5e8 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,6 +1,3 @@
-AUX sonata-1.6.2.1-mpd18-compat.patch 820 BLAKE2B 473334fdd3f3b72352dbc2a35c842765cd8140c1ec65e905f50c48c234f13fd26c85267cae5db9e497d55229c1896feffb301d70df7a298dfc8a6bf1d09ae31d SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66
-DIST sonata-1.6.2.1.tar.bz2 314333 BLAKE2B a2d7f6f8b5fe4b774136c70e7a354a8b8d948f44e876e3d59b0a216cb482de6c9b5a38b1332347136466965bd0551a03ba53f9e554c969ce901e880fa691496e SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
 DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
-EBUILD sonata-1.6.2.1-r2.ebuild 913 BLAKE2B 846840b1896d13d3510498331c3e1c4663c6b0a013288c3eb6103a905a67c4b5299519f3eb2fde92dd8fa24b011588e02e6606993c7b82d4dafd03b25209123a SHA512 fb8abb6c69d16cb5a36f688a5b41473abf8a72acec5c70ea6395d178bb9f0962198d8c8bad94f697c2356876816077c96c1e78f3eebef9c47dec604cd79a4276
-EBUILD sonata-1.7_beta1_p20200212.ebuild 999 BLAKE2B 6905b1562510c4ef4211cbfbd086546509f8fcbc3fc04de146136d7aa62818e6f6b55892caaf8477143d9af4ec1ec4fa4eb885072c6af4c44197379bf2af784d SHA512 e24184f82bbed8404eb0a0d70c5c12ae3a2593f86f44389226c83b6e827d159aff6ef5e627e0f5a681e0964c889319c9dfe54fc6d87edaff83afb0648f3df12e
-MISC metadata.xml 554 BLAKE2B eb83a90fb0ad69e577369c4446edcdb2c1cc240958038fa776a61bce22d40fec23d0f4b1678b51edcec3110604fd7b5f273d67857ac9037dc93d82ca2fd7f708 SHA512 de93bd7c5f5425a2ee0d2179a2b3f4591d8507ba1caa9c5c2b133cc5888a94565d7b60af9890c114a3908797324475543659f54a78f23bdf884e98cc49fb7c7e
+EBUILD sonata-1.7_beta1_p20200212.ebuild 997 BLAKE2B aeb301d81105c7d01ce78e23cfb3669b75fbebdf44da16b87d346cc3f3de573f71a05562bf2a3791b1bf4187939d9b184170aec0743ab6129f77dec5d53f866b SHA512 f4e86e9f29e19960820a092c62f82321fe7ab9f2e6adf71783a6bd929ed4e007140d8b072b522934cd56f9c3103f9ba2130ba9ca847380c7bc1cae5e382f4e6f
+MISC metadata.xml 478 BLAKE2B f93c58977de74be7b3fcbaa3d2ca22e2d8394b6899d6c07072270418380cc50ce99f426ce3668e5a663939769eb7e6a4871d1a7c96afb81c5c89d0aebc1c3ad2 SHA512 5c7dc2feb0594f52ebcf8e579a9292e157b673e358ea80cf8111cb72a62bb2551725d4f3f738daec430ae4f66ff80e48330b0d8aa23a3ac508a0c202f209170a
diff --git a/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch b/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch
deleted file mode 100644
index 8d10b07f4f8f..000000000000
--- a/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2014-06-08  Israel G. Lugo <israel.lugo@lugosys.com>
-
-	Compatibility fix for mpd 0.18.
-
-	* sonata/main.py (Base.update_status): Properly handle missing xfade
-	property.
-
-diff -durNp sonata-1.6.2.1/sonata/main.py sonata-1.6.2.1-mpd0.18/sonata/main.py
---- sonata-1.6.2.1/sonata/main.py	2009-09-21 22:02:16.000000000 +0100
-+++ sonata-1.6.2.1-mpd0.18/sonata/main.py	2014-06-08 15:10:08.586659487 +0100
-@@ -989,7 +989,7 @@ class Base(object):
- 						self.repeatmenu.set_active(self.status['repeat'] == '1')
- 					if not self.last_random or self.last_random != self.status['random']:
- 						self.randommenu.set_active(self.status['random'] == '1')
--					if self.status['xfade'] == '0':
-+					if self.status.get('xfade', '0') == '0':
- 						self.config.xfade_enabled = False
- 					else:
- 						self.config.xfade_enabled = True
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
index ce109085d31b..7bd3321222f2 100644
--- a/media-sound/sonata/metadata.xml
+++ b/media-sound/sonata/metadata.xml
@@ -10,7 +10,4 @@
     (MPD). It aims to be efficient (no toolbar, main menu, or statusbar),
     user-friendly, and clean.
   </longdescription>
-  <use>
-    <flag name="lyrics">Support for lyrics fetching</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
deleted file mode 100644
index e66283e07368..000000000000
--- a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL="true"
-inherit distutils-r1
-
-DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.nongnu.org/sonata/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# now released at https://github.com/multani/sonata/releases
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus lyrics taglib"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-python/pygtk-2.12:2
-	x11-libs/gdk-pixbuf:2[jpeg]
-	>=dev-python/python-mpd-0.2.1
-	dbus? ( dev-python/dbus-python )
-	lyrics? ( dev-python/zsi )
-	taglib? ( >=dev-python/tagpy-0.93 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}"/${P}-mpd18-compat.patch )
-
-src_install() {
-	distutils-r1_src_install
-	rm -r "${D}"/usr/share/sonata || die
-}
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
index 3f5b02394145..de649a75f57b 100644
--- a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
+++ b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/multani/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus taglib"
 
 BDEPEND="