From 7228e7507f59b8f0982c3a68cc5ba8ea35ce1a76 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 2 Mar 2023 19:31:55 +0000
Subject: gentoo auto-resync : 02:03:2023 - 19:31:55

---
 dev-python/configshell-fb/Manifest                 |  2 +-
 .../configshell-fb/configshell-fb-1.1.29-r1.ebuild | 44 ------------------
 .../configshell-fb/configshell-fb-1.1.29-r2.ebuild | 52 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 45 deletions(-)
 delete mode 100644 dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
 create mode 100644 dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild

(limited to 'dev-python/configshell-fb')

diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index d536704b1080..15b45e9b01f2 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -2,6 +2,6 @@ DIST configshell-fb-1.1.29-replace-getargspec-1.patch 1398 BLAKE2B 650efe1dad551
 DIST configshell-fb-1.1.29-replace-getargspec-2.patch 2981 BLAKE2B 88400de96d329c0efd2a9e9cb41f1c53e62c28507439c405874726fccc6093d5fe37e52b6e4b811bf0ccc7616c9a26b83b17e39a257aeab3c4114e1486a32575 SHA512 621b125cde9fcc68f46a3a32fd78190a46f900ec808233a60c4beb22c6109165f0743a341991e6c556dc5a76b7c6a42b703f2a6be91915110f196845a3fa111c
 DIST configshell-fb-1.1.29.gh.tar.gz 33192 BLAKE2B 6c9c2146a597572675611afe259122b0ec9614295c4b9b4056d7a16f35004700b1e6fc29e1bf868d9ba6291b781ca35eab77e8adf23c6d23e09de2fb94626f26 SHA512 1b5f573506317119d2420e415abbb856692caa65a7f407f741300eec302d1b442e29d2691f6a192b202b2a5731a7a179d1b03f6cd27780876194d97e4df5f7d0
 DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
-EBUILD configshell-fb-1.1.29-r1.ebuild 1376 BLAKE2B 278cac26851259efcf11278abe7ecb600a3044acd1f0edf3e72deaf7aba0063fc7a101a76efa1eda41ea7a0bee31b4bc72d39d1871d894e13d56b564ec1895ce SHA512 a4d35df1379d9751921d5cb1ccf15ecdb4c31486f34a2f16f2869aff9895209e9614505c832b9805ec38739ea190c1c388ea76a01387efcff0dce3f9137ae866
+EBUILD configshell-fb-1.1.29-r2.ebuild 1576 BLAKE2B 374faa16da256396c8014616f891b4524ea04bb4a696c3a2c90fe4193cb288aa2c0147706ff5a5a123d9387e56e4ab5f1eb29cd8addba6addd855f6c5f3b7846 SHA512 32861fa005be44f208174348cf0d41fcc6a69674bbff98bf8f33c07662d5e49f894c15a47a615afc3707f75ca007ebb8e5a6cce7165285a2aa9e95dc1a7b2713
 EBUILD configshell-fb-1.1.29.ebuild 573 BLAKE2B c9183cc98b502edf3b278ddadc6cb9d6a7e7336216600c5d8a1147d17dd98b40cb4548a390f5cbba84e7ef131b59d1a69af8bdb77eb4d7a48a935aa7378c3ae2 SHA512 76c285e343031bc6930d23e21612faf912b8b7d87b0f4de1de7d3004000020ae1a7ecf42e8b3e0ab9d83689811437bbe2b2e79c231526cd038283c0730f75f14
 MISC metadata.xml 789 BLAKE2B fc1e6e767a4b869c7cfade0a030133a746acdea98b9991740eb82a74f82eb29d495807682a1d521667162ba39a68c966c78ff1e39338d1273d173915e6401a61 SHA512 76a628ddb64f2ce5e0fa09faef29cb7b643e03cee337b9b3554d3a6ac3873be64b8fc66067c93087938e71473f0e2ae3af0a50f0a3b19195b87d69680ded5cd8
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
deleted file mode 100644
index 633970b1409b..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="
-	https://github.com/open-iscsi/configshell-fb/
-	https://pypi.org/project/configshell-fb/
-"
-SRC_URI="
-	https://github.com/open-iscsi/configshell-fb/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://github.com/open-iscsi/configshell-fb/commit/f3ac914861bd605e3d634aeeb5e706abdbd39259.patch
-		-> ${P}-replace-getargspec-1.patch
-	https://github.com/open-iscsi/configshell-fb/commit/50d5ffe9f213a53588cec88c9919c816b3fa7736.patch
-		-> ${P}-replace-getargspec-2.patch
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# Python3.11 fixes of deprecated getargspec function taken from upstream:
-	# - https://github.com/open-iscsi/configshell-fb/pull/64
-	"${DISTDIR}/${P}-replace-getargspec-1.patch"
-	# - https://github.com/open-iscsi/configshell-fb/pull/65
-	"${DISTDIR}/${P}-replace-getargspec-2.patch"
-)
-
-python_test() {
-	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
-}
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild
new file mode 100644
index 000000000000..c1efcb33a256
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="
+	https://github.com/open-iscsi/configshell-fb/
+	https://pypi.org/project/configshell-fb/
+"
+SRC_URI="
+	https://github.com/open-iscsi/configshell-fb/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/open-iscsi/configshell-fb/commit/f3ac914861bd605e3d634aeeb5e706abdbd39259.patch
+		-> ${P}-replace-getargspec-1.patch
+	https://github.com/open-iscsi/configshell-fb/commit/50d5ffe9f213a53588cec88c9919c816b3fa7736.patch
+		-> ${P}-replace-getargspec-2.patch
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# Python3.11 fixes of deprecated getargspec function taken from upstream:
+	# - https://github.com/open-iscsi/configshell-fb/pull/64
+	"${DISTDIR}/${P}-replace-getargspec-1.patch"
+	# - https://github.com/open-iscsi/configshell-fb/pull/65
+	"${DISTDIR}/${P}-replace-getargspec-2.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# We can relax pyparsing version restriction,
+	# see https://github.com/open-iscsi/configshell-fb/pull/69
+	sed -i '/pyparsing/s:,<3.0::' setup.py || die
+}
+
+python_test() {
+	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
+}
-- 
cgit v1.2.3