gentoo resync : 29.12.2022

4 files changed, 3 insertions, 71 deletions

diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 361fb2be4d6f..6af8e78f2b95 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,6 +1,3 @@
-AUX python-dotenv-0.19.2-entry-points.patch 531 BLAKE2B fdb966643534cc91b89bfc6776d7fb805c3caf803ccd6cbfc507e385aa42baadca0472bc827b77e6f3a85b28d030ef862f14033f48444e54aea7a3d285a4bc4d SHA512 5eca6b19360ef71c2af6a636fa6148fa087d570810622e95a6132d6946643449c15b7c09a100e544415c6e963aa7d94cb23b101a10edd0c6c01be7ea7fa9477f
-DIST python-dotenv-0.19.2.tar.gz 31508 BLAKE2B f92285090b680d3cbf842f99b6ca49ab9af877a1ed6543cbc3a41ba592240739fdf94f2ea21f2e2e3c9b9e68eeb36c5b1c12004fa953674e3f47942176e125c6 SHA512 da411fa02326ec7407bbb6760dd4e5f22eaca60d725ade3ac89302ec4e33d00fe8c231e8a64d0bc22698a93701143085c098b6703e598c6d8c2e4c57b9bafa20
 DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B 360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa SHA512 85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
-EBUILD python-dotenv-0.19.2-r2.ebuild 1055 BLAKE2B 732e045c61d042e9e95fb4ab9d4623f6de566cb2fb5aaf2a1bf089cc0fef3156412101be4076f89a0434d0c52bd9f71a06965d81fcbf4884d0eeab4a181fbb37 SHA512 44e11bd7c2ad62bf1679a31aa4ec9f70d799120b2e0b7da2a06056b9516e90f6c9be16dfdfa9ff261768cf80f68d36bb1f77a72acff134b8e53d9b50f987851f
-EBUILD python-dotenv-0.20.0.ebuild 1178 BLAKE2B 83bb711ffd80b5dcbeaf60a49a434cba0e2ad465a53ed1c1a01af173fb359b5ae58e7379398d5238a149007832c5f5278d1e904561ed92d5f157cbe8a5a48bf3 SHA512 97bbe582be018ba43f5fa14161806bd22ca781c43e367898fdfb5567f26f6cb4653be690b7b9993bf18d9277544aff46b7ccf69ec4f5f3516aec2e7333f3cc5e
+EBUILD python-dotenv-0.20.0.ebuild 1170 BLAKE2B 07fedc0168e098bd1774198ac25fae18098b48d5a12c0c892b4e7b8e4beff46bd191fbe12f827d7aadfa6623f4f274d7455dec03573aa17436a844a5fa191e8e SHA512 12453425e8de895966e57c610139b4fb4fd7c7ccd327da82f165f98822be3ee1cb639366313c48c44760d7625e5a59f21ece9107c009c43b1aa5f13920db94e5
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
deleted file mode 100644
index a01806fbc8c1..000000000000
--- a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a8122d3..c7bfe82 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,12 @@ setup(
-     extras_require={
-         'cli': ['click>=5.0', ],
-     },
--    entry_points='''
--        [console_scripts]
--        dotenv=dotenv.cli:cli
--    ''',
-+    entry_points={
-+        "console_scripts": [
-+            "dotenv=dotenv.cli:cli",
-+            "python-dotenv=dotenv.cli:cli",
-+        ],
-+    },
-     license='BSD-3-Clause',
-     classifiers=[
-         'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
deleted file mode 100644
index 55aabf2a3b57..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
-	test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-PATCHES=(
-	# rename the entry point (note: old name is needed in tests)
-	# https://bugs.gentoo.org/798648
-	# also fix syntax since it doesn't seem to work anymore
-	# https://bugs.gentoo.org/833389
-	"${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid collision with dev-ruby/dotenv (bug #798648)
-	rm "${D}"/usr/bin/dotenv || die
-}
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
index 1b7f64a5f892..7a35ef4c30e9 100644
--- a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	test? (