From ff1653aa82e8fb777a7f971b519c75b0cb074ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Tue, 15 Feb 2022 10:37:11 +0100
Subject: [PATCH] dev-python/python-dotenv: Fix installing entry points
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/833389
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../python-dotenv-0.19.2-entry-points.patch   | 21 +++++++++++++++++++
 ....ebuild => python-dotenv-0.19.2-r1.ebuild} |  8 +++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
 rename dev-python/python-dotenv/{python-dotenv-0.19.2.ebuild => python-dotenv-0.19.2-r1.ebuild} (72%)

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
new file mode 100644
index 0000000000000..a01806fbc8c13
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
@@ -0,0 +1,21 @@
+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.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
similarity index 72%
rename from dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
rename to dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
index 662c99d941fc8..066098d96dfe0 100644
--- a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,11 @@ DEPEND="
 DOCS=( CHANGELOG.md README.md )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+	# 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 --install pytest