gentoo resync : 20.03.2022

3 files changed, 3 insertions, 41 deletions

diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 0df985472bb6..8a9b279b076e 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,3 @@
 DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a
-EBUILD packaging-21.3-r1.ebuild 957 BLAKE2B 29bdbd7c6176bd4bec2386adf998ac234daef32ae53f28cd19824ecaae5929ddd0336e21452c0e4644d4d4cb055ad2ce665280b9def9bd49c252003c594c7a11 SHA512 255744e7d524098c189ea8317da619cd6f3bb7a903cb96a3271f7aebf9b19cebaae7013f0dc0453a7849ab8e61e9817fe9ea6dae4af6d7970d32b489f9621f81
-EBUILD packaging-21.3-r2.ebuild 1284 BLAKE2B 1c1c8a65e5cb4b025ab101f063be2bef42f0e927b5acd3bc89fc197352656b88364b096fb21d23d840638b387332ad0f2b92480a1f57bee30b60d0e579155e0c SHA512 7f3d26f0f07c39e7bd4b874667bb3b36d83ed63af6941eb4319d350506dd7bd36ceae437908f322f51e651c1287cff2998b7c2ad476968a1a3af31494023cad5
+EBUILD packaging-21.3-r2.ebuild 1279 BLAKE2B a3535d9aeff611850ecedd58041e1380b95f112a132f943984ba47430414c24717b374bad793be33a3aa344dad0758cb43b4e42049599f54274507cffd859488 SHA512 26df04d1554f16c4ab6b839c4bf20f5b7261504779a20a1a84fb4c2093884c5767a1863e2c7b227224cc319b8397fc580b99059d7c94af897d9b9b47c605978c
 MISC metadata.xml 391 BLAKE2B 0d73ed3809b26e3069048116ab247ceeb9e2932e0d8d6063b97cc1f0ed8359e73a54b22035fedb169524e502b6a07b8203e6c35d801f738bbed685d90e12bf96 SHA512 eb4d1ca476a45232547fdd961a4e6715dda24c7ab82e1f1995ac977b9825793d5d10a2ac408b1ee0b7c8b8444f2c42be33d6fb1012461f96db9a71477cca67ae
diff --git a/dev-python/packaging/packaging-21.3-r1.ebuild b/dev-python/packaging/packaging-21.3-r1.ebuild
deleted file mode 100644
index c90d7a08688c..000000000000
--- a/dev-python/packaging/packaging-21.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| (
-		>=dev-python/pyparsing-3.0.6[${PYTHON_USEDEP}]
-		<dev-python/pyparsing-3.0.5[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --capture=no
-}
diff --git a/dev-python/packaging/packaging-21.3-r2.ebuild b/dev-python/packaging/packaging-21.3-r2.ebuild
index dff1fc84c5b7..7ccaeebe96a1 100644
--- a/dev-python/packaging/packaging-21.3-r2.ebuild
+++ b/dev-python/packaging/packaging-21.3-r2.ebuild
@@ -17,10 +17,10 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	>=dev-python/pyparsing-3.0.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (