gentoo resync : 15.12.2019

4 files changed, 92 insertions, 0 deletions

diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 4a363fd34ecc..bdbf2cae0b04 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,7 +1,11 @@
+AUX munch-2.5.0-pbrectomy.patch 470 BLAKE2B 1f90760c1dfae6e67f6c5c98bca7efa335dc1f1af8568cc596ae36fc61bcbe494aef82627ede7ad4406b990cf24fd26921c3b3189481982ffb634bca2ec43c0b SHA512 243cb4818a65252e70097936b18fbb9497d332c31afecf56ad9f0b69f202567f6ca230e8cc0f5f811c802dc5023b7b9cb81466b0d280178fda55215f929335d8
+AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee8b114cb445219c89b76e40c7aaddd06306f9ba585081b556d7fa32d2e002de8bf5c071b0fe361092cd18b SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0
 DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
+DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
 EBUILD munch-2.1.1.ebuild 473 BLAKE2B 55af2c595124d3a792be541e87a028b31e08605f82b7291e778105ac6acdff7d7f96a8fd123e8d791c3e8c4cc84c2d2388b6f3ebffd81b7e0e0789c299062ec5 SHA512 3868b705e6cbf7d4522225f11176275bd19be5a0d803f909a88ae0a3886dc7e47986ab8a718dfe263a8838355d01b70befeccacd0579ebbc06a8fe70f6b882e9
 EBUILD munch-2.2.0.ebuild 478 BLAKE2B 0ca8fdc985de70b87df668065bbdaa512c6a7759039020ff4e192bbd7e8a77f5585edbe9a93690b660c60aed69a9db1406408b32e03ad24a8920fea1c727fd65 SHA512 8ae5404498fd465fff1bfdef711668cf3412502f0360bc5053c0fc682039e638d34737113d86b772b0f70c690b89ef2ba1a87eaedc47d8b18f4b1c6a33225c68
 EBUILD munch-2.3.2.ebuild 511 BLAKE2B 2dd6b884510184b469b2c3f261861c668b3d2abed653cd90964bce741c41073c87820a5dd29136453c611af3e489fe01fda820ade4c1066a80030d224b96d874 SHA512 e27213d809610f235faa95d51d87be90108bfeda55fd442622dc3e3db25a4ef500b0430641590bd4aa4a8f241f8a10af9784da6bf88acf8b9ca78d2599bb101d
+EBUILD munch-2.5.0.ebuild 691 BLAKE2B 167b3618d1229b4c68dba15a5286ae51f0540abefb92fe3d01c10ea52373196fee60273525c34b3765c144e49905de743e7bdc5debc846c51f2b79645e248381 SHA512 89f145e87a9b5b4f3b30b438b6f79e716d8858f5baf42bf568a70d81526aebda3acf4a82687e25beb62dcb1dca7dc57cda66552c71dfdf1e8af9939215429ce2
 MISC metadata.xml 348 BLAKE2B b02f6b0b5a5acc47ab4d719f9b70dd7e6a8c5d1694d374fe5eeedbede01105160c91226db47d08cbb5e290b9d57e1741b954f8c36a52d69016b8013eedd470ef SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08
diff --git a/dev-python/munch/files/munch-2.5.0-pbrectomy.patch b/dev-python/munch/files/munch-2.5.0-pbrectomy.patch
new file mode 100644
index 000000000000..13121c345b80
--- /dev/null
+++ b/dev-python/munch/files/munch-2.5.0-pbrectomy.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index 31f229c..62e1ad6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,9 +1,7 @@
+-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',
+-    keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
++    find_packages(exclude=['tests']),
++    version="%VERSION%"
+ )
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
new file mode 100644
index 000000000000..450020cc2c19
--- /dev/null
+++ b/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
@@ -0,0 +1,39 @@
+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.ebuild b/dev-python/munch/munch-2.5.0.ebuild
new file mode 100644
index 000000000000..073384c94fef
--- /dev/null
+++ b/dev-python/munch/munch-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
+HOMEPAGE="https://github.com/Infinidat/munch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/munch-2.5.0-revert-pbr.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -i "s:__version__:'${PV}':" setup.py || die
+}