gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 11d0254c6fec..1e585a2abef9 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,3 @@
-DIST zc.lockfile-1.4.tar.gz 11075 BLAKE2B 4fcc18b4d337c1b102916588aef7271fe189f30e442b5d2180b5a20d804f84649d4bf9dc6f601e6b7ee38c4a436c3848b83cbcb1a19974acdf072347b6822b83 SHA512 f145c34088770b50002d1caa88876f9fb11f3b9810fe68b8e1a38d27084d27ce058883228469abb05811f3f11a7b94acdaad8392eb1b6c34c98ddc885cdf77be
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-1.4.ebuild 1107 BLAKE2B 96c5b6dee80353a87d3618611f6d6ba0221abf507e8631826bc73ac306298e7d5995b4425bea1e3f5402e85cdfa63ae6449b737366b1183742290b228de9d7cb SHA512 0537cff770e012007c2719e05ea2348bb2d65b5563ee51e840c73df02b64f7008a23bc6a021c01f1b355328859f94e11cc5ef3e8997193242e14b702411cad92
-EBUILD zc-lockfile-2.0.ebuild 1041 BLAKE2B b99209f1993f0349ada79c62d187b5d258d5eaa806b997533e401449ef23018b50f88741de1f68eb1b6c73a37e2efd0d8ef2b09959824b8070ee47a94c2be520 SHA512 6e353a1cd6be36254be2014d646dcb5f99af087afa85d3886f708a2c019376da38432a04d84e56a82d3bf20cd708f93f890c71bf0a6fb2435e8d6285573ffeb0
+EBUILD zc-lockfile-2.0.ebuild 1047 BLAKE2B 27d833d6787a5f88cce5ba9fca675f0c36e129aa55ab0ca0c830395caaa5bb002c69a3433287df112c0de5efbaf0abd3c1f82242cbaaee0aba0ab4164f5b9677 SHA512 b3a0e9aecfddbec699de1f04452963899027c3779d5c628fc138d933c7b2e49de83c095ff18011312c81803f60a2b3430f5a34a3f51cfe4162bd8ab94937f207
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
deleted file mode 100644
index 865969ca4049..000000000000
--- a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Basic inter-process locks"
-HOMEPAGE="https://pypi.org/project/zc.lockfile/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( CHANGES.rst README.rst )
-
-# Prevent incorrect installation of data file
-python_prepare_all() {
-	sed -e '/^    include_package_data/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" src/zc/lockfile/tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_moduleinto zc
-	python_domodule src/zc/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 29d32611f280..bcd6eedeab99 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"