Updating liguros repo

8 files changed, 157 insertions, 1 deletions

diff --git a/dev-python/cached-property/cached-property-1.5.2.ebuild b/dev-python/cached-property/cached-property-1.5.2.ebuild
index 9d4b1e4d2208..a9cb7cfd8dc9 100644
--- a/dev-python/cached-property/cached-property-1.5.2.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 04484d55d492..da6d5ab93622 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,2 +1,3 @@
 DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
 DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
+DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492
diff --git a/dev-python/fqdn/fqdn-1.5.0.ebuild b/dev-python/fqdn/fqdn-1.5.0.ebuild
new file mode 100644
index 000000000000..54a607ce85cb
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/guyhughes/fqdn"
+SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch b/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch
new file mode 100644
index 000000000000..c143a3765cdf
--- /dev/null
+++ b/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch
@@ -0,0 +1,64 @@
+From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
+From: Armin Rigo <arigo@tunes.org>
+Date: Sat, 26 Sep 2020 09:26:24 +0200
+Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
+
+---
+ rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
+ rpython/jit/backend/ppc/regalloc.py    |  4 ++--
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
+index b79b18e530..4bbfbba93a 100644
+--- a/rpython/jit/backend/ppc/opassembler.py
++++ b/rpython/jit/backend/ppc/opassembler.py
+@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
+     def _apply_offset(self, index_loc, ofs_loc):
+         # If offset != 0 then we have to add it here.  Note that
+         # mc.addi() would not be valid with operand r0.
+-        assert ofs_loc.is_imm()                # must be an immediate...
+-        assert _check_imm_arg(ofs_loc.getint())   # ...that fits 16 bits
+         assert index_loc.is_core_reg()
+         assert index_loc is not r.SCRATCH2
+-        # (simplified version of _apply_scale())
+-        if ofs_loc.value > 0:
+-            self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
++        if ofs_loc.is_imm():
++            # if it is an immediate, it must fit into 16 bits
++            assert _check_imm_arg(ofs_loc.getint())
++            # (simplified version of _apply_scale())
++            if ofs_loc.value != 0:
++                self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
++                index_loc = r.SCRATCH2
++        else:
++            # larger immediates are loaded into a register in regalloc.py
++            assert ofs_loc.is_core_reg()
++            self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+             index_loc = r.SCRATCH2
+         return index_loc
+ 
+diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
+index f3ee1129e4..827953cf12 100644
+--- a/rpython/jit/backend/ppc/regalloc.py
++++ b/rpython/jit/backend/ppc/regalloc.py
+@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
+         value_loc = self.ensure_reg(op.getarg(2))
+         assert op.getarg(3).getint() == 1    # scale
+         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
+-        assert ofs_loc.is_imm()  # the arg(4) should always be a small constant
++        # the arg(4) is often a small constant, but it may be too large
+         size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
+         return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
+ 
+@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
+         index_loc = self.ensure_reg(op.getarg(1))
+         assert op.getarg(2).getint() == 1    # scale
+         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
+-        assert ofs_loc.is_imm()  # the arg(3) should always be a small constant
++        # the arg(3) is often a small constant, but it may be too large
+         self.free_op_vars()
+         res_loc = self.force_allocate_reg(op)
+         size_box = op.getarg(4)
+-- 
+GitLab
+
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
index c0dee5cf1c60..5f8b73f349d8 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
@@ -59,6 +59,10 @@ check_env() {
 	check-reqs_pkg_pretend
 }
 
+PATCHES=(
+	"${FILESDIR}"/pypy-7.3.2-ppc64-segfault.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
new file mode 100644
index 000000000000..c143a3765cdf
--- /dev/null
+++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
@@ -0,0 +1,64 @@
+From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
+From: Armin Rigo <arigo@tunes.org>
+Date: Sat, 26 Sep 2020 09:26:24 +0200
+Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
+
+---
+ rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
+ rpython/jit/backend/ppc/regalloc.py    |  4 ++--
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
+index b79b18e530..4bbfbba93a 100644
+--- a/rpython/jit/backend/ppc/opassembler.py
++++ b/rpython/jit/backend/ppc/opassembler.py
+@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
+     def _apply_offset(self, index_loc, ofs_loc):
+         # If offset != 0 then we have to add it here.  Note that
+         # mc.addi() would not be valid with operand r0.
+-        assert ofs_loc.is_imm()                # must be an immediate...
+-        assert _check_imm_arg(ofs_loc.getint())   # ...that fits 16 bits
+         assert index_loc.is_core_reg()
+         assert index_loc is not r.SCRATCH2
+-        # (simplified version of _apply_scale())
+-        if ofs_loc.value > 0:
+-            self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
++        if ofs_loc.is_imm():
++            # if it is an immediate, it must fit into 16 bits
++            assert _check_imm_arg(ofs_loc.getint())
++            # (simplified version of _apply_scale())
++            if ofs_loc.value != 0:
++                self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
++                index_loc = r.SCRATCH2
++        else:
++            # larger immediates are loaded into a register in regalloc.py
++            assert ofs_loc.is_core_reg()
++            self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+             index_loc = r.SCRATCH2
+         return index_loc
+ 
+diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
+index f3ee1129e4..827953cf12 100644
+--- a/rpython/jit/backend/ppc/regalloc.py
++++ b/rpython/jit/backend/ppc/regalloc.py
+@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
+         value_loc = self.ensure_reg(op.getarg(2))
+         assert op.getarg(3).getint() == 1    # scale
+         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
+-        assert ofs_loc.is_imm()  # the arg(4) should always be a small constant
++        # the arg(4) is often a small constant, but it may be too large
+         size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
+         return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
+ 
+@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
+         index_loc = self.ensure_reg(op.getarg(1))
+         assert op.getarg(2).getint() == 1    # scale
+         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
+-        assert ofs_loc.is_imm()  # the arg(3) should always be a small constant
++        # the arg(3) is often a small constant, but it may be too large
+         self.free_op_vars()
+         res_loc = self.force_allocate_reg(op)
+         size_box = op.getarg(4)
+-- 
+GitLab
+
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
index 73313264113e..26077ca69aaa 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+	"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
 )
 
 check_env() {
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
index 592f395defcf..4fe37f8704e9 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+	"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
 )
 
 check_env() {