gentoo resync : 12.05.2022

3 files changed, 3 insertions, 43 deletions

diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 4b3f949eff0c..a25562e0573b 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,4 +1,3 @@
 DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
-EBUILD zope-i18nmessageid-5.0.1-r1.ebuild 1020 BLAKE2B c7d133813be9c4965df1bf57b6b32d774156c958306c0166cfa3a56b3939464ca58d0477ce0c011a33e433170ce6ae1b643c8fcfcd08bb353487cb6fa92dfaf1 SHA512 a6c295d75b1bc285b03376aa33113a9f8b302630e3183e1f66fd56ea0af4e16c1ad4fa928674a522331b9989597a0c8091b7a110dd4a662041cc9f21e1904684
-EBUILD zope-i18nmessageid-5.0.1.ebuild 980 BLAKE2B c24fa17078cd51b581b6ac12b22acc129f4c7716e6615a9e2640a2364bf34c0cdb2edb8a450f25a0a448a3f4453ee37ecd1a6e93e17873e9ce2512d85bfaa4ae SHA512 52d5c7c002480d13f995e1ff9be2ef8d57b1864fbdf7e5555e902d357d0d1c23deda06054642583c799c686301e965735b6f352c7dfc3ac4a9bed73aa28f9ea5
+EBUILD zope-i18nmessageid-5.0.1-r2.ebuild 1045 BLAKE2B 18b3dc5e98a38dae8a5bd806add2dcd5d4c61f10be83a13dec53d756f4c2e3e4dc6e67cfc2eb2e127a4140fc1f8fdd7a4e4de40468631f6e717731b73a5931fd SHA512 123edb5fd0bd5ed0f35a156458961ff637f42dfa1a36dda487f44f6320b04ecb1023f80d0e1a29b9dd58bd677a2706927b1842ade52a49edca1d542dc97c1d81
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
index 079692d0987e..cbb4c9fa189c 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
@@ -20,10 +20,11 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
deleted file mode 100644
index 6ad139e6808b..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
-HOMEPAGE="https://github.com/zopefoundation/zope.i18nmessageid"
-HOMEPAGE+=" http://docs.zope.org/zope.i18nmessageid/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest "${BUILD_DIR}"/lib
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}