gentoo resync : 25.11.2020

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 8486d440cfdd..8f13b79854a1 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,5 +1,3 @@
-DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
 DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
-EBUILD python-mpd-1.0.0-r1.ebuild 1020 BLAKE2B 8e0f736227abad803aeb3d94712607265454338f33f675511c650d0fb69c3b70b9a38f6dc32cceea89092257aa053645a716e1a394229283c57878164c49fd01 SHA512 35dba9b2f2a0e20fd2693e4e9988ac28c1d09b55d69732de9999778e7e87f0ae97005f466c9d0871906229688c62e4fc5056726d20f8deae3b328e71ecc068ea
-EBUILD python-mpd-1.1.0-r1.ebuild 1022 BLAKE2B 727cf4377c298a1bbd546dbdd28c1ae13f51e7784144d9ba9b219caf890068ad230a407281c59ff2da95207ea791b21658d85bdedd85f8c189d41879a1cb9475 SHA512 62669f31efb49c3b7630b61ff5fb7eb89499f8a9e014b1d59ed354cb25db5c0a40339914662397e723831622863d0d04b78ca7cba198384b82f08ba20173dff6
+EBUILD python-mpd-1.1.0-r1.ebuild 1020 BLAKE2B 8e0f736227abad803aeb3d94712607265454338f33f675511c650d0fb69c3b70b9a38f6dc32cceea89092257aa053645a716e1a394229283c57878164c49fd01 SHA512 35dba9b2f2a0e20fd2693e4e9988ac28c1d09b55d69732de9999778e7e87f0ae97005f466c9d0871906229688c62e4fc5056726d20f8deae3b328e71ecc068ea
 MISC metadata.xml 462 BLAKE2B 7ab5f8dbe5062af562e466d8c9452e29072c1d91ac10eb7adf05f81f9c7ab7cb28a2a81f6a80791c782aeac33a863ab26a17e88c0bde408db084b29fb8fdc592 SHA512 2c3220c6a6efe353ff1d667b8689f673c66ee58176a140437237cd74fe02c794bcdc219dd658f8e77d5f338a6c877890d09d28d87580cef36946011aaffa4cac
diff --git a/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
deleted file mode 100644
index 9c0299e7da29..000000000000
--- a/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE="examples +twisted"
-
-REQUIRED_USE="test? ( twisted )"
-
-RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
-
-S="${WORKDIR}/${PN}2-${PV}"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	pytest mpd/tests.py -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples/.
-}
diff --git a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
index fd322f9116ee..9c0299e7da29 100644
--- a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"