gentoo resync : 29.12.2022

3 files changed, 16 insertions, 56 deletions

diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index af9bca3c6407..83308af279d8 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,3 @@
-AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 758 BLAKE2B 15c4dd76fbfba10beda19505d251ab15fc1bea8915162c056a68a958357d2e3dfbc18c73c947f44b5789a70d532c12f537a9978dbedf6cf5e5546ea6a7c18140 SHA512 1bcc5c6b3d04e1a9fbc66e8e0ad2ca40758240798ed98f3e31c18e6892563f5b0fd7752bfd0301889658557a9c0e79d03bd8417ccfebceb07b2a58b895c57ed2
+EBUILD munch-2.5.0-r2.ebuild 711 BLAKE2B 990f6b1beee089fcebe9bc38e679bc51ec3bfde962816b674d6690229da9b5d8dbe30678ad30b352465da9660444eaebf9b82e8f2e62d986d96a601acd899d38 SHA512 ba7695251df9d134d1ea340ed7fc332674bfc0cb34f58073ae3d15434a4f80f0933971791a4a69eeee0f1379c0082430682e20b763f89d9354301805f1d2cc54
 MISC metadata.xml 401 BLAKE2B ab900d598b463036c2f6d7cb6a5b1abcc25e5739d3fb953741abae620ee8ac845077870dacf433211c5a4d14972114f8d16b94a86514be5de7667a2ab32b1f45 SHA512 f3334ff207272f39f44dad54f2d173218b2192675e04dd076cc16b461a656e146f3ba5b73e53ef8c115c5c3f32f40664f6191c31aa20fec5bcedb61186fed4bf
diff --git a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch b/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
deleted file mode 100644
index 450020cc2c19..000000000000
--- a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 31f229c..9046e38 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,29 @@
--from setuptools import setup
--
-+from setuptools import setup, find_packages
- 
- setup(
--    setup_requires=['pbr>=3.0', 'setuptools>=17.1'],
--    pbr=True,
--    long_description_content_type='text/markdown; charset=UTF-8',
-+    name="munch",
-+    version=__version__,
-+    description="A dot-accessible dictionary (a la JavaScript objects).",
-+    url="http://github.com/Infinidat/munch",
-+    author="Rotem Yaari",
-+    author_email="vmalloc@gmail.com",
-+    install_requires=[
-+        'six',
-+    ],
-+    packages=find_packages(exclude=["tests"]),
-     keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
-+    classifiers=[
-+        'Development Status :: 5 - Production/Stable',
-+        'Intended Audience :: Developers',
-+        'Operating System :: OS Independent',
-+        'Programming Language :: Python',
-+        "Programming Language :: Python :: 2.7",
-+        "Programming Language :: Python :: 3.5",
-+        "Programming Language :: Python :: 3.6",
-+        'Topic :: Software Development',
-+        'Topic :: Software Development :: Libraries',
-+        'Topic :: Utilities',
-+        'License :: OSI Approved :: MIT License',
-+    ],
-+    license='MIT',
- )
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r2.ebuild
index ef1adba8f2dc..43f92bae1c42 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r2.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="https://github.com/Infinidat/munch"
+HOMEPAGE="
+	https://github.com/Infinidat/munch/
+	https://pypi.org/project/munch/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 
-BDEPEND="
+RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )
 "
-
-PATCHES=(
-	"${FILESDIR}/munch-2.5.0-revert-pbr.patch"
-)
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i "s:__version__:'${PV}':" setup.py || die
-}