From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-python/python-dotenv/Manifest | 4 +- .../python-dotenv-0.18.0-second-entrypoint.patch | 24 ------------ .../files/python-dotenv-0.19.2-entry-points.patch | 21 +++++++++++ .../python-dotenv/python-dotenv-0.19.2-r2.ebuild | 44 ++++++++++++++++++++++ .../python-dotenv/python-dotenv-0.19.2.ebuild | 38 ------------------- 5 files changed, 67 insertions(+), 64 deletions(-) delete mode 100644 dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch create mode 100644 dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch create mode 100644 dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild delete mode 100644 dev-python/python-dotenv/python-dotenv-0.19.2.ebuild (limited to 'dev-python/python-dotenv') diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest index 14e195f05797..f2faec4416d4 100644 --- a/dev-python/python-dotenv/Manifest +++ b/dev-python/python-dotenv/Manifest @@ -1,4 +1,4 @@ -AUX python-dotenv-0.18.0-second-entrypoint.patch 582 BLAKE2B 48921b086c2d4dcf86aafa743d78767a1dce50b447f429232614e9e61cb222d0190f0b1e65bf98044b286746f6ad3c3706a987fdbbb51bdfef6a9baa721bafb0 SHA512 bc7c5e35823730ff520b1862af1807dd4f0f21152bd9ae5df7d79020894df0ecf9bf785ff157b99ff668e1e23c227f8a461e13be0fb842ce06d2b1ebc1752e0b +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 -EBUILD python-dotenv-0.19.2.ebuild 856 BLAKE2B 970d5609f01d83b886df7f6ce48eae8d03ad97f1dfb09a71bf971d63204d82f8646080ee576e9bc41287398a105eb65c58a709ceb9366cd3842c7b08ec5b53d3 SHA512 41464a315d00526424c0528dcc9be5d836e5b35a2abb4efac7873911fe1b9bd11f263e345c580bb1f628f2dc0bfe7ffa271e85e191d14c044cd64bf6213c97e3 +EBUILD python-dotenv-0.19.2-r2.ebuild 1055 BLAKE2B 732e045c61d042e9e95fb4ab9d4623f6de566cb2fb5aaf2a1bf089cc0fef3156412101be4076f89a0434d0c52bd9f71a06965d81fcbf4884d0eeab4a181fbb37 SHA512 44e11bd7c2ad62bf1679a31aa4ec9f70d799120b2e0b7da2a06056b9516e90f6c9be16dfdfa9ff261768cf80f68d36bb1f77a72acff134b8e53d9b50f987851f MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a 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 deleted file mode 100644 index 9d69c8b6b008..000000000000 --- a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -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/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 000000000000..a01806fbc8c1 --- /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-r2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild new file mode 100644 index 000000000000..55aabf2a3b57 --- /dev/null +++ b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild @@ -0,0 +1,44 @@ +# 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.19.2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild deleted file mode 100644 index 662c99d941fc..000000000000 --- a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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=( - "${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 -} -- cgit v1.2.3