[gentoo-commits] repo/gentoo:master commit in: dev-python/python-dotenv/, dev-python/python-dotenv/files/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     d4beda25f7a27938194241dfaaef1ffafb12c8ce
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 23:47:25 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 23:57:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4beda25

dev-python/python-dotenv: Address collision with dev-ruby/dotenv

I'm using a second entrypoint here rather than a plain rename
to not break (1) the tests and (2) access to argv[0] by python-exec.
Closes: https://bugs.gentoo.org/798648
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 .../python-dotenv-0.18.0-second-entrypoint.patch   | 24 ++++++++++++++++++++++
 .../python-dotenv/python-dotenv-0.17.1.ebuild      |  1 +
 ....18.0.ebuild => python-dotenv-0.18.0-r1.ebuild} | 11 ++++++++++
 .../python-dotenv/python-dotenv-0.18.0.ebuild      |  1 +
 4 files changed, 37 insertions(+)

diff --git a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
new file mode 100644
index 00000000000..9d69c8b6b00
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
@@ -0,0 +1,24 @@
+From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 26 Jun 2021 01:38:14 +0200
+Subject: [PATCH] setup.py: Add second entrypoint "python-dotenv"
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index fd5785a..bb31c40 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,7 @@ setup(
+     entry_points='''
+         [console_scripts]
+         dotenv=dotenv.cli:cli
++        python-dotenv=dotenv.cli:cli
+     ''',
+     license='BSD-3-Clause',
+     classifiers=[
+-- 
+2.31.1
+

diff --git a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
index 037518dc489..eabf304977a 100644
--- a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )
 

diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
similarity index 74%
copy from dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
copy to dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 3fd9aa665e5..aa3667814de 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -24,4 +24,15 @@ DEPEND="
 
 DOCS=( CHANGELOG.md README.md )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+)
+
 distutils_enable_tests --install 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.18.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
index 3fd9aa665e5..e412eed05fb 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )