re-add (still needed) regex-2021.8.28 from main repo

This commit is contained in:
Andreas Billmeier 2021-11-09 13:29:53 +01:00 committed by Andreas Billmeier
parent 95e5470906
commit d130c4a519
Signed by: onkelbeh
GPG Key ID: E6DB12C8C550F3C0
9 changed files with 104 additions and 234 deletions

View File

@ -1,10 +1,5 @@
DIST regex-2019.06.02.tar.gz 651428 BLAKE2B 952b4962a05abcad1792b4c29ee666c382a61ed868c6463f1eec9df6b9e6ad5504bfb458a06c6a996529692b4587720204dbc94d30875d02f279953bf4fc3210 SHA512 043ad602bd593e2c1711373185a3e4565c0df2bf0e86d7a42d79a32ac51740f9bbfa6bf36d47fe7e35b83a913a2e22f74afa0b094e0cb0e96e12d5982d583410
DIST regex-2019.06.05.tar.gz 651476 BLAKE2B 0ea178b4b1171f2248b3aa1e62630a8cf309e5aac6748b4c76663cc51ee8e54324e40326c7b66b193528736f166c55597545bad5b416d6cd1c0d0a1751bffdb8 SHA512 fd24c8e60e64ae780d1a34ab2400420e49d569c4b0e0992f1ac44f736b61d33bf22994780fb37f9f3f219bd279acbef2fbfcd0159f3bf173ae02bf2b6e469ccb
DIST regex-2019.06.08.tar.gz 651424 BLAKE2B f46a525af8342e994470872dd0d6790b3a3b5b089c3098585e8124b8338213b9bb7b533ae8562e06d987df303d66b7b698cd2f636b748dfb46d25cc86e42e645 SHA512 b5ef47cbf9b0cd8b38c9b3055f44b976a44d1da4e182964c16d614a3838de8db5e8c7ff69638b496464cbedb12852b61bbdffd86cf6f22f60d1109be532d8291
DIST regex-2019.08.19.tar.gz 654616 BLAKE2B fb8c49856236e119fd125b18d0e82cdca418b6c911780a7301af09fc023e9b2e92b13ece62956b5de38b90d10b17a885ceb75e836e5e416b40d4c7e5092a202f SHA512 810a053298318fb8a134e3395efeaf8249fed4839d6a9ccacd7872884b78047d802495fbb8d49ea4ebc0b1f92a5cfecaf68a2f07855dac013b46edca5d9a831b
EBUILD regex-2019.06.02.ebuild 1137 BLAKE2B b192c19cf2537f4016079658731c40235075952bf55365d865a31c99cf1ff8c61d85eddaea6b0524cab271194a01c360a2437611741868cef3290213731f9229 SHA512 a97d5d569cfc2bb04b535e80fe2f79be041e9c8e528518751bae5592034ac37ff70085458f112abbb7e324dbf5e13d6dc0c70bfa4f99886d56f02f31a6770653
EBUILD regex-2019.06.05.ebuild 1137 BLAKE2B b192c19cf2537f4016079658731c40235075952bf55365d865a31c99cf1ff8c61d85eddaea6b0524cab271194a01c360a2437611741868cef3290213731f9229 SHA512 a97d5d569cfc2bb04b535e80fe2f79be041e9c8e528518751bae5592034ac37ff70085458f112abbb7e324dbf5e13d6dc0c70bfa4f99886d56f02f31a6770653
EBUILD regex-2019.06.08.ebuild 1137 BLAKE2B b192c19cf2537f4016079658731c40235075952bf55365d865a31c99cf1ff8c61d85eddaea6b0524cab271194a01c360a2437611741868cef3290213731f9229 SHA512 a97d5d569cfc2bb04b535e80fe2f79be041e9c8e528518751bae5592034ac37ff70085458f112abbb7e324dbf5e13d6dc0c70bfa4f99886d56f02f31a6770653
EBUILD regex-2019.08.19-r1.ebuild 1120 BLAKE2B ba1b37e284f6a611a60c329627485bbe01b5afabec5e7d89c72e53ad48705b91efc990065fb18f3572d678e482e6ebd475450927180264d7c5ab39add7fd060b SHA512 5f7178268561e0894825442cd42dbb5eeb03ea5449322609280be2c23b251f467851b42081d3ca79718d6a64ac135ca29eaa34b6351d103c7adce8cce9129a90
EBUILD regex-2019.08.19.ebuild 1137 BLAKE2B b192c19cf2537f4016079658731c40235075952bf55365d865a31c99cf1ff8c61d85eddaea6b0524cab271194a01c360a2437611741868cef3290213731f9229 SHA512 a97d5d569cfc2bb04b535e80fe2f79be041e9c8e528518751bae5592034ac37ff70085458f112abbb7e324dbf5e13d6dc0c70bfa4f99886d56f02f31a6770653
AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
EBUILD regex-2021.8.28.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07

View File

