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

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

[Tim Harder]

commit:     a671de2f9e90ef15ee2ae0677a45196ae9d47f1c
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 23:56:12 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 23:57:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a671de2f

dev-python/kconfiglib: fix build with py2

Closes: https://bugs.gentoo.org/690182

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 .../kconfiglib/files/kconfiglib-12.12.1-setup.patch      | 16 ++++++++++++++++
 dev-python/kconfiglib/kconfiglib-12.12.1.ebuild          |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
new file mode 100644
index 00000000000..b5225e90d5d
--- /dev/null
+++ b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
@@ -0,0 +1,16 @@
+Python2's ConfigParser module used by setuptools throws parsing errors when
+encountering tab characters.
+
+--- Kconfiglib-12.12.1/setup.cfg
++++ Kconfiglib-12.12.1/setup.cfg
+@@ -1,6 +1,6 @@
+ [bdist_wheel]
+-	# We support both Python 2 and Python 3
+-	universal = 1
++# We support both Python 2 and Python 3
++universal = 1
+ [metadata]
+-	# Include the license file in wheels
+-	license_file = LICENSE.txt
++# Include the license file in wheels
++license_file = LICENSE.txt

diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
index 34529da5d91..b1a5baccde7 100644
--- a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
+++ b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/k/K}
 
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 

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

[Tim Harder]

commit:     416cacb2f7973f1af6a5bc0894ba9309716eab46
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 06:38:33 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 06:39:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416cacb2

dev-python/kconfiglib: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 dev-python/kconfiglib/Manifest                     |  1 -
 .../files/kconfiglib-12.12.1-setup.patch           | 16 ---------
 dev-python/kconfiglib/kconfiglib-12.12.1.ebuild    | 40 ----------------------
 3 files changed, 57 deletions(-)

diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 1d659882303..068202d00b0 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,2 @@
-DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9 SHA512 49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
 DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B 81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf SHA512 9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
 DIST kconfiglib-13.7.0.tar.gz 182782 BLAKE2B 976a8e4e377933e42dc45c79598a175d302d34f48bfadd764c0cbfa2ddd4e15ae6ba22467c50d41657abbaa1f4495c556fb4c1deb9c96e1119a7bdd6ae8a3378 SHA512 0376b2c4e68b7ce4f105f52a3b4793a23cb844dbd9ab183abbdd79e2f7958e3be372024ce82295902af974f010c73c4ac97a4147bdac8ee9b52900bc15b8bb6f

diff --git a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
deleted file mode 100644
index b5225e90d5d..00000000000
--- a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Python2's ConfigParser module used by setuptools throws parsing errors when
-encountering tab characters.
-
---- Kconfiglib-12.12.1/setup.cfg
-+++ Kconfiglib-12.12.1/setup.cfg
-@@ -1,6 +1,6 @@
- [bdist_wheel]
--	# We support both Python 2 and Python 3
--	universal = 1
-+# We support both Python 2 and Python 3
-+universal = 1
- [metadata]
--	# Include the license file in wheels
--	license_file = LICENSE.txt
-+# Include the license file in wheels
-+license_file = LICENSE.txt

diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
deleted file mode 100644
index f7c488a885c..00000000000
--- a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="A flexible Python Kconfig implementation"
-HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
-SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarballs don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/k/K}
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# hacks to run tests
-	mkdir Kconfiglib || die
-	ln -s ../tests Kconfiglib || die
-	# don't run kernel Kconfig compat tests
-	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
-}
-
-python_test() {
-	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
-}