summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2021-04-12 17:51:46 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2021-04-12 17:51:46 +0000
commit6498b9a80b898e6d8dbf1b2829bf75d50b465529 (patch)
tree7a2e6fc5275b30ce8ed867c220e55fb9b61931f9 /dev-python
parent28b9c28f9dfb8b725345a45a9e2c778f20958628 (diff)
downloadbaldeagleos-repo-6498b9a80b898e6d8dbf1b2829bf75d50b465529.tar.gz
baldeagleos-repo-6498b9a80b898e6d8dbf1b2829bf75d50b465529.tar.xz
baldeagleos-repo-6498b9a80b898e6d8dbf1b2829bf75d50b465529.zip
Adding metadata
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/aiohttp/metadata.xml2
-rw-r--r--dev-python/aws-sam-translator/Manifest1
-rw-r--r--dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild46
-rw-r--r--dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild2
-rw-r--r--dev-python/bleach/metadata.xml2
-rw-r--r--dev-python/bottle/metadata.xml2
-rw-r--r--dev-python/cryptography/metadata.xml2
-rw-r--r--dev-python/cssutils/Manifest1
-rw-r--r--dev-python/cssutils/cssutils-2.0.0.ebuild44
-rw-r--r--dev-python/cssutils/cssutils-2.2.0.ebuild2
-rw-r--r--dev-python/ddt/Manifest1
-rw-r--r--dev-python/ddt/ddt-1.2.2.ebuild25
-rw-r--r--dev-python/ddt/ddt-1.4.2.ebuild2
-rw-r--r--dev-python/defcon/Manifest1
-rw-r--r--dev-python/defcon/defcon-0.8.0.ebuild28
-rw-r--r--dev-python/defcon/defcon-0.8.1.ebuild2
-rw-r--r--dev-python/django/metadata.xml2
-rw-r--r--dev-python/ecdsa/metadata.xml2
-rw-r--r--dev-python/flask-cors/metadata.xml2
-rw-r--r--dev-python/flask/metadata.xml2
-rw-r--r--dev-python/hpack/metadata.xml2
-rw-r--r--dev-python/httplib2/metadata.xml2
-rw-r--r--dev-python/immutables/Manifest1
-rw-r--r--dev-python/immutables/immutables-0.14.ebuild17
-rw-r--r--dev-python/immutables/immutables-0.15.ebuild2
-rw-r--r--dev-python/ipython/metadata.xml2
-rw-r--r--dev-python/jaraco-path/jaraco-path-3.3.1.ebuild2
-rw-r--r--dev-python/jsonpickle/metadata.xml2
-rw-r--r--dev-python/keyring/metadata.xml2
-rw-r--r--dev-python/libnacl/files/libnacl-1.7.2-32bit.patch25
-rw-r--r--dev-python/libnacl/libnacl-1.7.2-r1.ebuild (renamed from dev-python/libnacl/libnacl-1.7.2.ebuild)4
-rw-r--r--dev-python/lmdb/metadata.xml2
-rw-r--r--dev-python/lxml/metadata.xml2
-rw-r--r--dev-python/markdown2/metadata.xml2
-rw-r--r--dev-python/namespace-ruamel/namespace-ruamel-1.ebuild2
-rw-r--r--dev-python/notebook/metadata.xml2
-rw-r--r--dev-python/openpyxl/metadata.xml2
-rw-r--r--dev-python/pandas/metadata.xml2
-rw-r--r--dev-python/pikepdf/metadata.xml2
-rw-r--r--dev-python/pillow/metadata.xml2
-rw-r--r--dev-python/pip/metadata.xml2
-rw-r--r--dev-python/prompt_toolkit/Manifest1
-rw-r--r--dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild24
-rw-r--r--dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild2
-rw-r--r--dev-python/py/metadata.xml2
-rw-r--r--dev-python/pycryptodome/metadata.xml2
-rw-r--r--dev-python/pygments/metadata.xml2
-rw-r--r--dev-python/pygobject/pygobject-3.38.0.ebuild2
-rw-r--r--dev-python/pyilmbase/metadata.xml2
-rw-r--r--dev-python/pyopenssl/pyopenssl-20.0.1.ebuild29
-rw-r--r--dev-python/pypiserver/metadata.xml2
-rw-r--r--dev-python/pypy/Manifest1
-rw-r--r--dev-python/pypy/pypy-7.3.3_p3.ebuild161
-rw-r--r--dev-python/pypy3/Manifest1
-rw-r--r--dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild177
-rw-r--r--dev-python/pysaml2/metadata.xml2
-rw-r--r--dev-python/python-gnupg/Manifest1
-rw-r--r--dev-python/python-gnupg/metadata.xml2
-rw-r--r--dev-python/python-gnupg/python-gnupg-0.4.6.ebuild28
-rw-r--r--dev-python/python-gnupg/python-gnupg-0.4.7.ebuild2
-rw-r--r--dev-python/pytools/Manifest1
-rw-r--r--dev-python/pytools/pytools-2021.1.2.ebuild26
-rw-r--r--dev-python/pytools/pytools-2021.2.ebuild2
-rw-r--r--dev-python/pyxdg/metadata.xml2
-rw-r--r--dev-python/pyyaml/metadata.xml2
-rw-r--r--dev-python/reportlab/reportlab-3.5.66.ebuild2
-rw-r--r--dev-python/requests/metadata.xml2
-rw-r--r--dev-python/rope/metadata.xml2
-rw-r--r--dev-python/rply/metadata.xml2
-rw-r--r--dev-python/rpyc/metadata.xml2
-rw-r--r--dev-python/rsa/metadata.xml2
-rw-r--r--dev-python/rst-linker/Manifest1
-rw-r--r--dev-python/rst-linker/rst-linker-2.1.1.ebuild42
-rw-r--r--dev-python/rst-linker/rst-linker-2.2.0.ebuild2
-rw-r--r--dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild2
-rw-r--r--dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-54.1.1.ebuild2
-rw-r--r--dev-python/slixmpp/metadata.xml2
-rw-r--r--dev-python/sqlalchemy/metadata.xml2
-rw-r--r--dev-python/thrift/metadata.xml2
-rw-r--r--dev-python/twisted/metadata.xml2
-rw-r--r--dev-python/typed-ast/metadata.xml2
-rw-r--r--dev-python/urllib3/metadata.xml2
-rw-r--r--dev-python/validators/metadata.xml2
-rw-r--r--dev-python/virtualenv/metadata.xml2
-rw-r--r--dev-python/werkzeug/metadata.xml2
-rw-r--r--dev-python/yapf/Manifest1
-rw-r--r--dev-python/yapf/yapf-0.30.0.ebuild18
-rw-r--r--dev-python/yapf/yapf-0.31.0.ebuild2
89 files changed, 453 insertions, 377 deletions
diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
index 9d0cf9beb67f..5631360ab452 100644
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/metadata.xml
@@ -12,7 +12,7 @@
<upstream>
<remote-id type="pypi">aiohttp</remote-id>
<remote-id type="github">aio-libs/aiohttp</remote-id>
- <remote-id type="cpe">cpe:/a:aiohttp_project:aiohttp</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:aiohttp_project:aiohttp</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 6e6e41ff7e8e..921d41a642a2 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1 @@
-DIST aws-sam-translator-1.34.0.tar.gz 831469 BLAKE2B fa6820ef8640b649c9866d3e33ca5bb889bb8041ad15ce93b672ba0d84a3396db03ac55c877f303359f20ef1afdcadb257b84616a4376640279ff47dd9d86b43 SHA512 704bb55c99485e37d8fda853ee8b4f36472c8ccc83951bbc48eaaf2a0049765820c9036ad48a0c03b2d267378e5bf3c3155986ceee2e6efae8bb28bff1e68ec7
DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
deleted file mode 100644
index 7616f2f08536..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/aws/serverless-application-model
- https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/boto3-1.5[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.11[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/parameterized[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dependency
- sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
- -i pytest.ini || die
-
- # don't install tests
- sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
- # deps are installed by ebuild, don't try to reinstall them via pip
- truncate --size=0 requirements/*.txt || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
index ad6656565090..7616f2f08536 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/metadata.xml b/dev-python/bleach/metadata.xml
index a21f9a74418d..ad87ba9fca77 100644
--- a/dev-python/bleach/metadata.xml
+++ b/dev-python/bleach/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">bleach</remote-id>
<remote-id type="github">mozilla/bleach</remote-id>
- <remote-id type="cpe">cpe:/a:mozilla:bleach</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:mozilla:bleach</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
index 3d2044a7a0ab..9ea333763445 100644
--- a/dev-python/bottle/metadata.xml
+++ b/dev-python/bottle/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">bottle</remote-id>
- <remote-id type="cpe">cpe:/a:bottlepy:bottle</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:bottlepy:bottle</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index bedf74e8cf78..6f1323f544ca 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">cryptography</remote-id>
<remote-id type="github">pyca/cryptography</remote-id>
- <remote-id type="cpe">cpe:/a:python-cryptography_project:python-cryptography</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python-cryptography_project:python-cryptography</remote-id>
</upstream>
<use>
<flag name="idna">enable support for the old, deprecated IDNA specification (RFC 3490)</flag>
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 4c38021050b6..25ea44ec13a7 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,2 +1 @@
-DIST cssutils-2.0.0.tar.gz 734153 BLAKE2B 09a6db97c2f10865d88ca83fe93b3b7a3981608b4afdc20fbb8533cd49b9f06b03d30ea5f456e83fc28a199b375fb6c7709ef067107bea1965e74b5e810158b5 SHA512 598f589c0f5961abe4f55f2ad0a63c98c931592c00d6c28579895527d2d2fc71686f3ae08df5b64616aa64ebf5a160a4aab12f7eae961d8891c4f525568b0188
DIST cssutils-2.2.0.tar.gz 731024 BLAKE2B 8da0e8898e7126a6a84f053f6a3411c3830dc4ec1e20b80bba53b1004c0747f0510390e10c611ce655cc8af62bf657f3b69d3a12a49b781f1b20553cd038f601 SHA512 cd9c3d069e18516484894df38f8cbc9abb1ffc5b021538c99c06878d34195619d7928d553049309ac30c144210df6ed616bbd0d04e158d9fbfce166f9935d5a2
diff --git a/dev-python/cssutils/cssutils-2.0.0.ebuild b/dev-python/cssutils/cssutils-2.0.0.ebuild
deleted file mode 100644
index 2ee443f00ecb..000000000000
--- a/dev-python/cssutils/cssutils-2.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-python_prepare_all() {
- # fix casing of call to Windows-1252. Remove when upstream fixes casing.
- sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \
- cssutils/tests/test_encutils/__init__.py ||
- die "fixing test_encutils failed"
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
- # esetup.py test
- # exclude tests that connect to the network
- set -- nosetests -v -P "${BUILD_DIR}/lib/cssutils/tests" \
- -e test_parseUrl
- echo "$@"
- "$@" || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/cssutils/cssutils-2.2.0.ebuild b/dev-python/cssutils/cssutils-2.2.0.ebuild
index 56717069efec..b6abf320a302 100644
--- a/dev-python/cssutils/cssutils-2.2.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index b078bdb86513..5ae63a494f6e 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,2 +1 @@
-DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
diff --git a/dev-python/ddt/ddt-1.2.2.ebuild b/dev-python/ddt/ddt-1.2.2.ebuild
deleted file mode 100644
index af96176819c7..000000000000
--- a/dev-python/ddt/ddt-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="https://pypi.org/project/ddt/ https://github.com/txels/ddt"
-SRC_URI="https://github.com/datadriventests/ddt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests nose
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index 63a0d0f1ea3f..bc7a30c07049 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="test"
BDEPEND="
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index c7fa565123a6..f35519af241b 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,2 +1 @@
-DIST defcon-0.8.0.tar.gz 424547 BLAKE2B 4018479d0d67603af58680c1150a143f92230c77b6fd6bda6741ed3f42403c7a7eb2ddc62632ffbf73096fffe8f089975b43a5bb88562ba059fa09ee2e0da12c SHA512 a7b0baec983a3051c7cd804b93983318c14f56a1a88f8f95699b0429740d7b3b27f6f6ab21fd1c31b542008b6f0924aae39e609fc4498ee64c0592272b536b8c
DIST defcon-0.8.1.tar.gz 424712 BLAKE2B f2f2e3e811eeb163a875686dc6658376dfd9c09a8a9e3de2e6fdf512f25e93d5f6d8ac9ad3c31c70ecdcdd2c30b0e6a3d9b7a222bcd7065feba0b2e805e8eead SHA512 40606bd861fc7100d955e23ad6efb3879572179c81b730404afe41cef1e45ae5f54efb716af61866ac226ae057c6d85a123f4790442c085c054ff3cb5ec84108
diff --git a/dev-python/defcon/defcon-0.8.0.ebuild b/dev-python/defcon/defcon-0.8.0.ebuild
deleted file mode 100644
index b77e73113624..000000000000
--- a/dev-python/defcon/defcon-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/robotools/defcon"
-SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/fs[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/defcon/defcon-0.8.1.ebuild b/dev-python/defcon/defcon-0.8.1.ebuild
index c6e27f6179de..b77e73113624 100644
--- a/dev-python/defcon/defcon-0.8.1.ebuild
+++ b/dev-python/defcon/defcon-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE=""
RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index 3253c441d60e..2a5ea3ffeebf 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">Django</remote-id>
<remote-id type="github">django/django</remote-id>
- <remote-id type="cpe">cpe:/a:djangoproject:django</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:djangoproject:django</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index bc884aa70d1e..1de77b00d732 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">ecdsa</remote-id>
<remote-id type="github">tlsfuzzer/python-ecdsa</remote-id>
- <remote-id type="cpe">cpe:/a:python-ecdsa_project:python-ecdsa</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python-ecdsa_project:python-ecdsa</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
index 4382a7008a40..e98dab5b09fd 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@@ -12,7 +12,7 @@
<upstream>
<remote-id type="pypi">Flask-Cors</remote-id>
<remote-id type="github">wcdolphin/flask-cors</remote-id>
- <remote-id type="cpe">cpe:/a:flask-cors_project:flask-cors</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:flask-cors_project:flask-cors</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index bec9fd4cc969..d0b075a97c54 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">Flask</remote-id>
<remote-id type="github">pallets/flask</remote-id>
- <remote-id type="cpe">cpe:/a:palletsprojects:flask</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:palletsprojects:flask</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index 6301143921d3..3d78487b4300 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -12,7 +12,7 @@
</longdescription>
<upstream>
<remote-id type="pypi">hpack</remote-id>
- <remote-id type="cpe">cpe:/a:python:hpack</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:hpack</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index 3e70078e8140..ff3df225ff85 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">httplib2</remote-id>
<remote-id type="github">httplib2/httplib2</remote-id>
- <remote-id type="cpe">cpe:/a:httplib2_project:httplib2</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:httplib2_project:httplib2</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 688b5fceddba..2683945fd16c 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,2 +1 @@
-DIST immutables-0.14.tar.gz 79451 BLAKE2B b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217 SHA512 244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea
DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
diff --git a/dev-python/immutables/immutables-0.14.ebuild b/dev-python/immutables/immutables-0.14.ebuild
deleted file mode 100644
index e59405bef42f..000000000000
--- a/dev-python/immutables/immutables-0.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index 8f5d0d31406d..5ee363d9647d 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
distutils_enable_tests pytest
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index b657a575f16c..13959a2d7a17 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -44,7 +44,7 @@
<upstream>
<remote-id type="pypi">ipython</remote-id>
<remote-id type="github">ipython/ipython</remote-id>
- <remote-id type="cpe">cpe:/a:ipython:ipython</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:ipython:ipython</remote-id>
</upstream>
<use>
<flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index 5313d87a5f12..1f1dc5c899d5 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index fde577e84dc7..e1b55ea9ea18 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">jsonpickle</remote-id>
<remote-id type="github">jsonpickle/jsonpickle</remote-id>
- <remote-id type="cpe">cpe:/a:jsonpickle_project:jsonpickle</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:jsonpickle_project:jsonpickle</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index f4dbbc98a555..ef8da104d6df 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -16,7 +16,7 @@
<upstream>
<remote-id type="pypi">keyring</remote-id>
<remote-id type="github">jaraco/keyring</remote-id>
- <remote-id type="cpe">cpe:/a:python:keyring</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:keyring</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
new file mode 100644
index 000000000000..f8a06d27949a
--- /dev/null
+++ b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
@@ -0,0 +1,25 @@
+From f1567460f2d07822f2125778a55bf90b74ef807f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 12 Apr 2021 15:10:09 +0200
+Subject: [PATCH] Fix crypto_kdf_derive_from_key() on 32-bit platforms
+
+---
+ libnacl/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnacl/__init__.py b/libnacl/__init__.py
+index 1aa722a..7649013 100644
+--- a/libnacl/__init__.py
++++ b/libnacl/__init__.py
+@@ -1180,7 +1180,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, context, master_key):
+ '''
+ size = int(subkey_size)
+ buf = ctypes.create_string_buffer(size)
+- nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, master_key)
++ nacl.crypto_kdf_derive_from_key(buf, subkey_size, ctypes.c_ulonglong(subkey_id), context, master_key)
+ return buf.raw
+
+ # Key Exchange API
+--
+2.31.1
+
diff --git a/dev-python/libnacl/libnacl-1.7.2.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 8998b0f39d5b..b575b64085af 100644
--- a/dev-python/libnacl/libnacl-1.7.2.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -17,6 +17,10 @@ KEYWORDS="amd64 ~arm ~x86"
RDEPEND="dev-libs/libsodium"
BDEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/libnacl-1.7.2-32bit.patch
+)
+
python_test() {
"${EPYTHON}" -m unittest discover -v -p 'test_*.py' tests/ || die "Tests failed with ${EPYTHON}"
}
diff --git a/dev-python/lmdb/metadata.xml b/dev-python/lmdb/metadata.xml
index 31fadfa722ba..9f3e1c6f45cf 100644
--- a/dev-python/lmdb/metadata.xml
+++ b/dev-python/lmdb/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">lmdb</remote-id>
<remote-id type="github">jnwatson/py-lmdb</remote-id>
- <remote-id type="cpe">cpe:/a:py-lmdb_project:py-lmdb</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:py-lmdb_project:py-lmdb</remote-id>
<doc>https://lmdb.readthedocs.io/</doc>
</upstream>
<origin>gentoo-staging</origin>
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index f7644d7149b0..522b461d7ba2 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">lxml</remote-id>
<remote-id type="github">lxml/lxml</remote-id>
- <remote-id type="cpe">cpe:/a:lxml:lxml</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:lxml:lxml</remote-id>
<bugs-to>https://bugs.launchpad.net/lxml</bugs-to>
</upstream>
<origin>gentoo-staging</origin>
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
index 9ca2e3cc6fef..bdf4e1dabc18 100644
--- a/dev-python/markdown2/metadata.xml
+++ b/dev-python/markdown2/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">markdown2</remote-id>
<remote-id type="github">trentm/python-markdown2</remote-id>
- <remote-id type="cpe">cpe:/a:python-markdown2_project:python-markdown2</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python-markdown2_project:python-markdown2</remote-id>
<bugs-to>https://github.com/trentm/python-markdown2/issues</bugs-to>
</upstream>
<origin>gentoo-staging</origin>
diff --git a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
index 4720c5be7018..457ea813d926 100644
--- a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
+++ b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
@@ -13,7 +13,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 093ce55f4bf1..4ae959143954 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -12,7 +12,7 @@
<upstream>
<remote-id type="pypi">notebook</remote-id>
<remote-id type="github">jupyter/notebook</remote-id>
- <remote-id type="cpe">cpe:/a:jupyter:notebook</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:jupyter:notebook</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index e8c1328671bf..efa4b4c8f11c 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">openpyxl</remote-id>
- <remote-id type="cpe">cpe:/a:python:openpyxl</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:openpyxl</remote-id>
<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/-/issues</bugs-to>
<doc>https://openpyxl.readthedocs.io/</doc>
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index 36645b24496e..31f897740f3f 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -18,7 +18,7 @@
<upstream>
<remote-id type="pypi">pandas</remote-id>
<remote-id type="github">pandas-dev/pandas</remote-id>
- <remote-id type="cpe">cpe:/a:numfocus:pandas</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:numfocus:pandas</remote-id>
</upstream>
<use>
<flag name="full-support">Pull all packages to give pandas full support</flag>
diff --git a/dev-python/pikepdf/metadata.xml b/dev-python/pikepdf/metadata.xml
index f0c3dfdd14ab..078d7e208ff7 100644
--- a/dev-python/pikepdf/metadata.xml
+++ b/dev-python/pikepdf/metadata.xml
@@ -16,7 +16,7 @@
<upstream>
<remote-id type="pypi">pikepdf</remote-id>
<remote-id type="github">pikepdf/pikepdf</remote-id>
- <remote-id type="cpe">cpe:/a:pikepdf_project:pikepdf</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pikepdf_project:pikepdf</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index 8c70be3018a3..6cc2b0a31fbd 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">Pillow</remote-id>
<remote-id type="github">python-pillow/Pillow</remote-id>
- <remote-id type="cpe">cpe:/a:python:pillow</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:pillow</remote-id>
</upstream>
<use>
<flag name="imagequant">Build with Image Quantization Library support</flag>
diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml
index 4cb1994b585e..d71f443ba613 100644
--- a/dev-python/pip/metadata.xml
+++ b/dev-python/pip/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">pip</remote-id>
<remote-id type="github">pypa/pip</remote-id>
- <remote-id type="cpe">cpe:/a:pypa:pip</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pypa:pip</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 86c6c516f2de..7e34751548a4 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,2 @@
-DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
DIST prompt_toolkit-3.0.17.tar.gz 3033301 BLAKE2B 86ba94f2e0c9e998c53e5e4ed12961c85c667b6d0356d17cfcb1856aef933f88c1c525507e76a833970444a787641c7316bc7496787ffcd61102945ae91b73bb SHA512 ef78b3aaf953f20a035f8a1f58262a8e4c1ae6b88c02c523bc51237bed22f52e229488d0113901bcd94835cc7120ccb4beb75cc9c9d99dde4e8f21df7bfde8a4
DIST prompt_toolkit-3.0.18.tar.gz 3034754 BLAKE2B 27334b7009fc162af67a1fa14bd30c76efed6a333c5c93f3100a2c9ad3299a1139c3c3cf530e7e048b5700c0dc4ec1087d1aecd5412785b09221ea2d55796008 SHA512 be2dbd72a1e08553c0e50453958b6085a7d743464acd02b303e5002e1174d672d2cadd7a992e71d0445aa2f2be7565411ae4d00c3677c275eca056a20ad9efc8
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
deleted file mode 100644
index 65261ccb753e..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
- https://pypi.org/project/prompt-toolkit/
- https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild
index 46cd3eff785d..65261ccb753e 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
index ac8422e56d7f..9f6f231bd689 100644
--- a/dev-python/py/metadata.xml
+++ b/dev-python/py/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">py</remote-id>
<remote-id type="github">pytest-dev/py</remote-id>
- <remote-id type="cpe">cpe:/a:pytest:py</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pytest:py</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/pycryptodome/metadata.xml b/dev-python/pycryptodome/metadata.xml
index f83fab86088a..783e8748c9cb 100644
--- a/dev-python/pycryptodome/metadata.xml
+++ b/dev-python/pycryptodome/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="github">Legrandin/pycryptodome</remote-id>
<remote-id type="pypi">pycryptodome</remote-id>
- <remote-id type="cpe">cpe:/a:python:pycryptodome</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:pycryptodome</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index 75ff3e3260df..3dda8c634f9d 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -9,7 +9,7 @@
<upstream>
<remote-id type="pypi">Pygments</remote-id>
<remote-id type="github">pygments/pygments</remote-id>
- <remote-id type="cpe">cpe:/a:pygments:pygments</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pygments:pygments</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
index 3c796e94a3b9..f154e2dac275 100644
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.38.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
LICENSE="LGPL-2.1+"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
index 584c3f586bde..8c9cd7ec1170 100644
--- a/dev-python/pyilmbase/metadata.xml
+++ b/dev-python/pyilmbase/metadata.xml
@@ -11,7 +11,7 @@
</maintainer>
<upstream>
<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
- <remote-id type="cpe">cpe:/a:ilm:openexr</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:ilm:openexr</remote-id>
</upstream>
<use>
<flag name="exceptions">
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index f6043871bf79..d277632f27a1 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1 flag-o-matic toolchain-funcs
MY_PN=pyOpenSSL
MY_P=${MY_PN}-${PV}
@@ -39,13 +39,28 @@ distutils_enable_sphinx doc \
dev-python/sphinx_rtd_theme
distutils_enable_tests pytest
-python_prepare_all() {
- # Requires network access
- sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
- distutils-r1_python_prepare_all
+src_configure() {
+ # test for 32-bit time_t
+ "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+ #include <sys/types.h>
+ int test[sizeof(time_t) >= 8 ? 1 : -1];
+ EOF
+ if [[ ${?} -eq 0 ]]; then
+ PYOPENSSL_SKIP_LARGE_TIME=
+ einfo "time_t is at least 64-bit long"
+ else
+ PYOPENSSL_SKIP_LARGE_TIME=1
+ einfo "time_t is smaller than 64 bits, will skip broken tests"
+ fi
}
-src_test() {
+python_test() {
local -x TZ=UTC
- distutils-r1_src_test
+ local deselect=(
+ tests/test_ssl.py::TestContext::test_set_default_verify_paths
+ )
+ [[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && deselect+=(
+ tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+ )
+ epytest ${deselect[@]/#/--deselect }
}
diff --git a/dev-python/pypiserver/metadata.xml b/dev-python/pypiserver/metadata.xml
index 511fb95790c5..96252be04db4 100644
--- a/dev-python/pypiserver/metadata.xml
+++ b/dev-python/pypiserver/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">pypiserver</remote-id>
<remote-id type="github">pypiserver/pypiserver</remote-id>
- <remote-id type="cpe">cpe:/a:python:pypiserver</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:pypiserver</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 35edec23e66c..433d96e1c4e4 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,5 @@
DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
+DIST pypy2.7-gentoo-patches-7.3.3_p3.tar.xz 12936 BLAKE2B 7d00353f79d535044e4e2c9cb8ad06d637bca4707123a566989b0ab97ac2f22d9f631d1d5f4e32bf1e0d5202dbc31fffa8d39718963da2a4594f814b90aa8132 SHA512 818910bbe3c01399a0da361a48098a4e875ddd7d4fd50f23bc06501dae7ed5eb3ee773b0dd76d256d141ba190d55b5c725fa4d7ed8d7a9841e6be81babaf518b
DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
diff --git a/dev-python/pypy/pypy-7.3.3_p3.ebuild b/dev-python/pypy/pypy-7.3.3_p3.ebuild
new file mode 100644
index 000000000000..98e14cf58366
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.3_p3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV}
+PATCHSET="pypy2.7-gentoo-patches-${PV}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+ || (
+ >=dev-python/pypy-exe-7.3.3_p2:${PYPY_PV}[bzip2?,ncurses?]
+ >=dev-python/pypy-exe-bin-7.3.3_p2:${PYPY_PV}
+ )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+ default
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+ # copy over to make sys.prefix happy
+ cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+ cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+ # (not installed by pypy)
+ rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+ mv pypy/module/cpyext/include/* include/ || die
+ mv pypy/module/cpyext/parse/*.h include/ || die
+ pax-mark m pypy-c
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "_ssl": "_ssl_build.py",
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+ cffi_targets=( ssl audioop syslog pwdgrp resource )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE=
+ local -x COLUMNS=80
+
+ local ignored_tests=(
+ # network
+ --ignore=lib-python/2.7/test/test_urllibnet.py
+ --ignore=lib-python/2.7/test/test_urllib2net.py
+ # lots of free space
+ --ignore=lib-python/2.7/test/test_zipfile64.py
+ )
+
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+ "${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+ local dest=/usr/lib/pypy2.7
+ einfo "Installing PyPy ..."
+ dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+
+ # replace copied headers with symlinks
+ for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+ dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+ done
+
+ dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+ "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ local -x EPYTHON=pypy
+ local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+ # temporarily copy to build tree to facilitate module builds
+ cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto /usr/lib/pypy2.7/site-packages
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+ python_optimize "${ED}${dest}"
+
+ # remove to avoid collisions
+ rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 99927378bfc2..f2511695079e 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1,5 @@
DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
+DIST pypy3.7-gentoo-patches-7.3.3_p3.tar.xz 17356 BLAKE2B 3418e4d600cdff96c228890dbfe0c63927ff4971be72eb951fb5fbc6ae803f4d26490f4a444dc788b165fa69ec77526413417ec5a697906a3089122f78351a8b SHA512 738d14e5ca693738150a3b9c1152a9b7a9c38dc77540fc7dd14f6d3a556a4b8716785f8f858ddd6b75545dadc623f0fccc57c84a869064ac423bee3acb1dceb6
DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7
DIST pypy3.7-gentoo-patches-7.3.4_p1.tar.xz 8868 BLAKE2B 5f897f920079dc86d6300ecaf6c9a43c30173b99e90d585151d3efec8718109e9165947ce772f48b6b15ff5c22c3f04f27aec088b34fd2c5c387f0b59728b333 SHA512 aa59f8eaecb1115fe391fe27ecd2c38a6c4213ea6e6de4954bd8a420ce5eb224c225b0ef1df19aef029546b05fa517a4965c9c24d98bc1be46c7eb024415a348
DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
new file mode 100644
index 000000000000..44147af98550
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37*}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+ || (
+ >=dev-python/pypy3-exe-7.3.3_p37_p2:${PV%_p*}[bzip2?,ncurses?]
+ >=dev-python/pypy3-exe-bin-7.3.3_p37_p2:${PV%_p*}
+ )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+ test? (
+ ${PYTHON_DEPS}
+ !!dev-python/pytest-forked
+ )"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+ default
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -i lib-python/3/distutils/command/install.py || die
+
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_compile() {
+ # copy over to make sys.prefix happy
+ cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+ cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+ # (not installed by pypy)
+ rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+ mv pypy/module/cpyext/include/* include/ || die
+ mv pypy/module/cpyext/parse/*.h include/ || die
+ pax-mark m pypy3-c
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "_blake2": "_blake2/_blake2_build.py",
+# "_ssl": "_ssl_build.py",
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+# "lzma": "_lzma_build.py",
+# "_decimal": "_decimal_build.py",
+# "_sha3": "_sha3/_sha3_build.py",
+ cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+ audioop syslog pwdgrp resource lzma decimal )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE=
+ local -x COLUMNS=80
+
+ # Test runner requires Python 2 too. However, it spawns PyPy3
+ # internally so that we end up testing the correct interpreter.
+ # (--deselect for failing doctests)
+ "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+ local dest=/usr/lib/pypy3.7
+ einfo "Installing PyPy ..."
+ dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+
+ # replace copied headers with symlinks
+ for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+ dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+ done
+
+ dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3* \
+ "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+ "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ local -x EPYTHON=pypy3
+ local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+ # temporarily copy to build tree to facilitate module builds
+ cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto /usr/lib/pypy3.7/site-packages
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+ python_optimize "${ED}${dest}"
+
+ # remove to avoid collisions
+ rm "${PYTHON}" || die
+}
diff --git a/dev-python/pysaml2/metadata.xml b/dev-python/pysaml2/metadata.xml
index 81c3e2e16f14..a981f6c7fd0d 100644
--- a/dev-python/pysaml2/metadata.xml
+++ b/dev-python/pysaml2/metadata.xml
@@ -15,7 +15,7 @@
<upstream>
<remote-id type="pypi">pysaml2</remote-id>
<remote-id type="github">rohe/pysaml2</remote-id>
- <remote-id type="cpe">cpe:/a:pysaml2_project:pysaml2</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pysaml2_project:pysaml2</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 81094677e368..877de1ef0a6b 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,2 +1 @@
-DIST python-gnupg-0.4.6.tar.gz 52527 BLAKE2B ac616bebac3c5d0ac35c2c1a9353b4ee700848be2469fabc4b6df9f328868638f61211adc786ec59a24f122106ae53cce68d0f16c33b64c2d3d27cb94bf17956 SHA512 33b98bdd1c7d211d31173bbea2358fdfd2dabdbd5e70d4b33035a0edbf666bdba7319ffc847c8617f2626d1bf5a91102f1103c0bfe651fcd709d51ee821be104
DIST python-gnupg-0.4.7.tar.gz 53091 BLAKE2B ebbd67b7255fa6e7739da785476efc441733c3cfa740fcb11c595c560b5a90ee43a1040a654485c30ae35f5e8d06fee235a4ae8d069f20f0eb1fb6e45b4ed441 SHA512 e590778affd3f864bac2221e1ce7c4a37ba257e7112e023d70617f3f3c7597dbeb2974db0ed611b2fc75a071678ae8856be4a3b3f48428a12b42c2f1125fdce5
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 52afbfe12445..40f984e1c4ca 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -13,7 +13,7 @@
<upstream>
<remote-id type="bitbucket">vinay.sajip/python-gnupg</remote-id>
<remote-id type="pypi">python-gnupg</remote-id>
- <remote-id type="cpe">cpe:/a:python:python-gnupg</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:python-gnupg</remote-id>
<bugs-to>https://bitbucket.org/vinay.sajip/python-gnupg/issues/new</bugs-to>
</upstream>
<origin>gentoo-staging</origin>
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
deleted file mode 100644
index 4b5c3ae212f6..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="
- https://bitbucket.org/vinay.sajip/python-gnupg
- https://pypi.org/project/python-gnupg/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-python_test() {
- # NO_EXTERNAL_TESTS must be enabled,
- # to disable all tests, which need internet access.
- NO_EXTERNAL_TESTS=1 "${PYTHON}" test_gnupg.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
index c1f77e206823..82ada621f8b9 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 647a607f8f29..b80450dde1b2 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,3 @@
-DIST pytools-2021.1.2.tar.gz 62893 BLAKE2B 9aa637f2cfeef93a8353f6df700d8566918aa75560f5b732cae96c2a1e1e327c53f303ddb107dab3f1056264dcd1aa2f75389a2bc3f433f7e44f7595e22df251 SHA512 c976f8dd87ee6fb870020ca14b4ac615e657a4be1ab4c737b4c572a8dc00b3f0c45c335ea0188bbad7b6769ce4123a33922e070e0dfe2bea63506d784c464a2c
DIST pytools-2021.2.1.tar.gz 65336 BLAKE2B 2b44d738b84efb2d301f2cd1e346dd4ddde003f78e276025dd225814984565ad7e76682d4fdbc578da86e215296e1fbf354fe9afc75f4f4a59e474de09f440c3 SHA512 3ba0540cb8fc153b915183e424abac32d181173488d0f29b612cbad5d51bdbddc9e19c54432937abb6556c4bb6db09fee46e6a4172a62edb4c9f89dfcf00f8c5
DIST pytools-2021.2.3.tar.gz 63283 BLAKE2B e5f9e69a0055db8b81e7f525894f5170afbe3a28ca33684a4afb414fc5413bdb986d51a711faa3326c27f9eb2da5c7812eb730c6d372944e0b5a23f09e9c9d6b SHA512 9d9f7a2d6888f4ffa9c53059fa67d80bc835d42a34311e264518323d91bcaef918c2c78c7687fa8c2d9310f1a6804e2ae74c50834323d1adc29638033e1f8ee0
DIST pytools-2021.2.tar.gz 65140 BLAKE2B 8f419b5776c99b3179b2f4d44a2461ee5e3b55d663e8982f1e34f9fab3cb397ee5a0ee13a2eaf9de1f3330c951b6972cac6d9d0c3994f461ffeca8abf110f11d SHA512 3a91be32c5e1c70a3f2d8accb29888cd7f4b9e304fc68a3d2ca2d9ff674a885836236f6dbf11711555444a8eee63cbe86d85834fc73676420b331f94915a1018
diff --git a/dev-python/pytools/pytools-2021.1.2.ebuild b/dev-python/pytools/pytools-2021.1.2.ebuild
deleted file mode 100644
index 87d7e057d4e1..000000000000
--- a/dev-python/pytools/pytools-2021.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2021.2.ebuild b/dev-python/pytools/pytools-2021.2.ebuild
index b1286587a5c1..5ab7ab8ce65b 100644
--- a/dev-python/pytools/pytools-2021.2.ebuild
+++ b/dev-python/pytools/pytools-2021.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index b814e5eb7526..d030de8db293 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">pyxdg</remote-id>
<remote-id type="launchpad">pyxdg</remote-id>
- <remote-id type="cpe">cpe:/a:python:pyxdg</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:pyxdg</remote-id>
<bugs-to>https://bugs.freedesktop.org/</bugs-to>
<doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
</upstream>
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index bfbd68b5228d..b20ec289ab7e 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -6,7 +6,7 @@
<name>Python</name>
</maintainer>
<upstream>
- <remote-id type="cpe">cpe:/a:pyyaml:pyyaml</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:pyyaml:pyyaml</remote-id>
<remote-id type="pypi">PyYAML</remote-id>
<remote-id type="github">yaml/pyyaml</remote-id>
</upstream>
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
index cb4d7e39c441..7430e18e4140 100644
--- a/dev-python/reportlab/reportlab-3.5.66.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.66.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
media-libs/freetype
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index 79256fc771d5..a4c5e77b3a69 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -13,7 +13,7 @@
</longdescription>
<upstream>
<remote-id type="pypi">requests</remote-id>
- <remote-id type="cpe">cpe:/a:python:requests</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:requests</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index 398066410d82..f5dfc88ebe6b 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -9,7 +9,7 @@
<remote-id type="pypi">rope</remote-id>
<remote-id type="sourceforge">rope</remote-id>
<remote-id type="github">python-rope/rope</remote-id>
- <remote-id type="cpe">cpe:/a:rope_project:rope</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:rope_project:rope</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index d7844a3ca802..53e1b030507f 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="github">alex/rply</remote-id>
<remote-id type="pypi">rply</remote-id>
- <remote-id type="cpe">cpe:/a:python:rply</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:rply</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index c0d9c04504ab..93a34c7c8228 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -13,7 +13,7 @@
<remote-id type="sourceforge">rpyc</remote-id>
<remote-id type="pypi">rpyc</remote-id>
<remote-id type="github">tomerfiliba-org/rpyc</remote-id>
- <remote-id type="cpe">cpe:/a:rpyc_project:rpyc</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:rpyc_project:rpyc</remote-id>
</upstream>
<use>
<flag name="numpy">Run tests depending on
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index 57cb37279926..e0d65174caf6 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">rsa</remote-id>
- <remote-id type="cpe">cpe:/a:python-rsa_project:python-rsa</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python-rsa_project:python-rsa</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 97384bab14bd..4ebc2b41a2e8 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,2 +1 @@
-DIST rst.linker-2.1.1.tar.gz 13492 BLAKE2B 0f53f3110c4a54e7eb36787ed08f81d0ce551174251203b7184ccbcc0153ee450e8e8927e8989b572b929219b1002019f49167482d59956ad96a54360317f998 SHA512 c49e6b3de41636184f75941d8fa258c2dad3d13a7d82b6221a10f583ada228a96f56abefce7840f93cbae8512332b69430601961cc396f3917b912e369b2b1b9
DIST rst.linker-2.2.0.tar.gz 14339 BLAKE2B fedeb8deea3ba3dc1f084a08476d2117787dd33c3ff2cd4c7881283e3c3e6813ffc143373812adfb4e578d21034d2c287a5af2b1e3dc9ae2f087cae9364d2ce3 SHA512 3e51103eb5111e1dd6e4e6f8c546a366eeb669d27b050de41a0580ac992117c530c322ed7cf31fd26a2f4a872ce8a7a41e801630e9291a6a644befd7272351a1
diff --git a/dev-python/rst-linker/rst-linker-2.1.1.ebuild b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
deleted file mode 100644
index 9fbd7b7169b9..000000000000
--- a/dev-python/rst-linker/rst-linker-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
- test? (
- dev-python/path-py[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs ">=dev-python/jaraco-packaging-3.2"
-distutils_enable_tests pytest
-
-python_test() {
- # Ignore the module from ${S}, use the one from ${BUILD_DIR}
- # Otherwise, ImportMismatchError may occur
- # https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
- # Override pytest options to skip flake8
- pytest -vv --ignore=rst --override-ini="addopts=--doctest-modules" \
- || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/rst-linker/rst-linker-2.2.0.ebuild b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
index c50f75b75cce..9681d43b426a 100644
--- a/dev-python/rst-linker/rst-linker-2.2.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
index 4a32a03848f4..88a8670f2ba3 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
index 19217bf3760e..b3c4e8b74b1e 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
IUSE="test"
RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-54.1.1.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
index 0c65816d481c..6da55debef23 100644
--- a/dev-python/setuptools/setuptools-54.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
BDEPEND="
test? (
diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index 9799bb06e668..6f279c167f53 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -11,7 +11,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">slixmpp</remote-id>
- <remote-id type="cpe">cpe:/a:slixmpp_project:slixmpp</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:slixmpp_project:slixmpp</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/sqlalchemy/metadata.xml b/dev-python/sqlalchemy/metadata.xml
index 590270061b5e..76df615fb7fb 100644
--- a/dev-python/sqlalchemy/metadata.xml
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">SQLAlchemy</remote-id>
<remote-id type="github">sqlalchemy/sqlalchemy</remote-id>
- <remote-id type="cpe">cpe:/a:sqlalchemy:sqlalchemy</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:sqlalchemy:sqlalchemy</remote-id>
<bugs-to>https://github.com/sqlalchemy/sqlalchemy/issues</bugs-to>
</upstream>
<origin>gentoo-staging</origin>
diff --git a/dev-python/thrift/metadata.xml b/dev-python/thrift/metadata.xml
index f330cdab75ac..ebaad654d956 100644
--- a/dev-python/thrift/metadata.xml
+++ b/dev-python/thrift/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">thrift</remote-id>
- <remote-id type="cpe">cpe:/a:apache:thrift</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:apache:thrift</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
index cf6718cbcb93..4b8531ec5852 100644
--- a/dev-python/twisted/metadata.xml
+++ b/dev-python/twisted/metadata.xml
@@ -19,7 +19,7 @@ twisted.trial: A unit testing framework that integrates well with Twisted-based
</longdescription>
<upstream>
<remote-id type="pypi">Twisted</remote-id>
- <remote-id type="cpe">cpe:/a:twistedmatrix:twisted</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:twistedmatrix:twisted</remote-id>
</upstream>
<use>
<flag name="conch">include Twisted SSHv2 implementation</flag>
diff --git a/dev-python/typed-ast/metadata.xml b/dev-python/typed-ast/metadata.xml
index 803cced65108..d2ef443da784 100644
--- a/dev-python/typed-ast/metadata.xml
+++ b/dev-python/typed-ast/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="github">python/typed_ast</remote-id>
<remote-id type="pypi">typed-ast</remote-id>
- <remote-id type="cpe">cpe:/a:python:typed_ast</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:typed_ast</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index c95094f1d0ee..a6debb615b86 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">urllib3</remote-id>
- <remote-id type="cpe">cpe:/a:python:urllib3</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:urllib3</remote-id>
<remote-id type="github">urllib3/urllib3</remote-id>
</upstream>
<use>
diff --git a/dev-python/validators/metadata.xml b/dev-python/validators/metadata.xml
index 333f6205cc86..ca6fbe660074 100644
--- a/dev-python/validators/metadata.xml
+++ b/dev-python/validators/metadata.xml
@@ -12,7 +12,7 @@
<upstream>
<remote-id type="pypi">validators</remote-id>
<remote-id type="github">kvesteri/validators</remote-id>
- <remote-id type="cpe">cpe:/a:validators_project:validators</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:validators_project:validators</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/virtualenv/metadata.xml b/dev-python/virtualenv/metadata.xml
index 32b732d567e3..70b64bb78acc 100644
--- a/dev-python/virtualenv/metadata.xml
+++ b/dev-python/virtualenv/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">virtualenv</remote-id>
<remote-id type="github">pypa/virtualenv</remote-id>
- <remote-id type="cpe">cpe:/a:python:virtualenv</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:python:virtualenv</remote-id>
</upstream>
<origin>gentoo-staging</origin>
<stabilize-allarches/>
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index 6a82b486f075..08feb77106ad 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -8,7 +8,7 @@
<upstream>
<remote-id type="pypi">Werkzeug</remote-id>
<remote-id type="github">pallets/werkzeug</remote-id>
- <remote-id type="cpe">cpe:/a:palletsprojects:werkzeug</remote-id>
+ <remote-id type="cpe">cpe:2.3:a:palletsprojects:werkzeug</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index ed8b94c8cf8b..ca4e15ddca9b 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,2 +1 @@
-DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
DIST yapf-0.31.0.tar.gz 176856 BLAKE2B 080867363df59615d1df77ef51645cd68d931251807da83c5b9d8737a89b01e8dee7457a2b524a76ad2eb21b859ad78168a30f706ef70c3b07bcb94a98990752 SHA512 5f376e985e182aab289c41e4071fd98c0784e5292974e2efcc4beaaca68cb83068b297e228a46f51f0d9370634dbd32948bdbd03e6b65c76b43efba0fe0d3454
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
deleted file mode 100644
index 21182c538f15..000000000000
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="A formatter for Python files"
-HOMEPAGE="https://github.com/google/yapf"
-SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/yapf/yapf-0.31.0.ebuild b/dev-python/yapf/yapf-0.31.0.ebuild
index 444768e93b96..9704d7fa963b 100644
--- a/dev-python/yapf/yapf-0.31.0.ebuild
+++ b/dev-python/yapf/yapf-0.31.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"