[gentoo-commits] repo/gentoo:master commit in: dev-python/patiencediff/files/, dev-python/patiencediff/
commit: f55815970298e7f11d5645b70438eb1fbd7d039c
Author: Michał Górny gentoo org>
AuthorDate: Mon Nov 14 04:39:54 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Nov 14 04:39:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5581597
dev-python/patiencediff: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/patiencediff/Manifest | 2 -
.../files/patiencediff-0.2.3-wint-conversion.patch | 84 --
.../patiencediff/patiencediff-0.2.3-r1.ebuild | 31
dev-python/patiencediff/patiencediff-0.2.3.ebuild | 27 ---
dev-python/patiencediff/patiencediff-0.2.6.ebuild | 27 ---
5 files changed, 171 deletions(-)
diff --git a/dev-python/patiencediff/Manifest b/dev-python/patiencediff/Manifest
index 45ae30bc26b4..caedd1dd9dea 100644
--- a/dev-python/patiencediff/Manifest
+++ b/dev-python/patiencediff/Manifest
@@ -1,3 +1 @@
-DIST patiencediff-0.2.3.tar.gz 28903 BLAKE2B
83a5dffc11e02b759e8fda540453055d3f2fa03db098c2b323c965b39b121e5bc7e9b3fb0a7f5f1eff76aba81223350def2823469d2a3ceedb54824ae22a32c0
SHA512
4211aa824a8f0e4e5c9fa788ab532bc163684381fc143a089250b16ae70229efabdd1b2e4e50fdd8d36f3363526b80cf687030c435bd9b87e12624fc1fc6b786
-DIST patiencediff-0.2.6.tar.gz 29124 BLAKE2B
f43e7fbbdef316f9ededb680f9c3c20eaab7e988489ba6dfc6038deb91cced5727b9461dbfd30f11b81a12aa238e27df1697abe84d323461da3029daf9fbfce1
SHA512
033c4da38a12cfcd180535635dc84ce6da14fe4f8ae9fc7665fc0b711759fe5a5440d73ed2c7f8f4edf967c9dea9046163b5b48d32ee59d0f4cc01256c7c9055
DIST patiencediff-0.2.7.tar.gz 26831 BLAKE2B
297af6a465ef3fc060a00df9882f85fbf9f807c6d6e8fbfa1d531ed16a60d86f3081d9c0c9698bf3b6d02ba45fbb1d58fead6430f73c04b4439076d0a05a8864
SHA512
8711d28ddc67cdebab5677c1120b1c7270b7509083b797371abcecd61ba71555a1c79c580a5615fe30e1e3bd088b2f4c28a68aa761a61ce55b93690ceb38d8c3
diff --git
a/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
b/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
deleted file mode 100644
index 3a8fd9fc1293..
--- a/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://github.com/breezy-team/patiencediff/commit/24e26cd2929e01dc8ef47fb71b3b87536ad43947
-
-From 24e26cd2929e01dc8ef47fb71b3b87536ad43947 Mon Sep 17 00:00:00 2001
-From: Sam James
-Date: Mon, 26 Sep 2022 21:49:47 +0100
-Subject: [PATCH] Use designated initialiser syntax for PyTypeObject
-
-Fixes build with Clang. Switch to the more readable designated
-initialiser syntax to avoid having to lookup member order.
-
-Before, Clang would complain:
-```
-clang -Wno-unused-result -Wsign-compare -Wunreachable-code -DNDEBUG -O2 -pipe
-fdiagnostics-color=always -frecord-gcc-switches -fPIC
-I/usr/include/python3.10 -c patiencediff/_patiencediff_c.c -o
build/temp.linux-x86_64-cpython-310/patiencediff/_patiencediff_c.o
-patiencediff/_patiencediff_c.c:1175:5: error: incompatible pointer to integer
conversion initializing 'Py_ssize_t' (aka 'long') with an expression of type
'void *' [-Wint-conversion]
-NULL, /* tp_print */
-^~~~
-/usr/include/wchar.h:46:14: note: expanded from macro 'NULL'
- ^~
-```
-
-This is because some of PyTypeObject's members are actually
-Py_ssize_t so chucking a NULL in looks like a codesmell to Clang.
-
-See https://docs.python.org/3/c-api/typeobj.html#quick-reference
-and https://docs.python.org/3/c-api/typeobj.html#examples.
-
-Bug: https://bugs.gentoo.org/869995
-Closes: https://github.com/breezy-team/patiencediff/issues/12
-Signed-off-by: Sam James
a/patiencediff/_patiencediff_c.c
-+++ b/patiencediff/_patiencediff_c.c
-@@ -1168,44 +1168,13 @@ static char PatienceSequenceMatcher_doc[] =
-
- static PyTypeObject PatienceSequenceMatcherType = {
- PyVarObject_HEAD_INIT(NULL, 0)
--"PatienceSequenceMatcher", /* tp_name */
--sizeof(PatienceSequenceMatcher), /* tp_basicsize */
--0, /* tp_itemsize */
--(destructor)PatienceSequenceMatcher_dealloc, /* tp_dealloc */
--NULL, /* tp_print */
--NULL, /* tp_getattr */
--NULL, /* tp_setattr */
--NULL, /* tp_compare */
--NULL, /* tp_repr */
--NULL, /* tp_as_number */
--NULL, /* tp_as_sequence */
--NULL, /* tp_as_mapping */
--NULL, /* tp_hash */
--NULL, /* tp_call */
--NULL, /* tp_str */
--NULL, /* tp_getattro */
--NULL, /* tp_setattro */
--NULL, /* tp_as_buffer */
--Py_TPFLAGS_DEFAULT, /* tp_flags */
--PatienceSequenceMatcher_doc, /* tp_doc */
--NULL, /* tp_traverse */
--NULL, /* tp_clear */
--NULL, /* tp_richcompare */
--0, /* tp_weaklistoffset */
--NULL, /* tp_iter */
--NULL, /* tp_iternext */
--PatienceSequenceMatcher_methods, /* tp_methods */
--NULL, /* tp_members */
--NULL, /* tp_getset */
--NULL, /* tp_base */
--NULL, /* tp_dict */
--NULL, /* tp_descr_get */
--NULL, /* tp_descr_set */
--0, /*
[gentoo-commits] repo/gentoo:master commit in: dev-python/patiencediff/files/, dev-python/patiencediff/
commit: dd8f1804d5781a492398d1cfa8a6f901a09c54cf
Author: Sam James gentoo org>
AuthorDate: Mon Sep 26 21:18:48 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 26 21:19:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd8f1804
dev-python/patiencediff: backport clang 15 patch
Closes: https://bugs.gentoo.org/869995
Signed-off-by: Sam James gentoo.org>
.../files/patiencediff-0.2.3-wint-conversion.patch | 84 ++
.../patiencediff/patiencediff-0.2.3-r1.ebuild | 31
2 files changed, 115 insertions(+)
diff --git
a/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
b/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
new file mode 100644
index ..3a8fd9fc1293
--- /dev/null
+++ b/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
@@ -0,0 +1,84 @@
+https://github.com/breezy-team/patiencediff/commit/24e26cd2929e01dc8ef47fb71b3b87536ad43947
+
+From 24e26cd2929e01dc8ef47fb71b3b87536ad43947 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Mon, 26 Sep 2022 21:49:47 +0100
+Subject: [PATCH] Use designated initialiser syntax for PyTypeObject
+
+Fixes build with Clang. Switch to the more readable designated
+initialiser syntax to avoid having to lookup member order.
+
+Before, Clang would complain:
+```
+clang -Wno-unused-result -Wsign-compare -Wunreachable-code -DNDEBUG -O2 -pipe
-fdiagnostics-color=always -frecord-gcc-switches -fPIC
-I/usr/include/python3.10 -c patiencediff/_patiencediff_c.c -o
build/temp.linux-x86_64-cpython-310/patiencediff/_patiencediff_c.o
+patiencediff/_patiencediff_c.c:1175:5: error: incompatible pointer to integer
conversion initializing 'Py_ssize_t' (aka 'long') with an expression of type
'void *' [-Wint-conversion]
+NULL, /* tp_print */
+^~~~
+/usr/include/wchar.h:46:14: note: expanded from macro 'NULL'
+ ^~
+```
+
+This is because some of PyTypeObject's members are actually
+Py_ssize_t so chucking a NULL in looks like a codesmell to Clang.
+
+See https://docs.python.org/3/c-api/typeobj.html#quick-reference
+and https://docs.python.org/3/c-api/typeobj.html#examples.
+
+Bug: https://bugs.gentoo.org/869995
+Closes: https://github.com/breezy-team/patiencediff/issues/12
+Signed-off-by: Sam James
+--- a/patiencediff/_patiencediff_c.c
b/patiencediff/_patiencediff_c.c
+@@ -1168,44 +1168,13 @@ static char PatienceSequenceMatcher_doc[] =
+
+ static PyTypeObject PatienceSequenceMatcherType = {
+ PyVarObject_HEAD_INIT(NULL, 0)
+-"PatienceSequenceMatcher", /* tp_name */
+-sizeof(PatienceSequenceMatcher), /* tp_basicsize */
+-0, /* tp_itemsize */
+-(destructor)PatienceSequenceMatcher_dealloc, /* tp_dealloc */
+-NULL, /* tp_print */
+-NULL, /* tp_getattr */
+-NULL, /* tp_setattr */
+-NULL, /* tp_compare */
+-NULL, /* tp_repr */
+-NULL, /* tp_as_number */
+-NULL, /* tp_as_sequence */
+-NULL, /* tp_as_mapping */
+-NULL, /* tp_hash */
+-NULL, /* tp_call */
+-NULL, /* tp_str */
+-NULL, /* tp_getattro */
+-NULL, /* tp_setattro */
+-NULL, /* tp_as_buffer */
+-Py_TPFLAGS_DEFAULT, /* tp_flags */
+-PatienceSequenceMatcher_doc, /* tp_doc */
+-NULL, /* tp_traverse */
+-NULL, /* tp_clear */
+-NULL, /* tp_richcompare */
+-0, /* tp_weaklistoffset */
+-NULL, /* tp_iter */
+-NULL, /* tp_iternext */
+-PatienceSequenceMatcher_methods, /* tp_methods */
+-NULL, /* tp_members */
+-NULL, /* tp_getset */
+-NULL, /* tp_base */
+-NULL, /* tp_dict */
+-NULL, /* tp_descr_get */
+-NULL, /* tp_descr_set */
+-0, /* tp_dictoffset */
+-NULL, /* tp_init */
+-NULL, /* tp_alloc */
+-PatienceSequenceMatcher_new, /* NULL */
+-NULL, /* tp_free */
++.tp_name = "PatienceSequenceMatcher",
++.tp_basicsize = sizeof(PatienceSequenceMatcher),
++.tp_dealloc = (destructor)PatienceSequenceMatcher_dealloc,
++.tp_flags = Py_TPFLAGS_DEFAULT,
++.tp_doc = PatienceSequenceMatcher_doc,
++.tp_methods = PatienceSequenceMatcher_methods,
++.tp_new = PatienceSequenceMatcher_new,
+ };
+
+
+
diff --git a/dev-python/patiencediff/patiencediff-0.2.3-r1.ebuild
b/dev-python/patiencediff/patiencediff-0.2.3-r1.ebuild
new file mode 100644
index ..71db75366bb9
--- /dev/null
+++ b/dev-python/patiencediff/patiencediff-0.2.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the patiencediff algorithm"
+HOMEPAGE="
+ https://github.com/breezy-team/patiencediff/
+ https://pypi.org/project/patiencediff/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+
