gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 73 deletions

diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 9cd30e7ae721..1ee09c84e4fe 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,3 @@
-DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
-DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-EBUILD markupsafe-0.23.ebuild 893 BLAKE2B 00bb68ac2eb2f8bc1448c333bdcfb491f892d9187a1fed40931218787af020ae93824b9bdd04a0442f366b44145dda765d9c81556cfb9d3b662668bfbe8d0cf4 SHA512 ac8ec38aad91cbd1813b2cb6712fd8d61bf4d31e09e8a4b608c352ec23a2ce1f28e2627027baa4c1b4eb2909f1a1c2d23868a7dedb59869cf6808c5fb3b7e9c3
-EBUILD markupsafe-1.0.ebuild 760 BLAKE2B e809a2a2f01b9f4f146bfb0db84a496137cdd72a34e82697e410d28c9325d740b2cae6cb45b30fa0fcde73c1b600c2715943ae6934b06c6ad5ce0c2c6527437f SHA512 6849ae7565b3d4df42953b519ee71bb87bf72ec3dc58753e9734154980686a441ac2be498a3a779777b921b03f7f81e739616fab842808f725d973066e600e7f
-EBUILD markupsafe-1.1.1.ebuild 710 BLAKE2B f1c4bcf55d56f4605d9b10695d14d017df8161947029b17bdafbb488a2cab23d20bd73e869538571f6332696f31d1af6457ffd52c0d9f4fe8fec32bccec9c3d2 SHA512 371b3ede55b9a2d55c7589ac10ab1cc3a15f43895362dbc757b3b3ceba5527add0d5a5398ec77d64671a9f8b267358e7bed1de5ee87570f098b24f3bb3694a97
+EBUILD markupsafe-1.1.1.ebuild 699 BLAKE2B ccea10e337a0dd7735ab27ce08cf8ea41f06b3fdea6ebdd7c7b0c361239e5d059cbe3ec48e320738532355895d29cf38da3c1875d3d2c97a35cb790298bf4ff8 SHA512 efca78cc7ec1cd2eff9ca98975988e1ad70e911d660f02c369d06cbc07092d1b883a8d596344ae18407c4425bfae17bb1fe89a6198a03e4f9123dd43f3a850a5
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
deleted file mode 100644
index a7aad3b1d71f..000000000000
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode ${PN} || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-1.0.ebuild b/dev-python/markupsafe/markupsafe-1.0.ebuild
deleted file mode 100644
index eee52348d0b0..000000000000
--- a/dev-python/markupsafe/markupsafe-1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
index a11fce70cb5c..eceac7f542b5 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"