gentoo (valentine's day) resync : 14.02.2021

3 files changed, 12 insertions, 257 deletions

diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 6852f066d9cd..8172510d31a4 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,7 +1,6 @@
-AUX cffi-0.14.0-g-line.patch 9258 BLAKE2B a57cb8836dfcfb1124b1b72c38fb4c02d231fc7116c2de4b970e6423d037d1aa382173a4bebb9dafab0d690df485a64d824aafcdb16e31d01b391c25f4c239eb SHA512 335758de740050256af711e688072bbe4ac835551437bc2fbfd4dfaf5492efd5c722bca3bd8e5747bb0a88d3e7e6f82b78f85f5f42a4f11efb7b2f6c3ae4a492
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
-DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
 DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
-EBUILD cffi-1.14.0-r3.ebuild 1374 BLAKE2B aa1e7b3446bf1083ecf9ff36e6e7ad65eacd5bfba4719e8d1990c0516677a45ee62e7f073bf39aaece1232f75fc66383b1454edc2b972c5fb1f0c6e3a4c447a4 SHA512 8149c596fd74c64ea36776ac72a53c271bb93d9b8d1f020b2ed7187d74f5254b3018724c1a096e00c8b01556d92a63546f624c491748fd1b6dac109609047885
+DIST cffi-1.14.5.tar.gz 475055 BLAKE2B d8a1f83aace8329216f5d36b2e8a27f62803fe9ad12c2d29aa1b3f730d1beb8bad0f50e17102c8673471a7bef57b0755157c4e1bf1a50779ed20b1cfcbb2043a SHA512 7428b3f6e4ee9f3b91011e43304dd63e5cc48479120ae58298c646c1ec1f5c24525d5f08655a7fed70c5fad7ae0c2e0539e512b5fa49d2bc57669c4ab703cc2a
 EBUILD cffi-1.14.4.ebuild 1540 BLAKE2B f08c6a66b21ad371e414e81999821fd7ee49b6b7bb436b8f214161cfd24afabfa490e4faeedbcd72f574b2f96bcd164c40cb4b0041105dd1deed61cb3217195a SHA512 28566fad5dcbf8d0775671c2f17ebbcac70a3a14af9f666a35e425ebcf3b37cc85bd90781f017092d0b27b60a920c6d63ae660e80f0fe6c05fd8a840947f7651
+EBUILD cffi-1.14.5.ebuild 1515 BLAKE2B 78f0578a98b206e53a78a0665c4d68bb9259d06ab2b0761973335638ac432d4ac87d43c365504870e7b278f0e5c12f358904f39d411ec671d210f220471e6541 SHA512 544f8f7d8920764260049d7e713ed4d16e07c938bf2f99066bcd67e69e495f799466a5450b51f11a9905a1643a7057573b51ce471fd090c7efb62f05c4a4e3e4
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.0-r3.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index fe9cf1decfac..fb0d73cf7ae2 100644
--- a/dev-python/cffi/cffi-1.14.0-r3.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -16,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -30,10 +29,17 @@ BDEPEND="${RDEPEND}
 distutils_enable_sphinx doc/source
 
 PATCHES=(
-	"${FILESDIR}"/cffi-0.14.0-g-line.patch
 	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
 )
 
+src_prepare() {
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Don't obsessively try to find libffi
+		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
 src_configure() {
 	tc-export PKG_CONFIG
 }
diff --git a/dev-python/cffi/files/cffi-0.14.0-g-line.patch b/dev-python/cffi/files/cffi-0.14.0-g-line.patch
deleted file mode 100644
index 45a1099dce27..000000000000
--- a/dev-python/cffi/files/cffi-0.14.0-g-line.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 19ff1036043ae40ff3d8a2e1a6a793219e1ec378 Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Tue, 26 May 2020 15:51:56 +0200
-Subject: [PATCH] Issue #454
-
-Try harder to avoid #line directives confuse the rest of pre-parsing
----
- cffi/cparser.py               | 37 ++++++++++++++++++++++++---
- testing/cffi0/test_parsing.py | 48 ++++++++++++++++++++++++++++++++++-
- 2 files changed, 81 insertions(+), 4 deletions(-)
-
-diff --git a/cffi/cparser.py b/cffi/cparser.py
-index d7069a73..d9784655 100644
---- a/cffi/cparser.py
-+++ b/cffi/cparser.py
-@@ -29,6 +29,7 @@ _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$",
- _r_define  = re.compile(r"^\s*#\s*define\s+([A-Za-z_][A-Za-z_0-9]*)"
-                         r"\b((?:[^\n\\]|\\.)*?)$",
-                         re.DOTALL | re.MULTILINE)
-+_r_line_directive = re.compile(r"^[ \t]*#[ \t]*line\b.*$", re.MULTILINE)
- _r_partial_enum = re.compile(r"=\s*\.\.\.\s*[,}]|\.\.\.\s*\}")
- _r_enum_dotdotdot = re.compile(r"__dotdotdot\d+__$")
- _r_partial_array = re.compile(r"\[\s*\.\.\.\s*\]")
-@@ -163,10 +164,37 @@ def _warn_for_non_extern_non_static_global_variable(decl):
-                       "with C it should have a storage class specifier "
-                       "(usually 'extern')" % (decl.name,))
- 
-+def _remove_line_directives(csource):
-+    # _r_line_directive matches whole lines, without the final \n, if they
-+    # start with '#line' with some spacing allowed.  This function stores
-+    # them away and replaces them with exactly the string '#line@N', where
-+    # N is the index in the list 'line_directives'.
-+    line_directives = []
-+    def replace(m):
-+        i = len(line_directives)
-+        line_directives.append(m.group())
-+        return '#line@%d' % i
-+    csource = _r_line_directive.sub(replace, csource)
-+    return csource, line_directives
-+
-+def _put_back_line_directives(csource, line_directives):
-+    def replace(m):
-+        s = m.group()
-+        if not s.startswith('#line@'):
-+            raise AssertionError("unexpected #line directive "
-+                                 "(should have been processed and removed")
-+        return line_directives[int(s[6:])]
-+    return _r_line_directive.sub(replace, csource)
-+
- def _preprocess(csource):
-+    # First, remove the lines of the form '#line N "filename"' because
-+    # the "filename" part could confuse the rest
-+    csource, line_directives = _remove_line_directives(csource)
-     # Remove comments.  NOTE: this only work because the cdef() section
--    # should not contain any string literal!
--    csource = _r_comment.sub(' ', csource)
-+    # should not contain any string literals (except in line directives)!
-+    def replace_keeping_newlines(m):
-+        return ' ' + m.group().count('\n') * '\n'
-+    csource = _r_comment.sub(replace_keeping_newlines, csource)
-     # Remove the "#define FOO x" lines
-     macros = {}
-     for match in _r_define.finditer(csource):
-@@ -219,7 +247,10 @@ def _preprocess(csource):
-     csource = _r_float_dotdotdot.sub(' __dotdotdotfloat__ ', csource)
-     # Replace all remaining "..." with the same name, "__dotdotdot__",
-     # which is declared with a typedef for the purpose of C parsing.
--    return csource.replace('...', ' __dotdotdot__ '), macros
-+    csource = csource.replace('...', ' __dotdotdot__ ')
-+    # Finally, put back the line directives
-+    csource = _put_back_line_directives(csource, line_directives)
-+    return csource, macros
- 
- def _common_type_names(csource):
-     # Look in the source for what looks like usages of types from the
-diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py
-index 3fc3783a..5f2d7ec4 100644
---- a/testing/cffi0/test_parsing.py
-+++ b/testing/cffi0/test_parsing.py
-@@ -174,7 +174,7 @@ def test_remove_line_continuation_comments():
-         double // blah \\
-                   more comments
-         x(void);
--        double // blah\\\\
-+        double // blah // blah\\\\
-         y(void);
-         double // blah\\ \
-                   etc
-@@ -185,6 +185,52 @@ def test_remove_line_continuation_comments():
-     m.y
-     m.z
- 
-+def test_dont_remove_comment_in_line_directives():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        \t # \t line \t 8 \t "baz.c" \t
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:9:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        #line 7 "foo//bar.c"
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
-+
-+def test_multiple_line_directives():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef,
-+    """ #line 5 "foo.c"
-+        extern int xx;
-+        #line 6 "bar.c"
-+        extern int yy;
-+        #line 7 "baz.c"
-+        some syntax error here
-+        #line 8 "yadda.c"
-+        extern int zz;
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
-+
-+def test_commented_line_directive():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        /*
-+        #line 5 "foo.c"
-+        */
-+        void xx(void);
-+
-+        #line 6 "bar.c"
-+        /*
-+        #line 35 "foo.c"
-+        */
-+        some syntax error
-+    """)
-+    assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
-+
- def test_line_continuation_in_defines():
-     ffi = FFI(backend=FakeBackend())
-     ffi.cdef("""
--- 
-2.26.2
-
-From 31249d786c833d4960bbbf4e0d7f7bcaecf92d1f Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Fri, 29 May 2020 10:27:40 +0200
-Subject: [PATCH] #454
-
-Second try with '# NUMBER' instead of '#line NUMBER', as gcc seems to output
----
- cffi/cparser.py               |  8 +++----
- testing/cffi0/test_parsing.py | 41 +++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 4 deletions(-)
-
-diff --git a/cffi/cparser.py b/cffi/cparser.py
-index d9784655..74830e91 100644
---- a/cffi/cparser.py
-+++ b/cffi/cparser.py
-@@ -29,7 +29,7 @@ _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$",
- _r_define  = re.compile(r"^\s*#\s*define\s+([A-Za-z_][A-Za-z_0-9]*)"
-                         r"\b((?:[^\n\\]|\\.)*?)$",
-                         re.DOTALL | re.MULTILINE)
--_r_line_directive = re.compile(r"^[ \t]*#[ \t]*line\b.*$", re.MULTILINE)
-+_r_line_directive = re.compile(r"^[ \t]*#[ \t]*(?:line|\d+)\b.*$", re.MULTILINE)
- _r_partial_enum = re.compile(r"=\s*\.\.\.\s*[,}]|\.\.\.\s*\}")
- _r_enum_dotdotdot = re.compile(r"__dotdotdot\d+__$")
- _r_partial_array = re.compile(r"\[\s*\.\.\.\s*\]")
-@@ -166,9 +166,9 @@ def _warn_for_non_extern_non_static_global_variable(decl):
- 
- def _remove_line_directives(csource):
-     # _r_line_directive matches whole lines, without the final \n, if they
--    # start with '#line' with some spacing allowed.  This function stores
--    # them away and replaces them with exactly the string '#line@N', where
--    # N is the index in the list 'line_directives'.
-+    # start with '#line' with some spacing allowed, or '#NUMBER'.  This
-+    # function stores them away and replaces them with exactly the string
-+    # '#line@N', where N is the index in the list 'line_directives'.
-     line_directives = []
-     def replace(m):
-         i = len(line_directives)
-diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py
-index 5f2d7ec4..a5e45874 100644
---- a/testing/cffi0/test_parsing.py
-+++ b/testing/cffi0/test_parsing.py
-@@ -199,6 +199,21 @@ def test_dont_remove_comment_in_line_directives():
- 
-         some syntax error here
-     """)
-+    #
-+    assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        \t # \t 8 \t "baz.c" \t
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:9:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        # 7 "foo//bar.c"
-+
-+        some syntax error here
-+    """)
-     assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
- 
- def test_multiple_line_directives():
-@@ -214,6 +229,18 @@ def test_multiple_line_directives():
-         extern int zz;
-     """)
-     assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef,
-+    """ # 5 "foo.c"
-+        extern int xx;
-+        # 6 "bar.c"
-+        extern int yy;
-+        # 7 "baz.c"
-+        some syntax error here
-+        # 8 "yadda.c"
-+        extern int zz;
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
- 
- def test_commented_line_directive():
-     ffi = FFI(backend=FakeBackend())
-@@ -229,6 +256,20 @@ def test_commented_line_directive():
-         */
-         some syntax error
-     """)
-+    #
-+    assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        /*
-+        # 5 "foo.c"
-+        */
-+        void xx(void);
-+
-+        # 6 "bar.c"
-+        /*
-+        # 35 "foo.c"
-+        */
-+        some syntax error
-+    """)
-     assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
- 
- def test_line_continuation_in_defines():
--- 
-2.26.2
-