gentoo resync : 03.03.2021

4 files changed, 2 insertions, 80 deletions

diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 6a6cd0b347d0..725781bf7571 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,8 +1,4 @@
-DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
-DIST slixmpp-1.5.2.tar.gz 886383 BLAKE2B 6b5ed074ab182f449bf7d2919c241694ea4ff24567546c50a3d228af7708826fb9bfd89b4fccf8a31ae2909399b57caa752a71c187cffbe133bab13b41da814f SHA512 4f377246526c03ae02ece370ba8c9fa7c26a89eca7a012a1a89b8186b6c226d72287c15a7668ca85bfc8f2200765406dbc0fa9cb0e358c3755f551df8eb0d59f
 DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
-EBUILD slixmpp-1.4.2.ebuild 792 BLAKE2B 3f1d07dfbb9d0dc8eb75d1a3724107ec3092500c59789a6dd809cd3f88a592852d1baea0cff14537e994168e25c09f84942f501785f8ab46101ab4f077175bfa SHA512 a0eae50c4760c7fc0b9f710cfef4053cf513732ea9b886f0506b1c71a3694d236224b24c757443a21295348651abdc33593cfb6ee0ed572d78917f744d569850
-EBUILD slixmpp-1.5.2.ebuild 758 BLAKE2B 6ecb34f715dd5f7cbed928a72ce0015c12519c502b737a6248afe043cd48be9f2ce11c7cca88b05868771fe39547ad17a14736f0539230d108cbcbf563b6eb39 SHA512 ff01c04430132ebe07bf9ca3d0092d2e40244dbee380c82f369942001101a6067d52a1c6e37a8a3092690f1680daa96405f16138780d790e9216f72afaf7ee8a
-EBUILD slixmpp-1.7.0.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
+EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 759 BLAKE2B 73307904570350f10e384b16d54944f2ad1d0c0ec07726367a3bcae3b9f37b2d790dcb65bb7ac4600185791fd8c656ab7525b6826ecd67b48131f05a1ce7b96f SHA512 4052ceccc8b8ac8c71d171f7c2238dc504e5cb7855a08af76fdc8f37aab792a6ed1cad4694f673d551eb69caf3c69851605b906b1ea1200f52f87da34310f579
 MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
diff --git a/dev-python/slixmpp/slixmpp-1.4.2.ebuild b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
deleted file mode 100644
index df50588e34ef..000000000000
--- a/dev-python/slixmpp/slixmpp-1.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-dns/libidn
-	test? ( $RDEPEND )
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/slixmpp/slixmpp-1.5.2.ebuild b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
deleted file mode 100644
index 462a6bbad013..000000000000
--- a/dev-python/slixmpp/slixmpp-1.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
index 0f5e88aa5f6c..19974e840958 100644
--- a/dev-python/slixmpp/slixmpp-1.7.0.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="