gentoo resync : 29.06.2021

5 files changed, 68 insertions, 2 deletions

diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index d97664d3ef1f..9878595f075d 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,5 +1,7 @@
+AUX python-dotenv-0.18.0-second-entrypoint.patch 582 BLAKE2B 48921b086c2d4dcf86aafa743d78767a1dce50b447f429232614e9e61cb222d0190f0b1e65bf98044b286746f6ad3c3706a987fdbbb51bdfef6a9baa721bafb0 SHA512 bc7c5e35823730ff520b1862af1807dd4f0f21152bd9ae5df7d79020894df0ecf9bf785ff157b99ff668e1e23c227f8a461e13be0fb842ce06d2b1ebc1752e0b
 DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038e91a046a1248dd27af011dc60361f06f5324504d623a6109d783bb3b5ccac7cae758d918b17f5b0c65a1085bda627ea SHA512 42cdca1356ac2ad80884a5bf3ed419d1202d6a54746f7a21dc9c1bc7579383ac5c72e8b708bc33dfea3904228125fe7b3b2190bfe53e8b4767f5223d59050417
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
-EBUILD python-dotenv-0.17.1.ebuild 658 BLAKE2B 351ba0bda692ac281e924ed3a5c66e302b78a611b7a381c6dd7fc09d955ce5c386a8fa56bc4394430f69bf852abe47d7a8508067434246e9fb07311547400686 SHA512 261bb061544b4de0a3374e86ac272176f010d960ebf8661b990b3104173527fb0ec0fc69439abba10380c6bc2e4138e0ccdf98027e588bb1d076668a60a9344c
-EBUILD python-dotenv-0.18.0.ebuild 626 BLAKE2B ffa78d2f5bb37c74df4cf620fe47fe8ca7658cc748e50de88d23820aadaf63055946f5bd26e88dbc11145e738f8a22a66fbd9313c70c6a7d8039a5cec7c0d4eb SHA512 8d5d3c31b77a3f457e4526ab176d4fc84b78387c000513623d3a6622ecc4884addb986c79f6ead9767d836045c9f17c287f7a898f2c985f9197e34e88d68eddd
+EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
+EBUILD python-dotenv-0.18.0-r1.ebuild 838 BLAKE2B d543c9d99fae04ee1e45371c1d4c111f8a149814680321c262e7062825c5f39e0fa8e8391b56d056db070bb9e9fb2a5298674fcbe7241c907d9c6792a9e00394 SHA512 dc4cbc2c3ed28a1ffb438f0ebef946afda630d0ea070cd76c2a024130550f03d5677f40536e0875f28479e5f50b7fc46497ac8c91416edb953bf6761001962bc
+EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
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 000000000000..9d69c8b6b008
--- /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 037518dc4898..eabf304977ad 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-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..aa3667814def
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+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 ~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=(
+	"${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 3fd9aa665e52..e412eed05fb6 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 )