gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 96 deletions

diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 3580f323dedc..1c54189f20bf 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,6 +1,3 @@
-DIST lockfile-0.11.0.tar.gz 20909 BLAKE2B 8e13508312efc7eaa463e8fb80bf0a51ae3bc0adb93dee0eb52273bac40293e729de83aca98f549d12f3e46f9654c1d0f373aaba350acf7a17421c3d1fa9ea52 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.11.0-r1.ebuild 1226 BLAKE2B d36184fd1f953b0cc9000cf607623fa1c540d2b6e63d81c6cf9eed0306fa2a21402f052165cc15138abd6560024e700f24bbc6e22418a69ba86e9c6e60f11f06 SHA512 72c1374edf3eb8898222dabdc0fe15316daed78fd974568af5fc954eef7cd917d3d0df54d4ccd899edc9aeb3df38b49de4378cb4cafe112876e92579108d5657
-EBUILD lockfile-0.12.2-r1.ebuild 1098 BLAKE2B ce4d96145d24fa870a818c1ef11a591cb0140e3fda4d43a447c77784b15c9763f30618c2778bb65572955daaedc05df5224e768efa9ecedacde6aefdd342a2df SHA512 cbb2ed5e6d0098ed36a7eb10ca3e9f1c4ded9f76e5141ff02ce4aa659b40f2986df0432bd53099f36d1433e2d1a6b4bd888cd2c927e5e11914af8a2f4f3a3443
-EBUILD lockfile-0.12.2-r2.ebuild 1098 BLAKE2B 4e921f127c6237e45555f32dacfec9efe240463b66653f8e2c4c449e81ce5870f70991bbe2e4281a753bef3b6d0dc8a3d76a55ecb6454143e4df5599128e436c SHA512 e8901e332a79d880a6ba5316a47b5aba0dec39685fe76d55a873ed8cfa45af4e420adfc92886026cb8ec0b73f3e612faa6d828636f58684204fb1d681a0b9091
-MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
+EBUILD lockfile-0.12.2-r2.ebuild 1087 BLAKE2B af206d3df46326b831f07cd67543586123cbc0f4dcf1bef9b950428bd88ec0a12d5d0bb4fe757ab4492329fc1aef19352568bd9f7cad9c7b63ef727bab4482b3 SHA512 fbe519b1c981cbcb07499ae0a58dc76608f35bac615d5090c21189efa9013c114f98203e0d87e23db253c74a614f8c7f86a9afe180fd4404a44313f7d0eadc71
+MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
deleted file mode 100644
index 1c1234a1a9e4..000000000000
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,49 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
-
-python_prepare_all() {
-	rm requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		emake -C doc/source html
-	fi
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
deleted file mode 100644
index 2061bcb8cf13..000000000000
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
-
-python_compile_all() {
-	use doc && emake -C doc/source html
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests --verbose || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc -r doc/source/.build/html
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index b5a9be30a5b1..a6b1a97de7d1 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
index 385ef5e60b67..911e10569d11 100644
--- a/dev-python/lockfile/metadata.xml
+++ b/dev-python/lockfile/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">lockfile</remote-id>
 		<remote-id type="launchpad">pylockfile</remote-id>