gentoo resync : 12.05.2022

3 files changed, 7 insertions, 38 deletions

diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 83271c3abd4b..6951e01b6d76 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,4 +1,3 @@
 DIST zope.event-4.5.0.tar.gz 18723 BLAKE2B 449ae969709c863681df1a08f016c850242ebe86b9abfa57db62a982c81bba7c496fc19dd2b187284da44d975688b544ee52a5a48a2fb782d4c7210d5773ee2b SHA512 1d82ae316fc75eebc03aadeb78890a19add35490720cd7bd073faeb9dc9ed97511ca4fdafc2228530798384d667c0aa88e3ef47b0be668128556a78bf82c42e5
-EBUILD zope-event-4.5.0-r1.ebuild 973 BLAKE2B 88bab022e749d06b28caea4cce297c864fc69b4cf88b480a5c3740894d798099ffb37ff16dd3b701bb8b518a84207659baf1f59f88e35bdde06eb8350b01f07e SHA512 be965138d816fbc1d8f2833a418441c5f269d1d93f6d30ec17f626674a6e0c377c7234636ec29c622b700c6ddbbe09b3ea5a3738faba5dd84c97a2abdd8140a5
-EBUILD zope-event-4.5.0-r2.ebuild 1109 BLAKE2B f43d14709e495bf7f9b70d5d0be10d49d233118145b218d0849567a837641da0a85b16f15357325b2d4f8052fb7d825d6554e61080371b5cbe487f38768b4536 SHA512 e1eba737132039a43e6ac0b2f03dfea7c482f51533eeef3c5618b2372df75f845843a62e60e1f90425d3f7d201ba4110e76d5d2a8b3287d732e3a2bfe8865e63
+EBUILD zope-event-4.5.0-r3.ebuild 1149 BLAKE2B 1faef472578bf8c6c16a0689489cbe42741d11b93759789af7e94232df716f3afdd9d908c47c8628d585beb7a6259e0cb986395c1b28ddcb626420caa4514f5e SHA512 8823c50899b87dd290cb1978b24b923f90bd3a37723df042203a7b448d8a903c79966ca095abd58155a92b6af8d915f25eb2655ea2eaf481f6848c3fc0205a86
 MISC metadata.xml 403 BLAKE2B 37821470ec3195c00fca52ec6b7bd13a0bf433746a450b36e6b572da978db6faf908da2b8dd83d2411f24da8a58d65f8cb2e7e75960cf547ba2e9e394e5fcb90 SHA512 8d21846b80d0c0f153103ec237184cd05db306286ffc1a6ed495b90a52737a2346777c4b0713339244f177e89e18f6a051a507a8a7eda2c514c1b7896d7aedb0
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
deleted file mode 100644
index 5367385c055b..000000000000
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +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="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event
-	https://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
diff --git a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild b/dev-python/zope-event/zope-event-4.5.0-r3.ebuild
index c9556f35b783..6914ccfe31c2 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -20,7 +20,11 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!dev-python/namespace-zope
+"
 
 distutils_enable_tests unittest