gentoo resync : 10.09.2021

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index be563bb328d0..22aa89e3fc4b 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,3 @@
-DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
 DIST reno-3.4.0.tar.gz 82815 BLAKE2B aab374c48c1dcf25ba7a78d46069c5d659762bf01d25dc05f597f02098ee10e7b8c518a0afad186ecd93602782a7c50294183b7e33075f8bfe57cc0bc3c1d016 SHA512 cbfd5d9b41beb1599438e249b8082175c8bd2b8dca62d8e6fd1ef742bf889adf6490e1ed0fa78d8aca663a0fb6bbe70742815a6512c6d51fb8073745b6860d65
-EBUILD reno-3.3.0.ebuild 1100 BLAKE2B 3590b4a407686db5705f36a966be9a2f4a072c10fc9e6e848c98fc9a6c3409530a9d582eaf6a48bbc49361d04e1db538033363183bb1d9964546375166f4b92f SHA512 6c1bb0c90a6167c207b82d2ce02a513c41acf5cc9e4ff2c6ce8d76abe5166e3be79c458fc391189c117c7716a49bdb6579943c85874cf57db8331bbb7f2d3d75
-EBUILD reno-3.4.0.ebuild 1061 BLAKE2B 0e75de4f03ea4d804d94d75ec19ea8da6d47afcdebc15872627e9e4059f0313625645a85364a3517095a817fab8156e2c3f8df630aa60261f280faeac68d81d0 SHA512 98b222aa591121844aca6fc654c532c47c44e4c069c53384271c019e958f51ed5e0e6213a98c2d506501b7d5eae438f011745cebd204495152128dca995667a4
+EBUILD reno-3.4.0.ebuild 1058 BLAKE2B 58eec7eb769e8eca274567e55664b88e032ba7eddfb8c59497b1545ffedb9ac452b8a2f9ba0441d1e6bba04d549731c8efeb83b7a48738e3082afde750ceddc5 SHA512 157584e6963a90652a701e9c146bc0286e64d32c065e738888f2b353318de328ff828335cd59008470e650a522e82c9425970475a8e408a160b27a807b46fdb0
 MISC metadata.xml 345 BLAKE2B 64bb3d1c4711fd517770e90167d9edcab33908e0f9ba511b8ae1c0e1ad6181bd4c4d2639d6cf802aeeef8cc77e623d749a3522e73e53514ecf39b30b77f8072b SHA512 127fc0515eae674566848c406e6695ca20d7db100d1378713d8900f25b2ec957eb89eb7f075aafc3efb48b3db7b290e88480248c78bf94456f680c528c7e6269
diff --git a/dev-python/reno/reno-3.3.0.ebuild b/dev-python/reno/reno-3.3.0.ebuild
deleted file mode 100644
index 009b910e87e1..000000000000
--- a/dev-python/reno/reno-3.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-# The doc needs to be built from a git repository
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Some tests need to be run from a git repository
-	rm reno/tests/test_{cache,semver}.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/reno/reno-3.4.0.ebuild b/dev-python/reno/reno-3.4.0.ebuild
index 755626baf35b..83a2eee78be7 100644
--- a/dev-python/reno/reno-3.4.0.ebuild
+++ b/dev-python/reno/reno-3.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]