@ -0,0 +1,35 @@
From: Arthur Zamarin <arthurzam@gmail.com>
Date: Fri, 30 Jul 2021 11:13:41 +0300
[PATCH] PyPy3: fix test_empty_array
As an optimization, PyPy sets empty array.array to use a NULL buffer
pointer, while CPython uses empty buffer (but not NULL).
Add a very specially crafted fix for PyPy3
Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
---
regex_3/_regex.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/regex_3/_regex.c
+++ b/regex_3/_regex.c
@@ -18062,9 +18062,19 @@ Py_LOCAL_INLINE(BOOL) get_string(PyObject* string, RE_StringInfo* str_info) {
}
if (!str_info->view.buf) {
+#if defined(PYPY_VERSION)
+ /* In PyPy3, when the array.array is empty, it's buffer is NULL */
+ str_info->characters = NULL;
+ str_info->length = 0;
+ str_info->charsize = 1;
+ str_info->is_unicode = FALSE;
+ str_info->should_release = FALSE;
+ return TRUE;
+#else
PyBuffer_Release(&str_info->view);
PyErr_SetString(PyExc_ValueError, "buffer is NULL");
return FALSE;
+#endif
}
str_info->should_release = TRUE;

View File

@ -0,0 +1,31 @@
From: Arthur Zamarin <arthurzam@gmail.com>
Date: Fri, 30 Jul 2021 11:38:26 +0300
[PATCH] PyPy3: fix test_issue_18468
When using the small subclass classes to test correctness of split
results, there are difference between CPython and PyPy3:
- CPython returns always the base class (for example str instead
of StrSubclass)
- PyPy3 returns the same class, so we get an StrSubclass
Based on the test, it looks like the behaviour of PyPy3 is correct,
but the test works based on CPython.
The fix was to relax the equals type to check that it is a subclass.
Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
---
regex_3/test_regex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/regex_3/test_regex.py
+++ b/regex_3/test_regex.py
@@ -52,7 +52,7 @@ class RegexTests(unittest.TestCase):
for x, y in zip(actual, expect):
recurse(x, y)
else:
- self.assertIs(type(actual), type(expect), msg)
+ self.assertIsInstance(actual, type(expect), msg)
recurse(actual, expect)

View File

@ -1,45 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DOCS=( README docs/UnicodeProperties.txt )
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}
append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile
}
python_test() {
local msg="tests failed under ${EPYTHON}"
# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
einfo "There is one trivial fail of test test_empty_array under pypy"
if python_is_python3; then
"${PYTHON}" Python3/test_regex.py || die "${msg}"
else
"${PYTHON}" Python2/test_regex.py || die "${msg}"
fi
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
distutils-r1_python_install_all
}

View File

@ -1,45 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DOCS=( README docs/UnicodeProperties.txt )
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}
append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile
}
python_test() {
local msg="tests failed under ${EPYTHON}"
# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
einfo "There is one trivial fail of test test_empty_array under pypy"
if python_is_python3; then
"${PYTHON}" Python3/test_regex.py || die "${msg}"
else
"${PYTHON}" Python2/test_regex.py || die "${msg}"
fi
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
distutils-r1_python_install_all
}

View File

@ -1,45 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DOCS=( README docs/UnicodeProperties.txt )
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}
append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile
}
python_test() {
local msg="tests failed under ${EPYTHON}"
# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
einfo "There is one trivial fail of test test_empty_array under pypy"
if python_is_python3; then
"${PYTHON}" Python3/test_regex.py || die "${msg}"
else
"${PYTHON}" Python2/test_regex.py || die "${msg}"
fi
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
distutils-r1_python_install_all
}

View File

@ -1,45 +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 flag-o-matic
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
IUSE="doc"
DOCS=( README docs/UnicodeProperties.txt )
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}
append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile
}
python_test() {
local msg="tests failed under ${EPYTHON}"
# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
einfo "There is one trivial fail of test test_empty_array under pypy"
if python_is_python3; then
"${PYTHON}" Python3/test_regex.py || die "${msg}"
else
"${PYTHON}" Python2/test_regex.py || die "${msg}"
fi
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
distutils-r1_python_install_all
}

View File

@ -1,45 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DOCS=( README docs/UnicodeProperties.txt )
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}
append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile
}
python_test() {
local msg="tests failed under ${EPYTHON}"
# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
einfo "There is one trivial fail of test test_empty_array under pypy"
if python_is_python3; then
"${PYTHON}" Python3/test_regex.py || die "${msg}"
else
"${PYTHON}" Python2/test_regex.py || die "${msg}"
fi
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
distutils-r1_python_install_all
}

View File

@ -0,0 +1,34 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="Alternative regular expression module to replace re"
HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="doc"
PATCHES=(
"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
)
distutils_enable_tests unittest
python_test() {
eunittest -s "${BUILD_DIR}"/lib
}
python_install_all() {
use doc && local HTML_DOCS=( docs/Features.html )
local DOCS=( README.rst docs/*.rst )
distutils-r1_python_install_all
}