From 2808950101e9488389bfb75d4eace5036f5bc4f4 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [feature/flatten]" Date: Mon, 5 Oct 2020 00:26:55 +0000 Subject: Updating liguros repo --- .../aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild | 2 +- dev-python/aiohttp/aiohttp-3.6.2.ebuild | 2 +- .../async_timeout/async_timeout-3.0.1.ebuild | 2 +- dev-python/black/black-20.8_beta1.ebuild | 2 +- dev-python/blockdiag/blockdiag-2.0.1.ebuild | 2 +- dev-python/hypothesis/hypothesis-5.29.4.ebuild | 2 +- dev-python/hypothesis/hypothesis-5.36.1.ebuild | 2 +- dev-python/idna-ssl/idna-ssl-1.1.0.ebuild | 2 +- dev-python/libtmux/libtmux-0.8.3.ebuild | 2 +- .../protobuf-python-3.12.2-r1.ebuild | 2 +- dev-python/pyelftools/pyelftools-0.26.ebuild | 2 +- dev-python/pypy3-exe-bin/Manifest | 8 +- .../pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild | 48 ++++++ .../pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild | 48 ------ .../pypy3-exe-bin-7.3.2_p37-r1.ebuild | 49 +++++++ .../pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild | 49 ------- .../files/pypy3-7.3.2-sethostname-bytes.patch | 61 ++++++++ dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild | 160 ++++++++++++++++++++ dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild | 156 -------------------- dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild | 161 +++++++++++++++++++++ dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild | 157 -------------------- .../pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild | 2 +- dev-python/reno/Manifest | 1 + dev-python/reno/reno-3.2.0.ebuild | 40 +++++ .../sphinxcontrib-blockdiag-2.0.0.ebuild | 2 +- dev-python/sphinxcontrib-spelling/Manifest | 1 + dev-python/sphinxcontrib-spelling/metadata.xml | 1 + .../sphinxcontrib-spelling-5.3.0.ebuild | 4 +- .../sphinxcontrib-spelling-5.4.0.ebuild | 52 +++++++ 29 files changed, 593 insertions(+), 429 deletions(-) create mode 100644 dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild delete mode 100644 dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild create mode 100644 dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild delete mode 100644 dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild create mode 100644 dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch create mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild delete mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild create mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild delete mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild create mode 100644 dev-python/reno/reno-3.2.0.ebuild create mode 100644 dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild (limited to 'dev-python') diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild index 80e674436cbc..7e9f97763ada 100644 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild +++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]" BDEPEND=" diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild index d6e4c0d851b3..ddf8032d398a 100644 --- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild +++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild index a6fedf823458..83933128a6a1 100644 --- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild +++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" S=${WORKDIR}/${MY_P} diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild index 40aebfb13c51..d0a676d337c4 100644 --- a/dev-python/black/black-20.8_beta1.ebuild +++ b/dev-python/black/black-20.8_beta1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild index 4d4bedfbd9de..fa2385fefd89 100644 --- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild +++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild index a98dfc86af2d..708048328bf1 100644 --- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild +++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="cli test" RESTRICT="!test? ( test )" diff --git a/dev-python/hypothesis/hypothesis-5.36.1.ebuild b/dev-python/hypothesis/hypothesis-5.36.1.ebuild index 31c848539467..e5f73ff9e611 100644 --- a/dev-python/hypothesis/hypothesis-5.36.1.ebuild +++ b/dev-python/hypothesis/hypothesis-5.36.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="cli test" RESTRICT="!test? ( test )" diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild index 8e9c9cc28a6e..c901dfc02deb 100644 --- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild +++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild @@ -15,7 +15,7 @@ SRC_URI=" SLOT="0" LICENSE="MIT" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" RDEPEND="dev-python/idna[${PYTHON_USEDEP}]" diff --git a/dev-python/libtmux/libtmux-0.8.3.ebuild b/dev-python/libtmux/libtmux-0.8.3.ebuild index e5e3c795674e..d6ef4f4f22e1 100644 --- a/dev-python/libtmux/libtmux-0.8.3.ebuild +++ b/dev-python/libtmux/libtmux-0.8.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${ LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" RDEPEND=">=app-misc/tmux-3.0a" diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild index a4c33062b163..b9b5496eb29e 100644 --- a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild @@ -24,7 +24,7 @@ fi LICENSE="BSD" SLOT="0/23" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" BDEPEND="${PYTHON_DEPS} diff --git a/dev-python/pyelftools/pyelftools-0.26.ebuild b/dev-python/pyelftools/pyelftools-0.26.ebuild index cabf08e78801..57900663cfb1 100644 --- a/dev-python/pyelftools/pyelftools-0.26.ebuild +++ b/dev-python/pyelftools/pyelftools-0.26.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information" diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest index 93e0dff77835..0a31df41925d 100644 --- a/dev-python/pypy3-exe-bin/Manifest +++ b/dev-python/pypy3-exe-bin/Manifest @@ -1,6 +1,6 @@ DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2 DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e -DIST pypy3-exe-7.3.2-1.amd64.xpak 11747236 BLAKE2B 5421ad051d2af6f88875591c99e801eab3991aa4a6936c0661f7fe131b13ec5cf9a261774f4ce6cae6202a9b0087265a457e2bdefe50110ce12c71e56885992a SHA512 6cdf308a12d2dffc44335b06e8e6212e559f329f0045fdfb8e3b5fe127d62b8881eaf8231a3b7f9ad7f628ac059a1e68a9bb2b43d677e59cfc81ea202ebf0898 -DIST pypy3-exe-7.3.2-1.x86.xpak 9043236 BLAKE2B 0c07e5bba6d44444c227e63dea02c390254b809a2c14a4b9faefa080e32a86849c354971eb4f1d13331e00e2af7e79d108a6f69fed1cdec0faf70ed8320b6c64 SHA512 8040abb95b2bd4144a456f429fad39492672b6f225951f93d138609a7265bdadff9d2ea0b4cf7b481cd9a16fa1017bdcce0f7a3afda27ab60c094cc2a0ba2a92 -DIST pypy3-exe-7.3.2_p37-1.amd64.xpak 11873959 BLAKE2B e9fcb007b18d5880955bca5828285d8eb6b258f41ade7f53c2aa77c0bd65bb4884501dd093a6d19e694315cc20423ad05eaffcf78f62815b783a311220989805 SHA512 59fea7fe0670fed68c1748c9a763c754261b05f25f0ce251088908f79b73b9d468aa2777b0c5cda394474db04e0e754999b49677051ba00a94f4dfe6fca7e4a5 -DIST pypy3-exe-7.3.2_p37-1.x86.xpak 9127420 BLAKE2B 23c7382980339ec4bb476acf99e587e7ff6128cc421bdd1758c6b922ec0cc1fb98c4895d28788d1184f3b6fb00e1954e517f58d33c3c10470c8d8c236fd43024 SHA512 f6680fca7a39b27117ea6aa680fc0fe78cec836413777860ff1adda21934ca6d0330364c7e3d97e9ab9f92fb3160e021cbfd016de89af6009526865164433f0e +DIST pypy3-exe-7.3.2-r1-1.amd64.xpak 11745754 BLAKE2B 16b6b078609b6c6fb9f87c8d6fe477ec29d9e3c51d68996b782cf2e908f46759a42b32dfd8e64a32bfe2488849ce57255cc9a299231f4f6f2dd52a5c11e30367 SHA512 6e4d73b11cd67ad50d01e0db1a800567f723752abaa20bae7e950f3c2cecafd6e2065bd47e69e2b8d96b9ecbb396ed46a21a315d685a0e712bee17aa549a15e9 +DIST pypy3-exe-7.3.2-r1-1.x86.xpak 9030835 BLAKE2B 8fe13acd6bb93a60ed3f4268c1c53e7bb0101c7f68a58ddda4f7cec8fc5d4b3df463de2fbb585adbfb04349a96807a6c34246ceab76e001bfedabaddba90750b SHA512 ab463d5df575b1b8a01fa129f96b1317de37d2a0de83d124d411be63add0a241700a918885ed7128221cadfbb0d3b0d49d32d57ec25c59ec45e26e5bb1c4c0c0 +DIST pypy3-exe-7.3.2_p37-r1-1.amd64.xpak 11864985 BLAKE2B 69fe7b080ec4fe6cf3d0e06c0d7c00c17627259d57ff02a1dc0629374f92f425889a3e40b075f48687af47e97b2504252369bd106011961337fe1708d6e35561 SHA512 673de3083be18d9f62e9586eb0daae3e1a041f245ffb17fabb0b88ee6262cdd3ffd7dc723e6b72eb42057d0bbffbcc82a5c2864e585c5a1b184983445269500e +DIST pypy3-exe-7.3.2_p37-r1-1.x86.xpak 9126391 BLAKE2B e8b68a1ce9ada6cf9a27dfcac78564d8a3020575ce9d1db7460c8aec8097abb6624bbce594d84556525253de8c620cb8acaf7e381af48d71b97bfdcfc5759a05 SHA512 29172e3d99775af10507167cd84f120677bfa752747b8d11f5434b16aea7eac9aa06bc820949cac132a2bd6e3c69df4da8a8a6bbba9cf4fe01db6cf1b0f725c6 diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild new file mode 100644 index 000000000000..c7525e5712c9 --- /dev/null +++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils + +MY_P=pypy3-exe-${PV}-r1-1 +DESCRIPTION="PyPy3 executable (pre-built version)" +HOMEPAGE="https://pypy.org/" +SRC_URI=" + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak + -> ${MY_P}.amd64.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak + -> ${MY_P}.x86.xpak + )" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=sys-libs/zlib-1.1.3:0/1 + dev-libs/libffi:0/7 + virtual/libintl:0/0 + dev-libs/expat:0/0 + app-arch/bzip2:0/1 + sys-libs/ncurses:0/6 + !dev-python/pypy-exe:${PV}" + +QA_PREBUILT=" + usr/lib/pypy3.6/pypy3-c-${SLOT}" + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_install() { + insinto / + doins -r usr + fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}" + pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}" +} diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild deleted file mode 100644 index 345dafd4e829..000000000000 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils - -MY_P=pypy3-exe-${PV}-1 -DESCRIPTION="PyPy3 executable (pre-built version)" -HOMEPAGE="https://pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - dev-libs/libffi:0/7 - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${PV}" - -QA_PREBUILT=" - usr/lib/pypy3.6/pypy3-c-${SLOT}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}" - pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}" -} diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild new file mode 100644 index 000000000000..df3dd4d62deb --- /dev/null +++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils + +MY_P=pypy3-exe-${PV}-r1-1 +DESCRIPTION="PyPy3 executable (pre-built version)" +HOMEPAGE="https://pypy.org/" +SRC_URI=" + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak + -> ${MY_P}.amd64.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak + -> ${MY_P}.x86.xpak + )" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=sys-libs/zlib-1.1.3:0/1 + dev-libs/libffi:0/7 + virtual/libintl:0/0 + dev-libs/expat:0/0 + app-arch/bzip2:0/1 + sys-libs/ncurses:0/6 + !dev-python/pypy-exe:${PV}" + +PYPY_PV=${SLOT%_p*} +QA_PREBUILT=" + usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_install() { + insinto / + doins -r usr + fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" + pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" +} diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild deleted file mode 100644 index e8930a159077..000000000000 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils - -MY_P=pypy3-exe-${PV}-1 -DESCRIPTION="PyPy3 executable (pre-built version)" -HOMEPAGE="https://pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - dev-libs/libffi:0/7 - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${PV}" - -PYPY_PV=${SLOT%_p*} -QA_PREBUILT=" - usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" - pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch new file mode 100644 index 000000000000..68025600b1f5 --- /dev/null +++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch @@ -0,0 +1,61 @@ +From 5ee2925459372a8af805e952f433acd75e426325 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 4 Oct 2020 15:46:23 +0200 +Subject: [PATCH] Fix sethostname() failure when passed bytes + +My implementation of sethostname() was broken and failed when passed +bytes on Python 3. Update the implementation to match CPython -- that +is, use bytes if provided, or fsencode() when str is provided. + +--HG-- +branch : py3.6 +--- + pypy/module/_socket/interp_func.py | 8 +++++++- + pypy/module/_socket/test/test_sock_app.py | 12 ++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py +index bdc4f1293f..1727e51d51 100644 +--- a/pypy/module/_socket/interp_func.py ++++ b/pypy/module/_socket/interp_func.py +@@ -392,7 +392,13 @@ if hasattr(rsocket, 'sethostname'): + + Set the host name. + """ +- hostname = space.text_w(w_hostname) ++ if space.isinstance_w(w_hostname, space.w_bytes): ++ hostname = space.bytes_w(w_hostname) ++ elif space.isinstance_w(w_hostname, space.w_unicode): ++ hostname = space.fsencode_w(w_hostname) ++ else: ++ raise oefmt(space.w_TypeError, ++ "sethostname() argument 1 must be str or bytes") + try: + res = rsocket.sethostname(hostname) + except SocketError as e: +diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py +index fe3efec8e3..355fb8a2a9 100644 +--- a/pypy/module/_socket/test/test_sock_app.py ++++ b/pypy/module/_socket/test/test_sock_app.py +@@ -210,6 +210,18 @@ def test_getaddrinfo(space, w_socket): + assert space.unwrap(w_l) == True + + ++def test_sethostname(space, w_socket): ++ space.raises_w(space.w_OSError, space.appexec, ++ [w_socket], ++ "(_socket): _socket.sethostname(_socket.gethostname())") ++ ++ ++def test_sethostname_bytes(space, w_socket): ++ space.raises_w(space.w_OSError, space.appexec, ++ [w_socket], ++ "(_socket): _socket.sethostname(_socket.gethostname().encode())") ++ ++ + def test_unknown_addr_as_object(space, ): + from pypy.module._socket.interp_socket import addr_as_object + c_addr = lltype.malloc(rsocket._c.sockaddr, flavor='raw', track_allocation=False) +-- +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 new file mode 100644 index 000000000000..73313264113e --- /dev/null +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# pypy3 needs to be built using python 2 +PYTHON_COMPAT=( python2_7 ) +inherit check-reqs pax-utils python-any-r1 toolchain-funcs + +MY_P=pypy3.6-v${PV/_/} +DESCRIPTION="PyPy3 executable (build from source)" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + dev-libs/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + !dev-python/pypy3-exe-bin:${PV}" +DEPEND="${RDEPEND}" +BDEPEND=" + low-memory? ( dev-python/pypy ) + !low-memory? ( + || ( + dev-python/pypy + dev-lang/python:2.7 + ) + )" + +PATCHES=( + "${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch +) + +check_env() { + if use low-memory; then + CHECKREQS_MEMORY="1750M" + use amd64 && CHECKREQS_MEMORY="3500M" + else + CHECKREQS_MEMORY="3G" + use amd64 && CHECKREQS_MEMORY="6G" + fi + + check-reqs_pkg_pretend +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && check_env +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + check_env + + # unset to allow forcing pypy below :) + use low-memory && EPYTHON= + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } + then + einfo "Using PyPy to perform the translation." + EPYTHON=pypy + else + einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" + einfo "recommends using PyPy for that. If you wish to do so, please install" + einfo "dev-python/pypy and ensure that EPYTHON variable is unset." + python-any-r1_pkg_setup + fi + fi +} + +src_configure() { + tc-export CC + + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + + local args=( + --no-shared + $(usex jit -Ojit -O2) + + ${jit_backend} + + pypy/goal/targetpypystandalone + ) + + # Avoid linking against libraries disabled by use flags + local opts=( + bzip2:bz2 + ncurses:_minimal_curses + ) + + local opt + for opt in "${opts[@]}"; do + local flag=${opt%:*} + local mod=${opt#*:} + + args+=( + $(usex ${flag} --withmod --withoutmod)-${mod} + ) + done + + local interp=( "${EPYTHON}" ) + if use low-memory; then + interp=( env PYPY_GC_MAX_DELTA=200MB + "${EPYTHON}" --jit loop_longevity=300 ) + fi + + if [[ ${EPYTHON} != pypy ]]; then + # reuse bundled pycparser to avoid external dep + mkdir -p "${T}"/pymod/cffi || die + : > "${T}"/pymod/cffi/__init__.py || die + cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die + local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} + fi + + # translate into the C sources + # we're going to build them ourselves since otherwise pypy does not + # free up the unneeded memory before spawning the compiler + set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" + echo -e "\033[1m${@}\033[0m" + "${@}" || die "translation failed" +} + +src_compile() { + emake -C "${T}"/usession*-0/testing_1 +} + +src_install() { + local dest=/usr/lib/pypy3.6 + exeinto "${dest}" + newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} + insinto "${dest}"/include/${PV} + doins include/pypy_* + pax-mark m "${ED}${dest}/pypy3-c-${PV}" +} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild deleted file mode 100644 index a8648c1e6ea9..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -MY_P=pypy3.6-v${PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - )" - -check_env() { - if use low-memory; then - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - check_env - - # unset to allow forcing pypy below :) - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please install" - einfo "dev-python/pypy and ensure that EPYTHON variable is unset." - python-any-r1_pkg_setup - fi - fi -} - -src_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${EPYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - if [[ ${EPYTHON} != pypy ]]; then - # reuse bundled pycparser to avoid external dep - mkdir -p "${T}"/pymod/cffi || die - : > "${T}"/pymod/cffi/__init__.py || die - cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die - local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} - fi - - # translate into the C sources - # we're going to build them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy3.6 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PV}" -} 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 new file mode 100644 index 000000000000..592f395defcf --- /dev/null +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# pypy3 needs to be built using python 2 +PYTHON_COMPAT=( python2_7 ) +inherit check-reqs pax-utils python-any-r1 toolchain-funcs + +PYPY_PV=${PV%_p37} +MY_P=pypy3.7-v${PYPY_PV/_/} +DESCRIPTION="PyPy3 executable (build from source)" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + dev-libs/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + !dev-python/pypy3-exe-bin:${PV}" +DEPEND="${RDEPEND}" +BDEPEND=" + low-memory? ( dev-python/pypy ) + !low-memory? ( + || ( + dev-python/pypy + dev-lang/python:2.7 + ) + )" + +PATCHES=( + "${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch +) + +check_env() { + if use low-memory; then + CHECKREQS_MEMORY="1750M" + use amd64 && CHECKREQS_MEMORY="3500M" + else + CHECKREQS_MEMORY="3G" + use amd64 && CHECKREQS_MEMORY="6G" + fi + + check-reqs_pkg_pretend +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && check_env +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + check_env + + # unset to allow forcing pypy below :) + use low-memory && EPYTHON= + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } + then + einfo "Using PyPy to perform the translation." + EPYTHON=pypy + else + einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" + einfo "recommends using PyPy for that. If you wish to do so, please install" + einfo "dev-python/pypy and ensure that EPYTHON variable is unset." + python-any-r1_pkg_setup + fi + fi +} + +src_configure() { + tc-export CC + + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + + local args=( + --no-shared + $(usex jit -Ojit -O2) + + ${jit_backend} + + pypy/goal/targetpypystandalone + ) + + # Avoid linking against libraries disabled by use flags + local opts=( + bzip2:bz2 + ncurses:_minimal_curses + ) + + local opt + for opt in "${opts[@]}"; do + local flag=${opt%:*} + local mod=${opt#*:} + + args+=( + $(usex ${flag} --withmod --withoutmod)-${mod} + ) + done + + local interp=( "${EPYTHON}" ) + if use low-memory; then + interp=( env PYPY_GC_MAX_DELTA=200MB + "${EPYTHON}" --jit loop_longevity=300 ) + fi + + if [[ ${EPYTHON} != pypy ]]; then + # reuse bundled pycparser to avoid external dep + mkdir -p "${T}"/pymod/cffi || die + : > "${T}"/pymod/cffi/__init__.py || die + cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die + local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} + fi + + # translate into the C sources + # we're going to build them ourselves since otherwise pypy does not + # free up the unneeded memory before spawning the compiler + set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" + echo -e "\033[1m${@}\033[0m" + "${@}" || die "translation failed" +} + +src_compile() { + emake -C "${T}"/usession*-0/testing_1 +} + +src_install() { + local dest=/usr/lib/pypy3.7 + exeinto "${dest}" + newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} + insinto "${dest}"/include/${PYPY_PV} + doins include/pypy_* + pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" +} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild deleted file mode 100644 index 5992fb3e87ef..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p37} -MY_P=pypy3.7-v${PYPY_PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - )" - -check_env() { - if use low-memory; then - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - check_env - - # unset to allow forcing pypy below :) - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please install" - einfo "dev-python/pypy and ensure that EPYTHON variable is unset." - python-any-r1_pkg_setup - fi - fi -} - -src_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${EPYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - if [[ ${EPYTHON} != pypy ]]; then - # reuse bundled pycparser to avoid external dep - mkdir -p "${T}"/pymod/cffi || die - : > "${T}"/pymod/cffi/__init__.py || die - cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die - local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} - fi - - # translate into the C sources - # we're going to build them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy3.7 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} - insinto "${dest}"/include/${PYPY_PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" -} diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild index 170bffad0163..be4d80b4f4cb 100644 --- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild +++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" RDEPEND=" diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest index 346e72e4a6ca..feab07451c05 100644 --- a/dev-python/reno/Manifest +++ b/dev-python/reno/Manifest @@ -1 +1,2 @@ DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c +DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65 diff --git a/dev-python/reno/reno-3.2.0.ebuild b/dev-python/reno/reno-3.2.0.ebuild new file mode 100644 index 000000000000..1a98c45046c5 --- /dev/null +++ b/dev-python/reno/reno-3.2.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs" +HOMEPAGE="https://pypi.org/project/reno/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + dev-python/pbr[${PYTHON_USEDEP}] + >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}] + >=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}] + >=dev-python/packaging-20.4[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/pbr[${PYTHON_USEDEP}] + test? ( + >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + ) +" + +# The doc needs to be built from a git repository +distutils_enable_tests unittest + +python_prepare_all() { + # Some tests need to be run from a git repository + rm reno/tests/test_{cache,semver}.py || die + distutils-r1_python_prepare_all +} diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild index 6fcae4ccdae8..9173e602cfd7 100644 --- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild +++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" RDEPEND=" >=dev-python/sphinx-2.0[${PYTHON_USEDEP}] diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest index 93f723547f3c..5fd72d6b1eca 100644 --- a/dev-python/sphinxcontrib-spelling/Manifest +++ b/dev-python/sphinxcontrib-spelling/Manifest @@ -1,2 +1,3 @@ DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2 DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9 +DIST sphinxcontrib-spelling-5.4.0.tar.gz 46823 BLAKE2B 8303a97b87d953a37db4548d895559baf93969c11f8417aafeb67804ec537f9ea028bcbf6a56eb3290f13871a782dcde142b1927865a6f9eefd5a20dc53061b1 SHA512 7e0fe6289f9482982825a1204c926490a1e31dc85e25e6418ba47f5575430875e3df5f77202ad458044b810bc2a29f989e6bc6f0c9b4934af938716a4ab887f0 diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml index 725a535c8824..8dd0dde97efe 100644 --- a/dev-python/sphinxcontrib-spelling/metadata.xml +++ b/dev-python/sphinxcontrib-spelling/metadata.xml @@ -8,6 +8,7 @@ sphinxcontrib-spelling sphinx-contrib/spelling + https://sphinxcontrib-spelling.readthedocs.io/ gentoo-staging diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild index 96b67a86d3a8..0b13bdd34961 100644 --- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild +++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" $(python_gen_cond_dep ' @@ -33,7 +33,7 @@ BDEPEND=" ) " -distutils_enable_sphinx docs/source --no-autodoc +# The doc can only be built from a git repository distutils_enable_tests pytest RDEPEND+=" diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild new file mode 100644 index 000000000000..0bc0be88a4bf --- /dev/null +++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="Sphinx spelling extension" +HOMEPAGE="https://github.com/sphinx-contrib/spelling" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}] + ' python3_{6,7}) + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/pbr[${PYTHON_USEDEP}] + test? ( + app-dicts/myspell-en + ) +" + +# The doc can only be built from a git repository +distutils_enable_tests pytest + +# We don't want distutils_enable_tests to add the namespace +# package to BDEPEND under "test?". Therefore we add it to RDEPEND +# after running distutils_enable_tests. +RDEPEND+=" + dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}] +" + +python_prepare_all() { + # Needs to be run from a git repository + sed -i 's/test_contributors/_&/' \ + sphinxcontrib/spelling/tests/test_filter.py || die + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + find "${ED}" -name '*.pth' -delete || die +} -- cgit v1.3.1