From 70179bc700bc1a3154f85ad8a5bbb829661a4f0d Mon Sep 17 00:00:00 2001
From: Louis Sautier <sbraz@gentoo.org>
Date: Sun, 13 Sep 2020 17:14:10 +0200
Subject: dev-python/clint: remove dependency on bundled package

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Louis Sautier <sbraz@gentoo.org>
---
 dev-python/clint/clint-0.5.1-r1.ebuild             | 43 ---------------------
 dev-python/clint/clint-0.5.1-r2.ebuild             | 45 ++++++++++++++++++++++
 .../clint-0.5.1-disable-args-dependency.patch      | 19 +++++++++
 3 files changed, 64 insertions(+), 43 deletions(-)
 delete mode 100644 dev-python/clint/clint-0.5.1-r1.ebuild
 create mode 100644 dev-python/clint/clint-0.5.1-r2.ebuild
 create mode 100644 dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch

(limited to 'dev-python/clint')

diff --git a/dev-python/clint/clint-0.5.1-r1.ebuild b/dev-python/clint/clint-0.5.1-r1.ebuild
deleted file mode 100644
index 89e08c909a9e..000000000000
--- a/dev-python/clint/clint-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Command-line Application Tools"
-HOMEPAGE="https://github.com/kennethreitz/clint"
-SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="dev-python/args[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/clint/clint-0.5.1-r2.ebuild b/dev-python/clint/clint-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..f62be93bf388
--- /dev/null
+++ b/dev-python/clint/clint-0.5.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Command-line Application Tools"
+HOMEPAGE="https://github.com/kennethreitz/clint"
+SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+# https://github.com/kennethreitz-archive/clint/pull/180
+PATCHES=( "${FILESDIR}/${P}-disable-args-dependency.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch b/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch
new file mode 100644
index 000000000000..8b648dbc735d
--- /dev/null
+++ b/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch
@@ -0,0 +1,19 @@
+commit e12338aa8f317c6f7e99fc2f4c2dc9424299b4ab
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sun Sep 13 16:54:20 2020 +0200
+
+    Do not require bundled args module
+
+diff --git a/setup.py b/setup.py
+index 0221184..e9e3fa5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ if sys.argv[-1] == "publish":
+     publish()
+     sys.exit()
+ 
+-required = ['args']
++required = ['']
+ 
+ setup(
+     name='clint',
-- 
cgit v1.2.3-65-gdbad