| 1 |
commit: 390008fd0c2ec917d4bef37c791418af2f7e695d |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 20 20:38:31 2015 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 20 20:38:43 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390008fd |
| 7 |
|
| 8 |
app-portage/gentoolkit: Fix TypeError in setup.py with python3 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/568906 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.26_p32 |
| 13 |
|
| 14 |
.../gentoolkit/files/0.3.1-setup.py-print.patch | 29 ++++++++++++++++++++++ |
| 15 |
.../gentoolkit/gentoolkit-0.3.0.9-r2.ebuild | 3 ++- |
| 16 |
app-portage/gentoolkit/gentoolkit-0.3.1.ebuild | 3 ++- |
| 17 |
3 files changed, 33 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..29f7a18 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch |
| 24 |
@@ -0,0 +1,29 @@ |
| 25 |
+From 4e06e9f032ed187ce682434955778c3241854e26 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Mike Gilbert <floppym@g.o> |
| 27 |
+Date: Sun, 20 Dec 2015 15:19:06 -0500 |
| 28 |
+Subject: [PATCH] Remove useless print() in set_version |
| 29 |
+ |
| 30 |
+This was causing a TypeError in python3. |
| 31 |
+ |
| 32 |
+Bug: https://bugs.gentoo.org/568906 |
| 33 |
+--- |
| 34 |
+ setup.py | 3 --- |
| 35 |
+ 1 file changed, 3 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/setup.py b/setup.py |
| 38 |
+index b32b7d6..01e4b3e 100755 |
| 39 |
+--- a/setup.py |
| 40 |
++++ b/setup.py |
| 41 |
+@@ -80,9 +80,6 @@ class set_version(core.Command): |
| 42 |
+ with io.open(f[0], 'r', 1, 'utf_8') as s: |
| 43 |
+ for line in s: |
| 44 |
+ newline = re.sub(pattern %f[1], '"%s"' % ver, line, 1) |
| 45 |
+- if newline != line: |
| 46 |
+- #log.info("%s: %s" % (f, newline)) |
| 47 |
+- print("%s: %s" % (f[0], newline.encode('utf_8').strip('\n'))) |
| 48 |
+ updated_file.append(newline) |
| 49 |
+ with io.open(f[0], 'w', 1, 'utf_8') as s: |
| 50 |
+ s.writelines(updated_file) |
| 51 |
+-- |
| 52 |
+2.6.4 |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild |
| 56 |
index 182dc47..f1d0497 100644 |
| 57 |
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild |
| 58 |
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild |
| 59 |
@@ -7,7 +7,7 @@ EAPI="5" |
| 60 |
PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy) |
| 61 |
PYTHON_REQ_USE="xml(+),threads(+)" |
| 62 |
|
| 63 |
-inherit distutils-r1 |
| 64 |
+inherit distutils-r1 eutils |
| 65 |
|
| 66 |
DESCRIPTION="Collection of administration scripts for Gentoo" |
| 67 |
HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml" |
| 68 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 69 |
) |
| 70 |
|
| 71 |
python_prepare_all() { |
| 72 |
+ epatch "${FILESDIR}/0.3.1-setup.py-print.patch" |
| 73 |
python_setup |
| 74 |
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 75 |
VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 76 |
|
| 77 |
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild |
| 78 |
index 4311b00..7621d42 100644 |
| 79 |
--- a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild |
| 80 |
+++ b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild |
| 81 |
@@ -7,7 +7,7 @@ EAPI="5" |
| 82 |
PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5} pypy) |
| 83 |
PYTHON_REQ_USE="xml(+),threads(+)" |
| 84 |
|
| 85 |
-inherit distutils-r1 |
| 86 |
+inherit distutils-r1 eutils |
| 87 |
|
| 88 |
DESCRIPTION="Collection of administration scripts for Gentoo" |
| 89 |
HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml" |
| 90 |
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND} |
| 91 |
sys-apps/grep" |
| 92 |
|
| 93 |
python_prepare_all() { |
| 94 |
+ epatch "${FILESDIR}/0.3.1-setup.py-print.patch" |
| 95 |
python_setup |
| 96 |
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 97 |
VERSION="${PVR}" "${PYTHON}" setup.py set_version |
Archives