diff --git a/Manifest.files.gz b/Manifest.files.gz
index 636b7bb55ffe..65741711da23 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index c46e2a7a07bd..5e84e7158870 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/abrt/metadata.xml b/acct-group/abrt/metadata.xml
index f453528b934f..c300b31b6a76 100644
--- a/acct-group/abrt/metadata.xml
+++ b/acct-group/abrt/metadata.xml
@@ -1,8 +1,8 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
+
+ pacho@gentoo.org
+ Pacho Ramos
diff --git a/dev-util/appdata-tools/Manifest b/acct-group/headscale/Manifest
similarity index 100%
rename from dev-util/appdata-tools/Manifest
rename to acct-group/headscale/Manifest
diff --git a/acct-group/headscale/headscale-0.ebuild b/acct-group/headscale/headscale-0.ebuild
new file mode 100644
index 000000000000..73623757f6d6
--- /dev/null
+++ b/acct-group/headscale/headscale-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=514
diff --git a/acct-group/headscale/metadata.xml b/acct-group/headscale/metadata.xml
new file mode 100644
index 000000000000..73d345656db7
--- /dev/null
+++ b/acct-group/headscale/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ chris@lesscrowds.org
+ Chris Su
+
+
+ dlan@gentoo.org
+ Yixun Lan
+
+
+ jsmolic@gentoo.org
+ Jakov Smolić
+
+
diff --git a/acct-group/opendmarc/opendmarc-0.ebuild b/acct-group/opendmarc/opendmarc-0.ebuild
deleted file mode 100644
index ffdd3c7ce5ad..000000000000
--- a/acct-group/opendmarc/opendmarc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/opendmarc "
-ACCT_GROUP_ID=244
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index bbf99a97edd3..562bc3212bf4 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/abrt/metadata.xml b/acct-user/abrt/metadata.xml
index f453528b934f..c300b31b6a76 100644
--- a/acct-user/abrt/metadata.xml
+++ b/acct-user/abrt/metadata.xml
@@ -1,8 +1,8 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
+
+ pacho@gentoo.org
+ Pacho Ramos
diff --git a/acct-user/headscale/Manifest b/acct-user/headscale/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0.ebuild
new file mode 100644
index 000000000000..e30127cddfdb
--- /dev/null
+++ b/acct-user/headscale/headscale-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Headscale Server hosting user"
+
+ACCT_USER_ID=514
+ACCT_USER_HOME_OWNER=headscale:headscale
+ACCT_USER_HOME_PERMS=750
+ACCT_USER_GROUPS=( headscale )
+ACCT_USER_HOME=/var/lib/headscale
+
+acct-user_add_deps
diff --git a/acct-user/headscale/metadata.xml b/acct-user/headscale/metadata.xml
new file mode 100644
index 000000000000..73d345656db7
--- /dev/null
+++ b/acct-user/headscale/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ chris@lesscrowds.org
+ Chris Su
+
+
+ dlan@gentoo.org
+ Yixun Lan
+
+
+ jsmolic@gentoo.org
+ Jakov Smolić
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0fab7973179e..33b9c7bfb86d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 86b831972084..7b2a28767984 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,14 +1,6 @@
-DIST awscli-1.22.100.tar.gz 2196386 BLAKE2B 36f5b4df2111251fa78f2b83def150fd266b558006e9627b5a5b5e86318eedc160a5d2c5b906535c967ca1dbef8637619b5c0f8b7b8c88ef5f192c38e974c54b SHA512 6d8ecc2cd55e27e0eb7c23bd4633e0c3b6151b1a3df8db2557eb3010d9413a8561a736cd77b9d4745c9fb45269bd85800f17d9b6ba8abb2f25521b677e111329
+DIST aws-cli-1.23.0.gh.tar.gz 2197192 BLAKE2B 414646dc2e4ea5638185ab53e78e8de4403ff10084ce15ebbf5c67249722226769cd0eb02892ffb9bae5440956200417eb74393c6f393ec52a313fc55d9960a2 SHA512 27380033b02e88c6d022e8c33f0e4339e3c67b00cd2b7e92620ef2581e1ff8f55b55123aa4d4a24028c941f6ad60a0fe3e8f6d14d5a970163a97a2adb9ae93d6
+DIST aws-cli-1.23.1.gh.tar.gz 2197883 BLAKE2B 1e43b70319d58e689e2ccad38e0b6177c870888c798966a34837f93c340e39b2ac5d351a38e8bed830312931b5764ea6b390a50da9735864dce61a1666da7899 SHA512 a105f8fcfdd36467cc0f328c70a505458c228f69735b23306042944618fbb508efc061c671f7eb743efd13acbe5e4b6ee96205ff14b7f98685fa3f81b3958f9f
+DIST aws-cli-1.23.2.gh.tar.gz 2199816 BLAKE2B 7aef7ea7efb2b37b8d63fd64b2e86129d7588aa1d9b2a34d243cf99564be8dee282c4e48e08e900d0988dfe08eaa8af08cb7e79dee235354efb216db5bcb9996 SHA512 04c6324f02afe187c93827433184fbe0d2b82add88488becdcaedb904ddb10332dc93e0c995ef9467216ac19955318bdd9f128022aaa63245bc361ad2061bdc9
+DIST aws-cli-1.23.3.gh.tar.gz 2200496 BLAKE2B 4c264c2e551af9df2f84d405a08f1e386da3da48b1b8c6be285bbcbf8d9cd05429828ccbf52a606f0a8e50d440c307d1b03ebf2cf8ca58460384fda4352cb8e2 SHA512 8aa1a0005a4c8be400d9684a92af412815007c8c6f4f7b74915781e8dbb1182de450db194d41a5fdeab68ee5bf9c49329927284305ac76171719e8a3325a9f48
DIST awscli-1.22.101.tar.gz 2196746 BLAKE2B 590938e722e9dff00bcdb4a266f7063bca4e890f5db5e52b56ed710f5777c6e9de3cfe1423cee9ae2cea74d624bdd665cd8af487aec1ba4e650279c700540545 SHA512 ab99b95c5252c48a7a1d10adb053c56e27139e35bb512ce854e90a433e2d028aed2a88f72e518b0f723dea147919961e7cc7f5d980342206e629f750b0fe77ec
-DIST awscli-1.22.77.tar.gz 2179996 BLAKE2B fec49002841fa634bd2b7ae72f534bda875d69169179bbeb85eac18f2d9e9102121b6c0d73d8c7132ac0a6b8e5a8a39cea258d90c15f90b29b44d12ed509cfd1 SHA512 0fa89b6a2dd9dfc7e7be713c10b7470ad8fe8877a7fa9712510254cfbef36771f9e2541adfef9366e13e2273a373c2b88730572f7f1ad79c19f67e57c17e6631
-DIST awscli-1.22.82.tar.gz 2182473 BLAKE2B 0d73e62f7c394c1ac77f6b011e2303d9b48b8fd6d874360aef6b2fc4378feb8f9fa04b88e9c1ee8cf0cb5fb7d1884d4a08eee64093c151de274c1aa50777ebf3 SHA512 195061199fa3ed24b5be2a22a5d0ee2891bfb616239aaf54e5aa8715b3374e68edad613ea6e6b71a165e501b5a009856993259de3ac57f14ff3cd2a39453ec38
-DIST awscli-1.22.87.tar.gz 2185493 BLAKE2B 5d274e0c9483b22e664ad6de8710c04cc99f854b7c1efdac6dd4164deab47dc55d35520b34b276f8b4de1ee8b1ed10205b1806a31fc776d17b289a5e29277016 SHA512 c117fb8f89680836206f678637fb480ffd06db2225533bff75686eb8c1bd6e450297adb11863247441eeed67744b13930c0f62afce1dd12527d06d4e2eb58a4b
-DIST awscli-1.22.90.tar.gz 2186538 BLAKE2B 16b1942ee9fa65240a1b8b045b8e3e8659cc299a4cf52a876dae5cdc28088e7d6380c7961934fec590481aab5e71f60d08b21aac620a4485aa5872402c696549 SHA512 ef45718ebc2460e431f5177919a9d2e3de12dd68c9043b27f83ffb589672594fe7116ceed3b5e2fd62d502557a965cd0a3baf4af4de58c4a3176e39ba96e7076
-DIST awscli-1.22.91.tar.gz 2186925 BLAKE2B e7f6b4a5dce1b0f2752621628a28c7af75ce175b268c1b87a6516ad4bbc83738afdbef52d23e050febd3c351006aad2ecec9ce6d3052454b4f9352d3d5cde143 SHA512 b14e1d2da753ded2e90d72619ab205d9af6ec561cf01a8cbb09931a70338e50a8efe4555633f695ab4a486670e31e48ee1eba13e3943a728502e3aa0783f4c51
-DIST awscli-1.22.92.tar.gz 2187466 BLAKE2B 570e2fbb3efa0cf1664acbe6cd995799b98142ccea4fb36a967e3b3a77da4947295b4c0c9376a6c8780c0c9109ebe2e1a5e24dfd6cfb758960a6df24b8296f0c SHA512 022b9c12a71eaf62a6bea30df33d9f30ee309c77690cb6b08b770e987adf3e5cf8581b0a097c0f4466c73e82d1daacc42cd73eff48390ef3c5ca3cc49bc37a23
-DIST awscli-1.22.93.tar.gz 2187925 BLAKE2B c4b13aada04aea6b320c9b93c83cce11a4081e6b13cb7e3a83f2ee2ba651de4dbf636cfaefeee049a5ab91519bbfa6bbea37bd5a0a06a84979684bbf7c90c65c SHA512 c13d363ffff11fe30d3b78966caebb9026bcdbb4a6b9eb6e641de4955f9f360b6a4ecae25e1315d3e4943ea341f0f4c3be2aacf5849be3906d1fb0b0a9102490
-DIST awscli-1.22.94.tar.gz 2194607 BLAKE2B 985ce46ac8c3a12abc983fda4d424dbfa5c5da26c5552af9895079bc1aaa925e7f0c35f469f6b7f917007e162ce340adc68e4ae1c79f72c673bdf965ee550cfa SHA512 d34ad97d50de64591f0239de94b81d2ab77f8f4e284a356abe684bcd4c4d8f4a2d5e47d67e7b59322898d4f5b3503991eb550a424f894001aec547fe07e58923
-DIST awscli-1.22.96.tar.gz 2195648 BLAKE2B 57793e65d63151b150015ef90784140a9d473618849500d81bcb94582c5bc7a66b52337148b3f5c4c6b7196d2ab302fa0592dda3d83f2ff3d4fe845d687d18cf SHA512 71fb2bbc3586868566996cb807d01e582d181d96e52754c7052fc93040124ac7a73813f10fb1b660458772155aaa4f0a4294a583d429717e0bf1f6b785f5b963
DIST awscli-1.22.97.tar.gz 2193983 BLAKE2B f2e0efbb2332d4c405d5e97ba35426424d932a013114492890018d3419349e23aa3c8301f6c29bd8eaa662145b07ceaa30c22e41aad38012ca307400075600ca SHA512 00426aab19fcdf3241850b09d4d5dd6a1460e3ec9baa37cf203068dc6ca0fddd4fe3de7e4e93e8e6539608351777e00692bb8b9d2c362ceeacc55071cd53f422
-DIST awscli-1.22.98.tar.gz 2195040 BLAKE2B 08af6d73a9a719d358bbe60f0d7194ff80c2574d9ca4fb5f3ba0d050a63773aa97077784434f89d502aabe6b67c2aa328e9d291c0204038789f59fd78b8b4965 SHA512 2522e6b0f1b8fca8974ab06d69863b2a286c42e4d0b8939c6580b945beae1bc9d74f65f1de714c46ef4bb1ad154d4cbf37e88b05458961cd6bf6953474358b60
-DIST awscli-1.22.99.tar.gz 2195677 BLAKE2B f52b429a7ed984fe9fb9020361b21663189c5cadf873d333cf98c255aeeb7c6acdfb533ab995b3326efbf50948d3c4fc028fc256596601380d98ed54f157c208 SHA512 61a0901cad71eeba4d7b7ea24538e4b7455a844c64dfe61c40cb54f1b03122faf3d632ffd533f347ce0f9cdb29996c45d7df5c09ab158b38759ac2e55d3ab07d
diff --git a/app-admin/awscli/awscli-1.22.100.ebuild b/app-admin/awscli/awscli-1.22.100.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.100.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.77.ebuild b/app-admin/awscli/awscli-1.22.77.ebuild
deleted file mode 100644
index 78fdd937eb64..000000000000
--- a/app-admin/awscli/awscli-1.22.77.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.82.ebuild b/app-admin/awscli/awscli-1.22.82.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.82.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.87.ebuild b/app-admin/awscli/awscli-1.22.87.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.87.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.90.ebuild b/app-admin/awscli/awscli-1.22.90.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.90.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.91.ebuild b/app-admin/awscli/awscli-1.22.91.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.91.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.92.ebuild b/app-admin/awscli/awscli-1.22.92.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.92.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.93.ebuild b/app-admin/awscli/awscli-1.22.93.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.93.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.94.ebuild b/app-admin/awscli/awscli-1.22.94.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.94.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.96.ebuild b/app-admin/awscli/awscli-1.22.96.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.96.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.97.ebuild b/app-admin/awscli/awscli-1.22.97.ebuild
index 2040c8cb81d2..78fdd937eb64 100644
--- a/app-admin/awscli/awscli-1.22.97.ebuild
+++ b/app-admin/awscli/awscli-1.22.97.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/aws-cli-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
# awscli 1.22.55 → botocore 1.24.0
# so botocore is x.(y+2).(z-55)
diff --git a/app-admin/awscli/awscli-1.22.98.ebuild b/app-admin/awscli/awscli-1.22.98.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.98.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.99.ebuild b/app-admin/awscli/awscli-1.22.99.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.99.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.23.0.ebuild b/app-admin/awscli/awscli-1.23.0.ebuild
new file mode 100644
index 000000000000..c9a5eb0d75aa
--- /dev/null
+++ b/app-admin/awscli/awscli-1.23.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.23.1.ebuild b/app-admin/awscli/awscli-1.23.1.ebuild
new file mode 100644
index 000000000000..c9a5eb0d75aa
--- /dev/null
+++ b/app-admin/awscli/awscli-1.23.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.23.2.ebuild b/app-admin/awscli/awscli-1.23.2.ebuild
new file mode 100644
index 000000000000..c9a5eb0d75aa
--- /dev/null
+++ b/app-admin/awscli/awscli-1.23.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.23.3.ebuild b/app-admin/awscli/awscli-1.23.3.ebuild
new file mode 100644
index 000000000000..c9a5eb0d75aa
--- /dev/null
+++ b/app-admin/awscli/awscli-1.23.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/eselect/eselect-1.4.20.ebuild b/app-admin/eselect/eselect-1.4.20.ebuild
index 68a003da8b50..2c4e05c15d73 100644
--- a/app-admin/eselect/eselect-1.4.20.ebuild
+++ b/app-admin/eselect/eselect-1.4.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
DEPEND="sys-apps/sed
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 0a94e8d86f1c..0a8f1276fb12 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.52.1.tar.gz 5594576 BLAKE2B c8cd5011014b9eee899afe7cdd1d45708be221d33772c858c5fb4d62ece0ecec3cdef0aa106c9ce2b0604cb9735cc17674f65274f88becb6c6f7eaaf2643d29f SHA512 25612b8dfd1ce55a1860f75357977ca8cccd0b24860eb091a203c84895c449b59ee5788e6a9e71168cf1927d3d6584cd5f379a3e32565215dcc1ea7210d38714
+DIST exo-1.53.0.tar.gz 5597243 BLAKE2B ed9536a3e62b8344aef4d5a3edb3948615b96360bd302c90c16ba366eeb50a869200de39de45f3fbd6a1a3dfff7e42622720dffcbb91cb9c0cdf402f6eac8a2d SHA512 471c7024cdddb7734218fc942bb38593de759d408c859c135672d7bbf870c554dabb6eaf216ca20616e0b2d4eea487731f2142b39fda7daea5104f077bce99a1
diff --git a/app-admin/exo/exo-1.52.1.ebuild b/app-admin/exo/exo-1.53.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.52.1.ebuild
rename to app-admin/exo/exo-1.53.0.ebuild
diff --git a/app-admin/filebeat/filebeat-7.17.3.ebuild b/app-admin/filebeat/filebeat-7.17.3.ebuild
index f1697569b7b0..808b401322c3 100644
--- a/app-admin/filebeat/filebeat-7.17.3.ebuild
+++ b/app-admin/filebeat/filebeat-7.17.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://media.githubusercontent.com/media/hydrapolic/gentoo-dist/mast
LICENSE="Apache-2.0 BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RESTRICT="test"
S="${WORKDIR}/beats-${PV}"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild
index 26172c5340d4..0f206b5ca18b 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-admin/puppet-agent/puppet-agent-7.15.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.15.0.ebuild
index 3ef55d1516d2..0776db0b3b8b 100644
--- a/app-admin/puppet-agent/puppet-agent-7.15.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.15.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet/puppet-7.15.0.ebuild b/app-admin/puppet/puppet-7.15.0.ebuild
index 98baf706218d..b0c6d6d3ffe3 100644
--- a/app-admin/puppet/puppet-7.15.0.ebuild
+++ b/app-admin/puppet/puppet-7.15.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppetserver/puppetserver-7.6.1.ebuild b/app-admin/puppetserver/puppetserver-7.6.1.ebuild
index 6877b38e3a99..7323a3ecf896 100644
--- a/app-admin/puppetserver/puppetserver-7.6.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.6.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/sudo/sudo-1.9.10-r1.ebuild b/app-admin/sudo/sudo-1.9.10-r1.ebuild
index 5c23d70b6741..4525f835e918 100644
--- a/app-admin/sudo/sudo-1.9.10-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.10-r1.ebuild
@@ -30,7 +30,7 @@ else
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
)"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris"
fi
fi
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index e564278af209..780a52b7323f 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,2 +1 @@
-DIST sysklogd-2.2.3.tar.gz 441630 BLAKE2B e23b95aea9d98effc6a88dd14c4fafa358274ea839e7a07ab51bd0257fe0398a1ba6b629c4711d679fffaf03f04c177454f536bdd78dcad2b9f2ae36ff91138e SHA512 db1675256f0f0b0874e2e6a68fb086294bef1d6d3f3e9a6470f8d797ae504b2ab03ed23dc2753c8108a230c3f617e67c4a71e099a2ffeb7ffc8a0efdd07e8d17
DIST sysklogd-2.3.0.tar.gz 441168 BLAKE2B fa2ec9975d51bcb26d7acc88ab02e211453fc7e6d722ec6d38543a20833ae9c49b9a274d323e7a32deb82ca9c38025947e25b15424084a0ce345410a2e686a4d SHA512 7a16dd3f45a71015ad055e64aa62f4f94b0a8aa739f407c03376241cbc16ff764a768a698362cb428d150b169934798b774622b330903b287f9af5dd846775fc
diff --git a/app-admin/sysklogd/sysklogd-2.2.3.ebuild b/app-admin/sysklogd/sysklogd-2.2.3.ebuild
deleted file mode 100644
index baf95bc3eca5..000000000000
--- a/app-admin/sysklogd/sysklogd-2.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
- SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate systemd"
-RESTRICT="test"
-
-DEPEND="
- logger? (
- !=sys-apps/util-linux-2.34-r3[logger]
- )
-"
-RDEPEND="${DEPEND}
- logrotate? ( app-admin/logrotate )"
-
-DOCS=( ChangeLog.md README.md )
-
-pkg_setup() {
- append-lfs-flags
- tc-export CC
-}
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --runstatedir="${EPREFIX}"/run
- $(use_with logger)
- $(use_with systemd systemd $(systemd_get_systemunitdir))
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- insinto /etc
- doins syslog.conf
- keepdir /etc/syslog.d
-
- newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
- newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
- if use logrotate ; then
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/sysklogd.logrotate sysklogd
- sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
- fi
-
- find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
- elog "Starting with version 2.0 syslogd has built in log rotation"
- elog "functionality that does no longer require a running cron daemon."
- elog "So we no longer install any log rotation cron files for sysklogd."
- fi
- if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
- elog "Starting with version 2.1 sysklogd no longer provides klogd."
- elog "syslogd now also logs kernel messages."
- fi
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index edf72da2c56a..ba0ed29f4292 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 27ae77914b3c..a3ee12f8c36c 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static static-libs"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
diff --git a/app-arch/gzip/gzip-1.12.ebuild b/app-arch/gzip/gzip-1.12.ebuild
index 44f2e8296946..dd0eefb15a93 100644
--- a/app-arch/gzip/gzip-1.12.ebuild
+++ b/app-arch/gzip/gzip-1.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
diff --git a/app-arch/libarchive/libarchive-3.6.1.ebuild b/app-arch/libarchive/libarchive-3.6.1.ebuild
index 47d0bd5ee050..41cfc71f5a04 100644
--- a/app-arch/libarchive/libarchive-3.6.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
diff --git a/app-arch/lz4/lz4-1.9.3-r1.ebuild b/app-arch/lz4/lz4-1.9.3-r1.ebuild
index 2282b90c9bcc..38782d08dbc3 100644
--- a/app-arch/lz4/lz4-1.9.3-r1.ebuild
+++ b/app-arch/lz4/lz4-1.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2 GPL-2"
# https://abi-laboratory.pro/tracker/timeline/lz4/
SLOT="0/r132"
-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 ~loong ~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="static-libs"
CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lzlib/lzlib-1.13.ebuild b/app-arch/lzlib/lzlib-1.13.ebuild
index 361f4e8a03b5..24d8f8d6687f 100644
--- a/app-arch/lzlib/lzlib-1.13.ebuild
+++ b/app-arch/lzlib/lzlib-1.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
diff --git a/app-arch/plzip/plzip-1.10.ebuild b/app-arch/plzip/plzip-1.10.ebuild
index de5e91174f43..55ac23ad823f 100644
--- a/app-arch/plzip/plzip-1.10.ebuild
+++ b/app-arch/plzip/plzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
RDEPEND="app-arch/lzlib:0="
DEPEND="${RDEPEND}"
diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest
index f06cb6cf6c16..1b846d80de10 100644
--- a/app-arch/stenc/Manifest
+++ b/app-arch/stenc/Manifest
@@ -1,3 +1,4 @@
DIST stenc-1.0.7.tar.gz 107096 BLAKE2B 678be2fea4eb3db5cf84a70243fd61dcb574627bacb59b2f9af682e2e0851d41187565b4706313c98bb5b297f865b1424bc47c52f15efa2a2e8b2c7413b09009 SHA512 84cb0114c969e1a5122a8621d2c136663ee2a2d9aae1d455631c1d4555e947f4841004b74a1f63b800be713cfae637c19ea34adf40f0bc81f1c56a555a27ba31
DIST stenc-1.0.8.tar.gz 29297 BLAKE2B 269310fb7a9063eb3b367dfec534096201003e6178a31aeb73aa7a73ed0473d4a606634ac9cf7377d17240dee074345efa49fc907d9487f573a75ec44c3454f6 SHA512 4fd882861d248cf59cde1782833bd3e4f7e01e8b6c00424c55f26454a620510b22de0d42f2d7f6c4e67c2b277776a174fe687756a75f410026fda55554f9dc87
DIST stenc-1.1.0.tar.gz 31822 BLAKE2B f132c74ac84f38b312a8fa74f0a0fbfd253748bbc0516e5f5a860dbeb4ad4683ad965858c73f2fba58075074e9fae6c6fadf66c9da2bd85bf88de877439f66ad SHA512 d73eb349ad06979803caaa89af1068ef3732830b99557b7ca62d5cb357d7a105d1c884fea3c227b18e906a80f17581c08fe276f92ad698cd0dfca4919fe73fa9
+DIST stenc-1.1.1.tar.gz 161761 BLAKE2B 865d36befd53e1db00245688e2aac429546b29f7b039cbd04aaafb47fcc55f02ba01e7f13c7814ae4daf102372eded1f069c1b9ecfb2b2e7aaf009bfa2855ae4 SHA512 89eb1da2391be207e23d4e3cc6563405272eeb456b59360e92fbeca063badcfcf4c37fc814af59803707006e5c04e43e18755e1d30b0f3b3020a7645396db1a6
diff --git a/app-arch/stenc/stenc-1.1.1.ebuild b/app-arch/stenc/stenc-1.1.1.ebuild
new file mode 100644
index 000000000000..ab03524d5efc
--- /dev/null
+++ b/app-arch/stenc/stenc-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/scsitape/stenc.git"
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/scsitape/stenc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
+HOMEPAGE="https://github.com/scsitape/stenc/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index 40fdc747ffb7..d8a77bc9b826 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
LICENSE="GPL-3+"
SLOT="0"
if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="acl minimal nls selinux xattr"
diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild
index b28a3acf9fc0..78e5c99af635 100644
--- a/app-arch/unzip/unzip-6.0_p26.ebuild
+++ b/app-arch/unzip/unzip-6.0_p26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
index b4c00cf4b51d..752953853e1d 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
S="${WORKDIR}/${MY_P}"
fi
diff --git a/app-arch/zstd/zstd-1.5.2.ebuild b/app-arch/zstd/zstd-1.5.2.ebuild
index 13b97f431df0..f255feaadc52 100644
--- a/app-arch/zstd/zstd-1.5.2.ebuild
+++ b/app-arch/zstd/zstd-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="lz4 static-libs +threads"
RDEPEND="app-arch/xz-utils
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9c60c2849188..2fa5c2ceb1a9 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index f08fa93f29ea..81a72c05dff6 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1 +1,2 @@
DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
+DIST BackupPC-4.4.0.tar.gz 657309 BLAKE2B db977b73b09e1b2a051e38ecc94567cb516e2b11eca79c23bb0c4eef508e78cbbc984aaee4c84dc4ecd0524d849195c14dfe395ff97f77b6c7cf8adff152d75e SHA512 0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418
diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 5d45affdb88d..3268596ed982 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ MY_P="BackupPC-${PV}"
inherit depend.apache systemd
DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/"
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild b/app-backup/backuppc/backuppc-4.4.0.ebuild
new file mode 100644
index 000000000000..9cdff04fee51
--- /dev/null
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="BackupPC-${PV}"
+
+inherit depend.apache systemd
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rss samba"
+
+DEPEND="
+ acct-group/backuppc
+ acct-user/backuppc
+ app-admin/apache-tools
+ app-admin/makepasswd
+ dev-lang/perl
+"
+
+# The CGI modules are handled in ${RDEPEND}.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+# Older versions of mod_perl think they're compatible with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="
+ ${DEPEND}
+ app-arch/par2cmdline
+ dev-perl/Archive-Zip
+ dev-perl/CGI
+ dev-perl/File-RsyncP
+ dev-perl/libwww-perl
+ dev-perl/BackupPC-XS
+ net-misc/rsync-bpc
+ virtual/mta
+ virtual/perl-IO-Compress
+ www-apache/mod_perl
+ www-apache/mpm_itk
+ || (
+ >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+ >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+ )
+ rss? ( dev-perl/XML-RSS )
+ samba? ( net-fs/samba )"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="${EROOT}/etc/${EPREFIX}"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+need_apache2_4
+
+src_prepare() {
+ default
+
+ # Fix docs location using the marker that we've patched in.
+ sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die
+}
+
+src_install() {
+ local myconf
+ if use samba ; then
+ myconf=(
+ --bin-path smbclient=$(type -p smbclient)
+ --bin-path nmblookup=$(type -p nmblookup)
+ )
+ fi
+
+ /usr/bin/env perl ./configure.pl \
+ --batch \
+ --bin-path perl=$(type -p perl) \
+ --bin-path tar=$(type -p tar) \
+ --bin-path rsync=$(type -p rsync) \
+ --bin-path ping=$(type -p ping) \
+ --bin-path df=$(type -p df) \
+ --bin-path ssh=$(type -p ssh) \
+ --bin-path sendmail=$(type -p sendmail) \
+ --bin-path hostname=$(type -p hostname) \
+ --bin-path gzip=$(type -p gzip) \
+ --bin-path bzip2=$(type -p bzip2) \
+ --config-dir "${CONFDIR}" \
+ --install-dir /usr \
+ --data-dir "${DATADIR}" \
+ --hostname 127.0.0.1 \
+ --uid-ignore \
+ --dest-dir "${D}" \
+ --html-dir "${CGIDIR}"/image \
+ --html-dir-url /image \
+ --cgi-dir "${CGIDIR}" \
+ --fhs \
+ ${myconf[@]} || die "failed the configure.pl script"
+
+ ebegin "Installing documentation"
+
+ pod2man \
+ -errors=none \
+ --section=8 \
+ --center="BackupPC manual" \
+ "${S}"/doc/BackupPC.pod backuppc.8 \
+ || die "failed to generate man page"
+
+ doman backuppc.8
+
+ # Place the documentation in the correct location
+ dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.html"
+ dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.pod"
+ rm -rf "${ED}/usr/share/doc" || die
+
+ eend 0
+
+ # Setup directories
+ dodir "${CONFDIR}/pc"
+
+ keepdir "${CONFDIR}"
+ keepdir "${CONFDIR}/pc"
+ keepdir "${DATADIR}"/{trash,pool,pc,cpool}
+ keepdir "${LOGDIR}"
+
+ ebegin "Setting up init.d/conf.d/systemd scripts"
+ newinitd "${S}"/systemd/init.d/gentoo-backuppc backuppc
+ newconfd "${S}"/systemd/init.d/gentoo-backuppc.conf backuppc
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto "${APACHE_MODULES_CONFDIR}"
+ doins "${FILESDIR}"/99_backuppc.conf
+
+ # Make sure that the ownership is correct
+ chown -R backuppc:backuppc "${D}${CONFDIR}" || die
+ chown -R backuppc:backuppc "${D}${DATADIR}" || die
+ chown -R backuppc:backuppc "${D}${LOGDIR}" || die
+
+ eend 0
+}
+
+pkg_postinst() {
+ elog "Installation finished, you may now start using BackupPC."
+ elog
+ elog "- Read the documentation in ${EROOT}/usr/share/doc/${PF}/BackupPC.html"
+ elog " Please pay special attention to the security section."
+ elog
+ elog "- You can launch backuppc by running:"
+ elog
+ elog " # /etc/init.d/backuppc start"
+ elog
+ elog "- To enable the GUI, first edit ${EROOT}/etc/conf.d/apache2 and add,"
+ elog
+ elog " \"-D BACKUPPC -D PERL -D MPM_ITK\""
+ elog
+ elog " to the APACHE2_OPTS line."
+ elog
+ elog " Then you must edit ${EROOT}/etc/apache2/modules.d/00_mpm_itk.conf"
+ elog " and adjust the values of LimitUIDRange/LimitGIDRange to include"
+ elog " the UID and GID of the backuppc user."
+ elog
+ elog " Finally, start apache:"
+ elog
+ elog " # /etc/init.d/apache2 start"
+ elog
+ elog " The web interface should now be running on,"
+ elog
+ elog " http://127.0.0.1:8080/"
+ elog
+
+ # Generate a new password if there's no auth file
+ if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
+ adminuser="backuppc"
+ adminpass=$(makepasswd --chars=12)
+ htpasswd -bc "${CONFDIR}/users.htpasswd" ${adminuser} ${adminpass}
+
+ elog ""
+ elog "- Created admin user ${adminuser} with password ${adminpass}"
+ elog " To add new users, run: "
+ elog ""
+ elog " # htpasswd ${CONFDIR}/users.htpasswd newUser"
+ fi
+}
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index 63af74d14b21..4d83df8d74ca 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ kernlpanic@dennis-eisele.de
+ Dennis Eisele
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
backuppc
backuppc/backuppc
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 5ba939cd025f..9218501d7501 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,2 +1,2 @@
-DIST snapper-0.10.0.tar.gz 404564 BLAKE2B 2dd3f889cf445e06975b5a6f1088d07445510c6905dacecd5b75c0b92c155d399b9b6ed07e466303e4ea3e4b3e6aa72f57b9a34fc2b3aa97c328d886732a375c SHA512 eb0b8568f90907a84dd6f6e135f26cddbafbb8a420f2e4c3ad657d4d782ff35517da93c375d9796dbac1a03983e8b88084280347b51eadf869294dcc080dbfeb
+DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0
DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
diff --git a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch b/app-backup/snapper/files/snapper-0.10.0-testsuite.patch
deleted file mode 100644
index 643c98bf1a70..000000000000
--- a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3f5c911..a8c9c95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
-
- PAM_SECURITY=${libdir}/security
-
-+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
-+ [with_tests=$enableval],[with_tests=yes])
-+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
-+if test "x$with_tests" = "xyes"; then
-+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
-+fi
-+
- AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]),
- [with_pam_security=$withval], [with_pam_security=no])
- AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"])
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..9c29477 100644
---- a/testsuite-cmp/Makefile.am
-+++ b/testsuite-cmp/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-cmp
- #
-
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir)
- AM_LDFLAGS = -lboost_system
-
-@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
-
- EXTRA_DIST = $(noinst_SCRIPTS)
-
-+endif
-diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
-index ceb0862..9a72775 100644
---- a/testsuite-real/Makefile.am
-+++ b/testsuite-real/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-real
- #
-
-+if ENABLE_TESTS
- CXXFLAGS += -std=gnu++11
-
- AM_CPPFLAGS = -I$(top_srcdir)
-@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
-
- EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
-
-+endif
-diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
-index ccb84d3..409e265 100644
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite
- #
-
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
-
- LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
-@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
- range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
- limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-+endif
-diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
-index 7b52e13..71cb545 100644
---- a/zypp-plugin/testsuite/Makefile.am
-+++ b/zypp-plugin/testsuite/Makefile.am
-@@ -1,3 +1,5 @@
-+
-+if ENABLE_TESTS
- if HAVE_ZYPP
- TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
-
-@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
-
- EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
- endif
-+endif
diff --git a/app-backup/snapper/files/snapper-0.10.1-testsuite.patch b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch
new file mode 100644
index 000000000000..84ff2ce1978a
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.ac b/configure.ac
+index 39def82..9b96a32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -174,6 +174,13 @@ if test "x$enable_coverage" = "xyes"; then
+ LDFLAGS="${LDFLAGS} --coverage"
+ fi
+
++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
++ [with_tests=$enableval],[with_tests=yes])
++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
++if test "x$with_tests" = "xyes"; then
++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
++fi
++
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
+index 81104bf..9c29477 100644
+--- a/testsuite-cmp/Makefile.am
++++ b/testsuite-cmp/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-cmp
+ #
+
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir)
+ AM_LDFLAGS = -lboost_system
+
+@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
+
+ EXTRA_DIST = $(noinst_SCRIPTS)
+
++endif
+diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
+index a3bb2e3..c4e88f4 100644
+--- a/testsuite-real/Makefile.am
++++ b/testsuite-real/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-real
+ #
+
++if ENABLE_TESTS
+ CXXFLAGS += -std=gnu++11
+
+ AM_CPPFLAGS = -I$(top_srcdir)
+@@ -56,3 +57,4 @@ ascii_file_SOURCES = ascii-file.cc
+
+ EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
+
++endif
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index ccb84d3..409e265 100644
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite
+ #
+
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
+ range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
++endif
+diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
+index 7b52e13..71cb545 100644
+--- a/zypp-plugin/testsuite/Makefile.am
++++ b/zypp-plugin/testsuite/Makefile.am
+@@ -1,3 +1,5 @@
++
++if ENABLE_TESTS
+ if HAVE_ZYPP
+ TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
+
+@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
+
+ EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
+ endif
++endif
diff --git a/app-backup/snapper/snapper-0.10.0.ebuild b/app-backup/snapper/snapper-0.10.1.ebuild
similarity index 100%
rename from app-backup/snapper/snapper-0.10.0.ebuild
rename to app-backup/snapper/snapper-0.10.1.ebuild
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ffb063eb414e..b255e491456e 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/tiobench/tiobench-0.5.0.ebuild b/app-benchmarks/tiobench/tiobench-0.5.0.ebuild
index fdccf6c88e2f..7b04cdd9bf61 100644
--- a/app-benchmarks/tiobench/tiobench-0.5.0.ebuild
+++ b/app-benchmarks/tiobench/tiobench-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aliceinwire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 215071a0d04a..ae5546df0cce 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 7bd70955cc87..c8caa908e90f 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,8 @@
DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0aa552baf7372fd26f2e81d612b919590b698e512343644b68ba220f8f4f751cb66a7f4966df5ba7819563d5351a SHA512 2232e2df58a8470f152d5d91816e14017bcc702bf56c7ae6210f8f42069b2117172b9eabc8fcc1d1174aa7a1068ff444c98335f6c503c2e17137c76fe2602b8b
DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745
-DIST gnupg-2.3.4.tar.bz2 7589561 BLAKE2B 6e04a90a5ffac7d4701202e35071a48530ba86d8c64cab3ed1617df23358f4d564ddf6cdbc6c861890725344a19619e0f6791ccabd97b18b28dc4e6e01f7837b SHA512 a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758
-DIST gnupg-2.3.4.tar.bz2.sig 238 BLAKE2B e384c1528d015b4470eabfeffbe59db82cfc6522d739d6017f72f60a55959ded9cf031fec7b9b286f8020cdd429b2d07780205633d6fb459521ba96374fb3b3f SHA512 be43535068b1ad33458ad320e3ec37fad49341ebfb0846a2b21d2b87fd55696567df91abcea0b83e70ad1322832635279a4d0bf1f736ae6dd70e255c951bf0b3
+DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
+DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
DIST gnupg-2.3.5.tar.bz2 7601772 BLAKE2B b1044d8a62636be1fe870fe73213ffdefefc4b4f99b4cb1abcbc85679fda8ec855c1ac11296e2a37c7aef9bf0eec401bd3aafe68154a22df780512deb5ed77f8 SHA512 dcaf6a72179cbc21263f27c994100fbd45687daaa63e3a9a9668e26c25f331516e8c7b656cdce6c646e5fe29f0ad2e20b72ac364f242524fb3ead4e96e89520d
DIST gnupg-2.3.5.tar.bz2.sig 119 BLAKE2B 5377908e2ad968db06e870d17116827c9a332bd159aba2ff737131805b9f81d7ff44352ffb9af0006ec2d48934fcfc7af54965d948a8a043fe3a59b3600f8745 SHA512 f12e799274833a657317e997e85958cc450d57bb6a3a39a613d41de50953ab1363e0a38a4f4948f81f7da08dd00ccb2e141d6b2eb7f131ed2905d3c1666f7da2
+DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
+DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
diff --git a/app-crypt/gnupg/gnupg-2.2.35.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild
new file mode 100644
index 000000000000..ee9470ef9e05
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.35.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND=">=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.8.0:=
+ >=dev-libs/libgpg-error-1.29
+ >=dev-libs/libksba-1.3.5
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+ sys-libs/zlib
+ tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable tofu)
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+ --with-mailprog=/usr/libexec/sendmail
+ --disable-ntbtls
+ --enable-all-tests
+ --enable-gpg
+ --enable-gpgsm
+ --enable-large-secmem
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ fi
+
+ #bug 663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == *clang ]] && \
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ #Bug: 638574
+ use tofu && export TESTFLAGS=--parallel
+ default
+}
+
+src_install() {
+ default
+
+ use tools &&
+ dobin \
+ tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/* doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild b/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild
deleted file mode 100644
index 0a3104b6851c..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
- >=dev-libs/libgcrypt-1.9.1:=
- >=dev-libs/libgpg-error-1.41
- >=dev-libs/libksba-1.3.4
- >=dev-libs/npth-1.2
- >=net-misc/curl-7.10
- bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap:= )
- readline? ( sys-libs/readline:0= )
- smartcard? ( usb? ( virtual/libusb:1 ) )
- tofu? ( >=dev-db/sqlite-3.27 )
- tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
- ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}
- app-crypt/pinentry
- nls? ( virtual/libintl )
- selinux? ( sec-policy/selinux-gpg )
- wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
- doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
- ChangeLog NEWS README THANKS TODO VERSION
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
- default
-
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
- # idea borrowed from libdbus, see
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
- #
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
- # which in turn requires discovery in Autoconf, something that upstream deeply resents.
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
- local myconf=(
- $(use_enable bzip2)
- $(use_enable nls)
- $(use_enable smartcard scdaemon)
- $(use_enable ssl gnutls)
- $(use_enable tofu)
- $(use_enable tofu keyboxd)
- $(use_enable tofu sqlite)
- $(usex tpm '--with-tss=intel' '--disable-tpm2d')
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
- $(use_enable wks-server wks-tools)
- $(use_with ldap)
- $(use_with readline)
- --with-mailprog=/usr/libexec/sendmail
- --disable-ntbtls
- --enable-all-tests
- --enable-gpgsm
- --enable-large-secmem
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
- KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
- LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
- NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
- )
-
- if use prefix && use usb; then
- # bug #649598
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
- fi
-
- #bug 663142
- if use user-socket; then
- myconf+=( --enable-run-gnupg-user-socket )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called
- # by wks-client & wks-server; and if it's autodetected but not not exist at
- # build time, then then 'gpg-wks-client --send' functionality will not
- # work. This has an unwanted side-effect in stage3 builds: there was a
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
- # the build where the install guide previously make the user chose the
- # logger & mta early in the install.
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- use doc && emake -C doc html
-}
-
-src_test() {
- #Bug: 638574
- use tofu && export TESTFLAGS=--parallel
- default
-}
-
-src_install() {
- default
-
- use tools &&
- dobin \
- tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
- tools/make-dns-cert
-
- dosym gpg /usr/bin/gpg2
- dosym gpgv /usr/bin/gpgv2
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
- use doc && dodoc doc/gnupg.html/* doc/*.png
-
- systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.5-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.5-r1.ebuild
deleted file mode 100644
index 0a3104b6851c..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
- >=dev-libs/libgcrypt-1.9.1:=
- >=dev-libs/libgpg-error-1.41
- >=dev-libs/libksba-1.3.4
- >=dev-libs/npth-1.2
- >=net-misc/curl-7.10
- bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap:= )
- readline? ( sys-libs/readline:0= )
- smartcard? ( usb? ( virtual/libusb:1 ) )
- tofu? ( >=dev-db/sqlite-3.27 )
- tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
- ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}
- app-crypt/pinentry
- nls? ( virtual/libintl )
- selinux? ( sec-policy/selinux-gpg )
- wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
- doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
- ChangeLog NEWS README THANKS TODO VERSION
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
- default
-
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
- # idea borrowed from libdbus, see
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
- #
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
- # which in turn requires discovery in Autoconf, something that upstream deeply resents.
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
- local myconf=(
- $(use_enable bzip2)
- $(use_enable nls)
- $(use_enable smartcard scdaemon)
- $(use_enable ssl gnutls)
- $(use_enable tofu)
- $(use_enable tofu keyboxd)
- $(use_enable tofu sqlite)
- $(usex tpm '--with-tss=intel' '--disable-tpm2d')
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
- $(use_enable wks-server wks-tools)
- $(use_with ldap)
- $(use_with readline)
- --with-mailprog=/usr/libexec/sendmail
- --disable-ntbtls
- --enable-all-tests
- --enable-gpgsm
- --enable-large-secmem
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
- KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
- LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
- NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
- )
-
- if use prefix && use usb; then
- # bug #649598
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
- fi
-
- #bug 663142
- if use user-socket; then
- myconf+=( --enable-run-gnupg-user-socket )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called
- # by wks-client & wks-server; and if it's autodetected but not not exist at
- # build time, then then 'gpg-wks-client --send' functionality will not
- # work. This has an unwanted side-effect in stage3 builds: there was a
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
- # the build where the install guide previously make the user chose the
- # logger & mta early in the install.
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- use doc && emake -C doc html
-}
-
-src_test() {
- #Bug: 638574
- use tofu && export TESTFLAGS=--parallel
- default
-}
-
-src_install() {
- default
-
- use tools &&
- dobin \
- tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
- tools/make-dns-cert
-
- dosym gpg /usr/bin/gpg2
- dosym gpgv /usr/bin/gpgv2
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
- use doc && dodoc doc/gnupg.html/* doc/*.png
-
- systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild b/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild
new file mode 100644
index 000000000000..d32419deb726
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND=">=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.9.1:=
+ >=dev-libs/libgpg-error-1.41
+ >=dev-libs/libksba-1.3.4
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+ sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${P}-fix-buffering-hang.patch
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable tofu)
+ $(use_enable tofu keyboxd)
+ $(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+ --with-mailprog=/usr/libexec/sendmail
+ --disable-ntbtls
+ --enable-all-tests
+ --enable-gpgsm
+ --enable-large-secmem
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ fi
+
+ #bug 663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == *clang ]] && \
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ #Bug: 638574
+ use tofu && export TESTFLAGS=--parallel
+ default
+}
+
+src_install() {
+ default
+
+ use tools &&
+ dobin \
+ tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/* doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.3.6.ebuild b/app-crypt/gnupg/gnupg-2.3.6.ebuild
new file mode 100644
index 000000000000..e3e7a5c34b64
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND=">=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.9.1:=
+ >=dev-libs/libgpg-error-1.41
+ >=dev-libs/libksba-1.3.4
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+ sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable tofu)
+ $(use_enable tofu keyboxd)
+ $(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+ --with-mailprog=/usr/libexec/sendmail
+ --disable-ntbtls
+ --enable-all-tests
+ --enable-gpgsm
+ --enable-large-secmem
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ fi
+
+ #bug 663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == *clang ]] && \
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ #Bug: 638574
+ use tofu && export TESTFLAGS=--parallel
+ default
+}
+
+src_install() {
+ default
+
+ use tools &&
+ dobin \
+ tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/* doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gpgme/gpgme-1.17.1.ebuild b/app-crypt/gpgme/gpgme-1.17.1.ebuild
index 21d96ca5627f..1865282c490a 100644
--- a/app-crypt/gpgme/gpgme-1.17.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
# Subslot: SONAME of each:
SLOT="1/11.6.15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs +cxx python qt5"
# Note: On each bump, update dep bounds on each version from configure.ac!
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 3470ad02948c..24a130333c1a 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
index 90e78ab84267..367449ba15b4 100644
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
DEPEND="
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
index cffa5b85eb9b..647525cb2007 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
inherit wrapper
DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
-HOMEPAGE="https://project-rainbowcrack.com/"
-SRC_URI="https://project-${PN}.com/${P}-linux64.zip"
+HOMEPAGE="http://project-rainbowcrack.com/"
+SRC_URI="http://project-${PN}.com/${P}-linux64.zip"
LICENSE="all-rights-reserved"
SLOT="0"
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index d57cf5e83c4d..28eb73baa382 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
deleted file mode 100644
index e29bc69a26ce..000000000000
--- a/app-crypt/seahorse-sharing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
deleted file mode 100644
index 2fb2f6507630..000000000000
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes" # disable asserts
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
-HOMEPAGE="https://projects.gnome.org/seahorse/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- app-crypt/seahorse
- dev-libs/glib:2
- >=net-dns/avahi-0.6:=[dbus]
- net-libs/libsoup:2.4
- >=x11-libs/gtk+-3:3
-
- >=app-crypt/gpgme-1
- >=app-crypt/gnupg-1.4
-"
-RDEPEND="${COMMON_DEPEND}
- !
-Date: Tue, 24 Mar 2020 16:42:14 -0700
-Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
-
-PKG_CHECK_MODULES needs to be wrapped inside squere
-brackets when inside AS_IF, or it spit out errors:
-
-./configure: line 13054: JSONC_CFLAGS: command not found
-./configure: line 13055: C: command not found
-./configure: line 13056: JSONC_LIBS: command not found
-./configure: line 13155: CURL_CFLAGS: command not found
-./configure: line 13156: CURL_LIBS: command not found
-
-Signed-off-by: Tadeusz Struk
----
- Makefile.am | 2 +-
- configure.ac | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..9144a5ad 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
-
- src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
- src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
--src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
-+src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
- if HAVE_LD_VERSION_SCRIPT
- src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
- endif # HAVE_LD_VERSION_SCRIPT
-diff --git a/configure.ac b/configure.ac
-index a202d4a6..2edf609e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
- AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([JSON_C], [json-c]))
-+ [PKG_CHECK_MODULES([JSONC], [json-c])])
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([CURL], [libcurl]))
-+ [PKG_CHECK_MODULES([CURL], [libcurl])])
-
- AC_ARG_WITH([tctidefaultmodule],
- [AS_HELP_STRING([--with-tctidefaultmodule],
---
-2.26.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c37a73531c02..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 322415b8..39e09063 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -602,10 +602,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
-- (systemd-sysusers && systemd-tmpfiles --create) || \
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 2f756b654c2b..3bc4114184e6 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-cs/Manifest b/app-dicts/myspell-cs/Manifest
index 5f75d546a918..e8843121e6ac 100644
--- a/app-dicts/myspell-cs/Manifest
+++ b/app-dicts/myspell-cs/Manifest
@@ -1,2 +1 @@
-DIST myspell-cs-20110224.zip 1440618 BLAKE2B d90ae82b86ac0e01bc8a5b43bfcb5f7c95f216d5781dd050d798b942291c345966f7f535d74cbd17e5b42a387d0b2c7a7ed02a23bfe93c9bbb2fd0bcf5c192cd SHA512 9f2ed5e10771c00635f382c676b2f9184374b4c20a7d2262d3c441feae4d9dcddbd611cdaf74cb035c76c969d73d913d6116d9c1a4ab0a7a754bfbd8253c1ca5
DIST myspell-cs-20181003.zip 2040923 BLAKE2B 3b8908423dd87eadd07cda6f3299ac2255415ffd88d8df2e79762be142a7dc24f87fec2aa3f869f2d9e9229539597a70440a97fcc0cd100b3663ca130a02856f SHA512 6d113490663bc51e5f9734b9b227889f924c66bfa1d0d7b00da1d420d2e21a9fb9e74169b019c8014c02241b1f265a42091d3fbc09bbe38fbfb112632ae2fa4a
diff --git a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
deleted file mode 100644
index 643c873c0f8f..000000000000
--- a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "cs_CZ.aff"
- "cs_CZ.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_cs_CZ.dic"
-)
-
-MYSPELL_THES=(
- "th_cs_CZ_v3.dat"
- "th_cs_CZ_v3.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Czech dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.liberix.cz/doplnky/slovniky/ooo/"
-SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> ${P}.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-da/Manifest b/app-dicts/myspell-da/Manifest
index 049b7123e6a3..8afdec7e1e00 100644
--- a/app-dicts/myspell-da/Manifest
+++ b/app-dicts/myspell-da/Manifest
@@ -1,2 +1 @@
-DIST dict-da-2-3.oxt 1861736 BLAKE2B 18c22f55012a9701cff1ecadc53dece7cdc2e59619c1704159343960951096c49ab970bb248d844eaf24379053ea7ac35bd89b4741aa54cfb4b711e99320b256 SHA512 28428096ba6d79801fdf47a61bedc06c9ee2d667ae32307bd57f9b7cdc1cb06e84ac2bd78fba11c87dd35dc88d78c5e0f81588e5145267577ca0992b35ea301a
DIST myspell-da-2.6.oxt 2013864 BLAKE2B 4dd9fcecd79258331f3149f940a4251127517a68b0827797cb9ea6b7261bcaae57c76099dbc349b1e52d107e3fb969ccd094c046411404c0adb771321e16b271 SHA512 d5f07da5526468aa93869218bf409314afe20dd2987a192354c9cc08a71314b11290392ebf08c12dfb246e805af12b9a4a1e1f56ec8971e9bb9511b4757086ed
diff --git a/app-dicts/myspell-da/myspell-da-2.3.ebuild b/app-dicts/myspell-da/myspell-da-2.3.ebuild
deleted file mode 100644
index 6d0a98cfbf04..000000000000
--- a/app-dicts/myspell-da/myspell-da-2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "da_DK.aff"
- "da_DK.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_da_DK.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Danish dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary"
-SRC_URI="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
-SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/${PV}/@@download/file/dict-da-${PV/./-}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 5f43674a9e45..fc3e0c504a5d 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,3 +1 @@
-DIST dict-en-20170101.oxt 5960816 BLAKE2B 65505ed6e8323f28377728ac29e550cf151688517b83209b055966be4e7e14465aacc1d1677d22bc005089d7623e78e63bf91dcdffcde3a790532dba87b54615 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d
-DIST dict-en-20190101.oxt 6058651 BLAKE2B 617ded8d7df6e62767083be7b0651e1bd1e039f78ebb67e8371228805519195dd5acd4ca7d415a29b68697a369d070eafa5545d1b8bbcbab58774db61f03e8e5 SHA512 06e6a21b524c378041655cc44e04f26a35b16e1606a478c0702b96fcbeb86180593fc02d00cae8e05700ead0bd6568239434e8d3d733937587e7b009245dfe4c
DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
diff --git a/app-dicts/myspell-en/myspell-en-20170101.ebuild b/app-dicts/myspell-en/myspell-en-20170101.ebuild
deleted file mode 100644
index a258f8733421..000000000000
--- a/app-dicts/myspell-en/myspell-en-20170101.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
- "en_AU.aff"
- "en_AU.dic"
- "en_CA.aff"
- "en_CA.dic"
- "en_GB.aff"
- "en_GB.dic"
- "en_US.aff"
- "en_US.dic"
- "en_ZA.aff"
- "en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
- "th_en_US_v2.dat"
- "th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20190101.ebuild b/app-dicts/myspell-en/myspell-en-20190101.ebuild
deleted file mode 100644
index ed8e6932e08a..000000000000
--- a/app-dicts/myspell-en/myspell-en-20190101.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="BSD MIT LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
-IUSE+="${PLOCALES[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${IUSE[@]} )"
-
-src_prepare() {
- if use l10n_en-GB || use l10n_en; then
- MYSPELL_HYPH=( "hyph_en_GB.dic" )
- fi
- if use l10n_en-US || use l10n_en; then
- MYSPELL_THES=(
- "th_en_US_v2.dat"
- "th_en_US_v2.idx"
- )
- fi
-
- MYSPELL_DICT=( )
- for lang in "${PLOCALES[@]}"; do
- if [[ "${lang}" == "en" ]]; then
- continue
- fi
- local mylinguas="${lang//-/_}"
- if use "l10n_${lang}" || use l10n_en; then
- MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
- else
- rm "README_${mylinguas}.txt" || die
- if [[ ${lang} == "en-US" ]]; then
- rm "README_hyph_en_US.txt" || die
- fi
- if [[ ${lang} == "en-GB" ]]; then
- rm "README_hyph_en_GB.txt" || die
- rm "README_en_GB_thes.txt" || die
- fi
- fi
- done
-
- default
-}
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
index f4ccd7d28f0b..8115dff41500 100644
--- a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601
LICENSE="BSD MIT LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
IUSE+="${PLOCALES[@]/#/l10n_}"
diff --git a/app-dicts/myspell-eo/Manifest b/app-dicts/myspell-eo/Manifest
index 09973d8b58c1..48b5a3fe7583 100644
--- a/app-dicts/myspell-eo/Manifest
+++ b/app-dicts/myspell-eo/Manifest
@@ -1,2 +1 @@
DIST dict-eo.oxt 262322 BLAKE2B 9fd1ad4c2db88db773ebce6ba64646cafaf595e4fc501d9d14f43b4abe0942eca4ef04c6a58ea40500fdf1cf342338930a7b06c1466b3919acef7364ab30b53e SHA512 aabb701cfa794595c2efc8bdb7b1eef3753b457928fcd6ee64f4bafb62b0baeb3139c9c667f8b194eede56f2a05418b256ade049db12b1b040ae4ce15c295a21
-DIST myspell-eo-1.0.oxt 186407 BLAKE2B 9bf51c6fa343d5417811580f0db36d5d5c5d37b6939ee545a87ef1b3f661fa5268ff92dafddb8ff9b4ad7512c5d578bfa20c6bcf276c5a00d90cdbd67ee7197c SHA512 b5cf3a14672fb0e6b810e5b4d811f430b3c3cc38cf09a0083b7e26471597c6df055242349a2a239607621301f71527e8bf225dc03de727c5863e7b7b1c821824
diff --git a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
deleted file mode 100644
index 19b33e01c5e5..000000000000
--- a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "eo_l3.aff"
- "eo_l3.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Esperanto dictionaries for myspell/hunspell"
-HOMEPAGE="http://nlp.fi.muni.cz/projekty/esperanto_spell_checker/"
-SRC_URI="mirror://sourceforge/aoo-extensions/3377/1/${PV}-dev.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-src_prepare() {
- default
-
- # move the dicts for nicer name
- mv literumilo.aff eo_l3.aff || die
- mv literumilo.dic eo_l3.dic || die
-}
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
index 2213f66a7bd6..8d528c0a702c 100644
--- a/app-dicts/myspell-es/Manifest
+++ b/app-dicts/myspell-es/Manifest
@@ -1,67 +1,23 @@
DIST es-2.6.oxt 1456882 BLAKE2B 67acb86fa3bd0612f7d462ad25af69e722ae88ef59b269ed3be00045b9ce9d9d573cffb731e31c1437aec22c2690411b77fd6c6ca54c9c29f1d2745bdaded6c0 SHA512 24926603a5e1d3578e45fa8c5f4a82a3474c437fd73b1f2a7567849847e44f60d081ca5c6a4e18f9cc605aad0caf8ed5d2b9b0dc67ad6da43a3c0cef5212e651
-DIST es_ANY-0.7.oxt 1415886 BLAKE2B d7a74ba997abe1ffc2b59f6d8ffb12b652b2ce540f6e5ec8ac60e363a1e07e7b72bee030a24739a93626de45c700fddaec35d1112a20a33756717283d4ee892c SHA512 ea4e015bbaa86865537b0079b71160881abb78f651757aee784e032374f8cc96f2296b0f83081bd2543d35a246a2deca384ddd8a28a37f26b82d306b19ace3cd
-DIST es_ANY-2.3.oxt 1460673 BLAKE2B b7865fae1c555e99518e3f0f5b668742176cec6807753d50587edbd70aa0b88be3c70fd33f7fae0490827c084ef0e176bce41d71e982dc938aabc74aa327d683 SHA512 2131ec088aa4c46e4236b974f77f3a80299f816d3b493816b17eea5a4b7c7b5631efbb15fa3a2bec804db7e6723e02b5a894614c7966626662a5f778676dcb6c
-DIST es_AR-0.7.oxt 1437556 BLAKE2B a6f888d67c147f02c758c7c9f8949cfbcabcd03559b16bff0d409960adfca7f40527935dd106dd179f55efc65bf41713ebbb50fd330427e5313abf9424ef7941 SHA512 2c996a92cd3aba6edb979641025e45362d8079061423296430eaef113354f14defdfeb1e23c1d0b8a8157fdc914f07e7fde8c51560091a389e242a5b68552088
-DIST es_AR-2.3.oxt 1414045 BLAKE2B 52b898d26fc384a579147e0d20f34e0591ab7a4f13feb35a92cd070a9aa3f972f971ffd8025ea4a438570100300e163af4ed4cd80ff108ad1d31ec62089a1062 SHA512 c28217ebb49bd94b808787953440ab9702b3d46e0faa43e39f25e9dfbad915e4310be6fcaeb7ac16775bde5ea73641db79a53908dd11e9d16321c041afd4925f
DIST es_AR-2.6.oxt 1402278 BLAKE2B ac0cb625493482e91d33ea3e0f3738556deda68b799467d4c95811ff7e324dc6da82090a6557ce99ca2574afa4f75b0b92fd13937471f57f60aac43f09f3fe0b SHA512 70292809ad7894e24fe0981f3f81bf6f3f67c6447e4bdf020c42a72d6e6a4cc92b658df716b93c601ab557fcd6ba1f1994d9f3597461c02f062d7597d52b8e1c
-DIST es_BO-0.7.oxt 1435774 BLAKE2B c5907b14b157c1a48e29eb0d794112adf1578d73cd2bb7351164c793ab58da46387106b9a1b58be4024347701ba1c72f7b3fefa8ea3e2e984a06ebf2c309e26e SHA512 04549045546444c84f623552f6264d17ffe4cadd77f81b8e2828978f6172e275b203eb83aec1dfac17acbf3466cc3562d825071116de6af8c52510feaa7fc9de
-DIST es_BO-2.3.oxt 1411131 BLAKE2B 95510383e378a28d26bd4f58d479b1f419f6636e66f73562cb376b8422388b2c0a4c2cf8cc58f48d11dd55acf680498c9bbb0ac412bf3cf9ce9a63ddf8109ffe SHA512 ee15be0b8e96ffd2eff6c3adca60db9cf9e4a1eb9c6af3da29c3874283153b00c4c843313853c0bdcc277602fbb95c8d3e8abe15e25596e92804499e5f083590
DIST es_BO-2.6.oxt 1399256 BLAKE2B 7659beb5373f03375f7bdf7c37a14dcbec3a1e5f127cf5a20c805132ae754af32a3fbca3031b414a253e225e691fffb5f718c709120b1f6f9425322a05140250 SHA512 e77ba88f3f655d00997eabe986781a9efa8e855608e9fd478a7dc0971e5d76fb563d660c897fc7e0d20964be0a6431d8de97adaa78dc932cb2d1f691272167c6
-DIST es_CL-0.7.oxt 1436928 BLAKE2B ef1596c311a761cfb87c099ef54a88f89c3fcd755036268329bbc8d9d01de46c73d7890ccb376d3acbb2c838394c0f48cf8afe48811b8af95d4cf44855073f38 SHA512 13ff5459f83e06aba63e248fcd024aaa49afd38a65ff04ffca5a833e3f8a828cd3dde60629e8eb377ee6bdc86c5e686fa65867f2223b1f0861a9dc74fb020263
-DIST es_CL-2.3.oxt 1412287 BLAKE2B 14435cd7ae8700b0134c9e0b504c8fdb15c26a2f393167117294414243a98281f7d0620b719ab2fadfbb95bbc04fc618fc849b27de1a2010056e74207a2982b4 SHA512 824a38e7d508c1b3aafc7f9fd0173b9d752ec5edb9d07c40b2affca693a73f73aff5f816b45e901b67efd365dc34ed86e15af6c118173d8b1d5f39eb277d5bc2
DIST es_CL-2.6.oxt 1400390 BLAKE2B 6f3407a0d9fded82caf7828f0efc3ddb1dd5c903e2d2bf61cdcd7de6ed3f5dfb0ac24c089d527c8bdfff607150b31d20878b28b077b6d7c57ad7569aff8220a4 SHA512 c2032ab4e0991ea2051d7632ad4eec791960d96715db67680113a4fea1eeda7a5e513a78277b0948e89dd21d49b9286db15ce6709d3100b33bd0177a9664a7b3
-DIST es_CO-0.7.oxt 1437795 BLAKE2B 6da274fed6c1a272ae63b434698f2b9843428ece9edd9bef558489f5c88d8247e5b861b4933802a57fc10406b639c2559b024384702051eb1bd169c1c1c3879b SHA512 b071add498b9c60bb1db94dda7e2896ab109165d65142b4ac539e88434d9880b7b5d437769cc0475ce432f45b1832d648bed7925adc9cf4e678e183f5cdb5374
-DIST es_CO-2.3.oxt 1430059 BLAKE2B ff9999eb44326a53b16f02d3f63aa3bdd6f2df56f94dca6a3962a18b3161b889146746e6437cd39ce800314d78bfab41c6967dbcb837e17219490490371d9791 SHA512 3a709100eb6cb15b5f1bb20447372dbc67bd27536fd6515b9b1f35447d1b5bffdea0f0b9aee42ba43f81d5c4f5b5c857749ee86c60dd9590bd48df3c688a446a
DIST es_CO-2.6.oxt 1418062 BLAKE2B 8d2bbbdacdf37f53a21ddf559adbb6ec697f0af92683d03abb18f7bf2d8e65643ce62b818ef227d7068f1379ac9561c9de93ae0246927b847a73ad693b4855b1 SHA512 81b272cec7e2592e48454c9e14309bdce244c2705e38bbce790a9bf9e0a0f927206c5f9de3c2472fda85d946caac8cd8e008b6bb2f2f4adbc9fb9ba754d6f3d7
-DIST es_CR-0.7.oxt 1434858 BLAKE2B 5e3c7e9d19da1fae59e7a2cafa55dc956ffb324e0447edc6ded94f3d304b1be72b3fe17ace1a586c0d364fa49ae4ec52ca16a27044e266db9ce9e0a0f0dd829e SHA512 1ed3dc04e5bf187fa2ed4a4f8326537760541ef38d60abc33d729961eeac75e206e7e50dfe3e85bf0053e42a7307779f2508a16b04df5e4ab2752091182b2a68
-DIST es_CR-2.3.oxt 1409988 BLAKE2B 8064c0c89b25cad263076bb307881c4ff13d694081c903c111f7312b0bef824c3687b0cbe6453f7c67977082c0f793379632d300dacea31b3d70deb63efa1772 SHA512 a6c2b65f0975e554dd35465113b21a0b3821ed51028c68f52b2a72ae6b2796e43b0e7f21b1aff7491186d614d1b997a9483371a93e3a77bf12bf81efaa5429cf
DIST es_CR-2.6.oxt 1398273 BLAKE2B e219f818101c0e3a06c998b4b0aa8539b2a8d945d64ec441fc043996275dc65ab8bae7574c2ca3efbd61a89da2227b50438485ffbf8c890d30dab14bb3399f9b SHA512 54a035f777eadf8c35c87b7296328d1f64e78276c83d122505f68533bb4d13e6becce99c7c9a14ed6fdfa0732b0592b95c53e5996df26005a7851aba28773a7c
-DIST es_CU-0.7.oxt 1435506 BLAKE2B 0d23267162aad97ad8098c203c3946ae322f9eb15a99072874a138bf0aa06d751ab25eb69ab8c821214595dd9bb37b5a72179c61ac637e15dfca08e4dab3809c SHA512 b60fa3d092512e43610695b507e4e2c09065bf9a2c50971c9a8074bf93896e19d512847aab9190b2215da4481e514ce7fe23a851d27eafc24704bc7a3f4756a3
-DIST es_CU-2.3.oxt 1410740 BLAKE2B 73c6e7f3b80069e447d9d583df95f9269f8907674ac2011448e3699476810c70df80cad30360b2d64b7c71885bef3105e2f2dc7f6614c580f537a4258a7183ff SHA512 a6098f7521521e84373d143c423265e8c87e7e7b8ef328d16e4a9da40ef54b5417d19e86539753c541814cb040c7cffec07d7d020715b9f68409e3312a37f155
DIST es_CU-2.6.oxt 1399550 BLAKE2B e9aba378978040b97cc116ca810ebe591ccea844eb440bd1e9a03dfeec59ade4e93fae05b2461ee4bb0711d58ac442ef12e68f6114c2cf35631256083573368a SHA512 45d336d46b83a969d904dc8c2512567e7c414ee62bcaec414c8547e96a0e429743629672e6fd1c445a6ea99a58cd8bc9a630feb12be26de3684f05f8e69542a1
-DIST es_DO-0.7.oxt 1434782 BLAKE2B 225c30dfb78a1cae05aa50e157d9ea8a380310ed6b45ab2f5face2d1c466eac7af6ef88b00b501f5af138147a575a6044802bf25500838975c1ede4b5adf4054 SHA512 621be08835598664de6a6f1e865c1293ee62d0581d429bdc6675991838483d9bfd9be38d08cdbeab8d03ad7709f20dc2af38ad054718fd6e2b74913bfac1f5b6
-DIST es_DO-2.3.oxt 1409943 BLAKE2B 34b88b9202761f34d706a64c9243db2c8f29e63a8e7679319e60b77896a77df2ee292e7e123e738a266a5048934bf77b3e38d4ceeb2dd78bf4dcda7d6c6e69f8 SHA512 02bc65cd2d0cccf50bc3ef027356b759a6400531e809dda8d4bdb33e15b3b84d6a2274b6a38c0242c8c7e896a2b8515ca6607cdf2b09786140a9753867be952e
DIST es_DO-2.6.oxt 1398197 BLAKE2B 13a7d20cffd6aff109ca6ca96d98e81c60c7bac6c36ac1355572a59d9d5c8a4b443bbc966e5c952ede05dbe2ed8471f525939b130add5c85daf3da5be0291bca SHA512 77445ffaf9143c31de9e0ecfdf4d5d72ad7e78ae1098ffc7e4d31e904aefedcf352f226b242adef1424ba1ddf599e72becfa6caa6505063118c5e30a09f46baf
-DIST es_EC-0.7.oxt 1435564 BLAKE2B 7a8656255361a014324dc37fa9aa1e1336c207b3e0a28f88ce6b0064de0d3d8e98901c39ed9d5910f91c4c08a03b697fd7634a01b00f0b34cc7e2e8b6a314958 SHA512 30bf5b228ddc3afafd6e17e0ecaad10266f30bf1738a7d67472112bfb5f08cef29e681f63d3613a6fe71b0897b92a9bf9eafd90bf0d50f4f81697828fc6b00dc
-DIST es_EC-2.3.oxt 1410704 BLAKE2B 3cd523b8ea3a521aa0bd2bb585bfe6cc9447781c83f96ed20c807f1da1f9e7370606ac38acff8e24148799db6a666c1fd1b5edccd56d2e17c006cdb0537cc4a5 SHA512 5038d08e4b2f41d51a0deafd7948eb05de33b641e10fb1e7167badd823fa9dd7844c2e0617f0cf102f3818ef761fbae903b596f82d9576c288f33233f74e2362
DIST es_EC-2.6.oxt 1399031 BLAKE2B 197c4a6dc2062dca10363668d9bde911c23538f529bfed04260dacbf6d2e71dd655588f281e119ffaa5095ee93da5884fb87fc16e2d3c83f9c953fb5bef762ec SHA512 1785aa28a3d7787dc61a21c95af5f0aea7859899c11f21899ad68db9e43dd400f9ecd425d315ba5a7fb04eb3ad5fb27a5944529ed9c627d91f281100cde2ac83
-DIST es_ES-0.7.oxt 1438691 BLAKE2B fa0cb94cb3c36c024ca66e7d7314c21ca27d17b0d57241d44c7926c773a34c1b1809c540bfb3a71fe55e5f57c47700c024ead3205b43cff52de1e3cb88362ba5 SHA512 6eb23eac189d6e0586a69b2e68c6aadf5eeb6ed204d222a76bff955604c0d7f6c55fd5b195959a542357d943da73eb0390d60b38bb07eecf49e73df28f586f51
-DIST es_ES-2.3.oxt 1416213 BLAKE2B f68b9c18f40dab2b84a6bb2ac1f5d9d4b9c153cedc2b886423f86380c67c046908a4ae05e6a9e88ce669b92469c6b97bf3ec310855b3458e0929fc436fa70a95 SHA512 566f22be881024ff45b2a20b69ffb20abbe4fd144fbd18abfa292e17e0a2f73a18b7f0459a2f4ef8f50832b2ce6974830ffd7de5674378202124641978b8b5a8
DIST es_ES-2.6.oxt 1404258 BLAKE2B ba7f845fc1c3595ae6dca176ee2565e48e10ed417bc82d4f4905385feb167744c512a35126f7b59ba402e0440b23d016834a1998ec0391290154b3c1dfe9b519 SHA512 ae00c002bd911fd5f3569733735894511c1f08a155b13206e11ad1dd0777b31d6c0c226e6580ffb565b99d6a48bbafe86c38760f6194cb1f09199657127c6ca6
-DIST es_GT-0.7.oxt 1434939 BLAKE2B 028397a1834a229ad1c888d03b6a6d700d2c8006a3c532c5be82cfd51d00aa1aaf06fc5091c90c2ab24cacbd21fbbbaa311ab7d4b46da844f25e0aea19ccdd4d SHA512 162e59309532e6cad7ad49866375970b3ad788a11ae6b63ac9c182da5aa50948139c0eb9f2e727909da4744a095099ab5bb18ee2f73b0e1c63921dad8dbca4ad
-DIST es_GT-2.3.oxt 1410064 BLAKE2B 7ff365cd68482578afd87ba6887279036bd9f7e434097cdf3dd9dbc04e1ee228c56894a527041bcee4d958f2ca734e3a67527bf68bfb6d2b651779d1efe864dd SHA512 1090e0ba07e026fdfce65fc4ad75fa4fb4c9ac13172a5acd94e4549b7347c482f0da0a180e7d057807c93170ac03e258e17d75e9b2455b3c6e2011aef6079c8b
DIST es_GT-2.6.oxt 1398345 BLAKE2B 2f35be91ddff907559283c9e8f1a9f66b15fb4bbc38e296479c3ccfbc16c685bd9276fe4cb33b8ed5d6e13af80358aa82463fbc16c14a1a9c9519d4769c18538 SHA512 c935643e0f88b9b08e73dbf610a8581d001bdba22e8f44d0364bf4f16fbd78f8406c1b4fe182b9b6c6cd4220a3967a291bfa926444f9d361e5d94d4ef0bc3d5b
-DIST es_HN-0.7.oxt 1435398 BLAKE2B eff8ce7278b6cd8b1306d3c777c4fbe988c31384e4bd31febc7941e0a2e1cdadb1838bc46477e275cf991825a2fa946b22cbd3ba53bbaf52755722479addeaae SHA512 3d8050c22d27a32b5ebc72862ed7066b3e58083c9cd6847824361d656ba4f8b122121509bfce303edf1b3b0a0e9cdd31671caac28662299879eb1cacc19d81b1
-DIST es_HN-2.3.oxt 1410551 BLAKE2B 2b62e149d8a73fb015b3e6d658796818409fe04d658b5c5081f45f89d054093cb4397fe3a0eb37d8847eecbe9832367b1807ce01ba523b4f7f5d6c702ac879c6 SHA512 4ba1f02228d436a4f4d907381841213ce3a42fadedd3cc916b665b506d1d112bb23aeb87f40147eaf619e919b9b06d58a8aead018edd3bb73593fc429bb07e02
DIST es_HN-2.6.oxt 1398847 BLAKE2B a3c8f16e6620e21d6828d7189a9cf73a2f1bcbde127e0601af5da725f819007691745d12cef34c2316af5317b57faaf41d041613dd887171be5565862a17fe55 SHA512 a45b39d7b9cbc4931d2cdc798e600c40a221b5d036dfd287d65bc978326d913b7822cde2efb1488d9d6be64f4cfa8b728ab1c2e387f852c8aa4cd938909f73f1
-DIST es_MX-0.7.oxt 1435177 BLAKE2B b10c5d40dd3913b42b170adf38abd9cb10860610e395768191701c3754c42b8fd5df2bf8b52c69c172fe384d19df3fd7d2439c972d1fcfcc65ec5fb82c69b367 SHA512 6e560d630da72f627c0f5a603adc9bacb102edc106c9bd7ca831c7b4c808441cbf73eaa3f75c5953b89548d071a97e81fa57d5b2542e0be6c6d993d74b09020e
-DIST es_MX-2.3.oxt 1421023 BLAKE2B fc1c7fda66f66189af3098f36faf6b8f5e313931ee5d490be83c580bc7707fd0022bcec361707795071d262a4cdfe6eecdb2742d7baa5d2fd43fd9dba6b09b51 SHA512 10716a744e9889bc3baaad6163c1dad06e6756dbea95166866834480b562c0fa5abce01bd2d5e4b05f19e522e1726e073dd7afef3a9d8e6bfc0d2f4b28bd0a2c
DIST es_MX-2.6.oxt 1407822 BLAKE2B 8af171c58b7028679245e66425762a26d19d55b5d9b68af753cf41837b32a48cd33ba8c71d4565f0a8f731965897e3df93377e7a472d009946867578a8972016 SHA512 f183792b625104f8e51beeac89b374c683a4fd004c1bdf9c94979cd15a5b3da8066bc605759393c6acfab2b0e1e4d65c60cf9ea1c4947cdc3e7553338a4a7f1a
-DIST es_NI-0.7.oxt 1435054 BLAKE2B b58bcabb0c5c033e6f5f9c27c69ffeaebc5dff0984fb447b273cf88cc93799807b48ab07f9a901815cca497fec8870de5c0ccebf1091ea264fbf6edb63d0bbe8 SHA512 e86e0748a04ed3ce74f4309764d08063c0e01b9f1568f1de7e08bd8c22cd2d0ba6a3dea3afa272d2d697644bed8e0fa19c7d7940fa87393de30fcdaee095e483
-DIST es_NI-2.3.oxt 1410217 BLAKE2B ed401084f3a025abcd812a6022786682f91e2cd02a34ee37af0313703eb3d634506f5300f9b50b44004b95ad6d5906f593b21322ae6b5239143acbd0855e0927 SHA512 598896a853d81d1424e4927df634ca0e40c0e774a62e0f29bc1105d63fc586362c10ccc26a5f3becbc134a7b041272670bf971ea5bedb121f37cda5c7ace56c8
DIST es_NI-2.6.oxt 1398536 BLAKE2B f74f56cad81d14d51eb6a402bcf2e7ce1f836c0f533b65fecbc2bc8a0186d62a6f15a4e8c22ce2a879b13dea5bdbcaaf1c0324acd2c21ceecf8e1c972b9a1af3 SHA512 d9a8512b70be764acfcdd9fb40c3a183c02c32524568b79869ad9233924c654693f9cd405b3ead7f5548aedde3151f287ee6ca94f83d3ff57991dc749bf59146
-DIST es_PA-0.7.oxt 1434970 BLAKE2B d87cdf1db1dce6c1a23acf9c2fb37f1053393755940c0f379b9ac56bd3f1f4abf070f66042fb43c2f96773afd9e07376d9706a6fb4cd2dd2f2432bc8ff60814d SHA512 172898dbe6a9b6ebe767797e08952af50fa0148059f215f4662c215b0df1b6333dec6d81bd3c629a538a96cfc571ed4ad1337d6a9e6d7bb941ad0a609a8cf588
-DIST es_PA-2.3.oxt 1410102 BLAKE2B 59fd0f5d657a2b3bfc6e9b878ed2b75b8929998d6f1b2d050273e0a2847e80bcf055ac4800975441bef225dfc556e7eced368f3d69ca9619e5bed42078d70cd7 SHA512 d54856ddd5a7af78813f4fd15f49e790682a2fb699557dcdfafd4cc94ea1794b0d641eed7dbcac4c2f9360ae673f5c51654f0240bd9e9ea7260ce84819f85526
DIST es_PA-2.6.oxt 1398374 BLAKE2B 7750342b72744d8155d37c54c601ec5f0f522557779409cc43d53d13a2b789ad31012e9f957d5092b7423e3db02490c5546bd0ca6e7e0670e99a177553f62f7f SHA512 a5807d55b4cf3fab505a02f9f28b1ac496f9f656d34ab2350ee5a117b8a28621357bc6bfb8143499424aed1609630c626426c040079246185d5c556751faaa26
-DIST es_PE-0.7.oxt 1434282 BLAKE2B 824243d8351192a4c50c4d1729d9bc927adcb618376665e5ed00977e6079002db9f88f72fd3d74b80a2b2f2f07ea7ae605676b42e28efa6b4e91a42c5e98505f SHA512 60ad75c363fb3e5612bf8b423975aedd32b7738073e0e863c42de3be7d22bf3a050d3d09a5a8a6a65ad8e36fd7a516f1c6c3775f9ad76696657d9eb8a4e2336e
-DIST es_PE-2.3.oxt 1417405 BLAKE2B 4cc5894c8cb199fa08c7f46ef3a5505a64b79e27d004be1bee7119207732aaed5fd965ae1bb5e5d7c2044f0cc2bcaf417a889b973f7f202e9c296f113232f64f SHA512 f76cc2fa18cb509bead6a5fb27bdb9007e54806ed8d130568b33154ede14150dede81248ee46476d4bcbefc349c78d566dc15e7c58a7c12d7ccf0a1ac18fcdad
DIST es_PE-2.6.oxt 1404244 BLAKE2B 19e136f2b8a8e7d432df292104e3149801448923d81ea78ea62d63eb4393b1462e9ccdb57db8b8a0a7ab557bcde06e653747971f0330ca8579bd8c575c437b3d SHA512 3366afdbc6cdd0ad59d282a6666669b2042d15795414911b2cd2e27d11b0ddb1a4ff288129fb7731cc21c642f81cef2ffdaf55e2a2eb7cf64b1c10976c6ff4ea
-DIST es_PH-2.3.oxt 1442511 BLAKE2B 718441cac52cdfa979bd65f5acfbecdd488d1e89b9002b89ccb6ac0c9bfd25a6f483fc29d3d413afb949e7a74d53859d66471b0b5f945cd0563cc6f941f7e25d SHA512 d041cb89e89b9509150fedcbc39a317ce0a42ac72811e689f73879c76db264573899fb40c16c314374911b167c1f47c573ff97ac83bc88c659377f81bba511ee
DIST es_PH-2.6.oxt 1439219 BLAKE2B 471679ca90e91f4c004d0ac623e4b88c0e49b14f5a7875a55acbbf0813dc498b5015d2a2936dfda9d42576f66b5a7828298bec04abbb93888e4a7e1b4e2f6012 SHA512 380358971bdc2b0d7e2a667b372209db6d300ba349ef44566de2617217eef6720366e0844663f0df698b94ed5062314eb4d0495a3179735ffb6f60342665ce06
-DIST es_PR-0.7.oxt 1435436 BLAKE2B 1f9af2c0f24dca0ac94d256438210b9ba6a21000469b0a88d4077c977b049303b08cd26744a765af9f8b1e48104cd995a4cec5d69bbfa7be7e9c74147626e695 SHA512 002767cd23709a3b2dd2a2616642fbb1b1d674a21507ee21c830741e04234fc32b0fd6a8b762c24183d44d9f7a233c8304b580ff3d96b7c87b10f43393e3a604
-DIST es_PR-2.3.oxt 1410569 BLAKE2B 1c673d5602a5347529dab58562a00c96e4a4c7fd02f2cfbad50ef2cb4bab35f7121a030264a9db46dafe9faa6f8de23c9feaacacca576dc4575d9ff734e2bbfd SHA512 92e6d9f16bd63696d64b8ce214c3fc19721ad3a17b2b5f82a2bf38c5ca42f42a62d9c0a06e1668e5ee7ab076781ae794e9a9abd40a564d36faae367d0adf28ef
DIST es_PR-2.6.oxt 1398833 BLAKE2B d380cdc10d19271fa97d603ef954ed8a096e5ffbdd58acaa9a89a87ee65edbdc3785de0713cd89cffd3299607029118fd0c8a3f756a8538e607f0fbcf643da72 SHA512 bdc3f41a6310a28f4147034ca70a6e74203498b87a5de814ce93c40cb2ba19b741addf33680048a558d681bc52989c46645b8e8a90ca76ef50299d4fb5e947a3
-DIST es_PY-0.7.oxt 1434869 BLAKE2B 88da4c119a88b7a0455075da6a0a972354a303c2ff86e91cd71da0a21cea12961554ea2da72aea71c72dc3dc7dc1dd45c7a1b089a86067ca1c4693a7b579403a SHA512 10d785338250506ebf8bf3a8cbb79413c817e4e25f9153b4b8af9c0a7a422079d5d2bb9411e4989ceb7503d0a65ce926352af242bfa0a3de9c23e3dc6ef889c0
-DIST es_PY-2.3.oxt 1409970 BLAKE2B ed133f59c0a50b7aa4ffb0dca3942e6f0b4917e65428933f831b15d5ebefc3a1fca3317b85da84c5f6d99f9868071060ec1bed237709560d0d5853f2fe4df02f SHA512 885af32d996aa88dcf2848b3edbd13043c6542cff78c0ed8bb52f764b73843f11abc6572a87890c69ec42a5a5baf8c20c131a080d8d7df6e9327d02cbbe38a33
DIST es_PY-2.6.oxt 1398291 BLAKE2B acb203c26081c9d7bf25976f2acda996cadc119658ae0e34cf184005740fa04e41f70056ed7103b2e152d28289d7ab50f28acb4a3cf1adb58f5f1cee7b1fba40 SHA512 bcc8e7a301bee762d1d1a9a3447e4e2c7a2a2b42eb5beed1053d439aaa908ef178165863bbe5db96eeeeeccbecdc472b0fcb8311595c07daebe779d55c4f10cb
-DIST es_SV-0.7.oxt 1435063 BLAKE2B 031f65260cae0d74cb1d7e6cf922a6134ebdb0a85f91633f3e37a4fc523a04ef49931a1267f39068e5ee2748c501f73b9c17d5d0edd20f0f881d04642973a1e7 SHA512 30baf8e0191b10f107914728f09c5d193264932f4a78ad7cf8ad55bad9e80ae9cc42802ea69e4b5cbd5ea5871a8fb45c04728b29d51e2d4f24a9e4c1f1a62d57
-DIST es_SV-2.3.oxt 1410203 BLAKE2B 1cf9d6715136b9a509a0ebce7be157b792446c4132b62b657cd3b5fffb1a227231794e9e802a8e0ea3e22c80f6e3dbb79fb25a01f818744f338bc04fef224979 SHA512 56c3ecbac7c2a5b9b8b6b848060a094934badc335d0f832f04b1b9a0ad262b2de5c75e1c05a05520f3a7b44791045635df3499d9fa37f812a2d7adc54321336f
DIST es_SV-2.6.oxt 1398468 BLAKE2B f88b683d4c1f342606f30e3e80c3766d06ca66f0f851907924b24ce57e71a681fa8f4720fc3d756ab46e12665d6de5d5182c1353317e4e02264431d0fbd10745 SHA512 f8032d7930102af6c1773dc9d8e47dc16e0d9aa4968c1ae4d694d52b95fad82ed438bd3b85761ed47dbb25093c2fb08b116bc9cae284d955c7c8868cfc0457c6
-DIST es_US-2.3.oxt 1411395 BLAKE2B 350c53e62a49eee1b7c3c465ef4c7d7e1f846c524ce0e0e55244f3fd9be88fca50d0ff9a67db0959af074fb6e0fc4e596587063fcc16652a16ad13efd9b93be4 SHA512 eaae90c940c3c76616bd57a52f1c8f7d61be46bb4a54732befd06d292ecf99d6844f6ae02fea214647a9fb7f83c7ce12062608214c67a284ac07155c979c0093
DIST es_US-2.6.oxt 1398918 BLAKE2B 1629aa767095197aa71fc3bc88221bad6f2821111e757e4c0e5e14684dee34f1e442a8a46d11d877d3b2d9ca9f04c258e8ce21d38b372ec84ebc637e9faa690a SHA512 b21fa5ed1af7f2bd0d709b4e35f5aa49fa3d9c25847d0a3e077e8e9e2c6cd3ab9bdf4599f83386fd1441f96937df7d0fcfe1ba36830721840fccf158e4bb4d65
-DIST es_UY-0.7.oxt 1435883 BLAKE2B 3880e74f3184887c5b73b10188e8bbad87501d9001a066b27e64fc5dde877b68d25eca5fcac9a16ad331bcc890633bc19b0e91f5c2576b13081c1212eef89102 SHA512 ed0cfb3c8d097e4c56f92e239c6f27e1e794baa2ab4b81fe6eaa03dce00716c303d8d3bff20e163723c8a885029b9ae3f9e10d232d5c94f344b1a36261b86f1e
-DIST es_UY-2.3.oxt 1411016 BLAKE2B 51dc5d52b13ea15432669c7bc518ecea0e9c26df0245449c8f17e9a4b3d5b4b14c87052827fc96c7780b21f6597c08c36551316d705d84dfaf90d7ec4c7aadbb SHA512 a6f19361afb5bea47ba823c69ad57577f311ba78c7e43dcc3216aece1e7baf84a8b4490f13c582d5b1f1f3fdb16b48850d1d7adc882f2d3b5b39af65caf86ac7
DIST es_UY-2.6.oxt 1399347 BLAKE2B d92d6eb5d3d8cfcca8e93e771203f9613d8709d39752864e6b3eabb1a901d02a6811e4fe3f326fe53fa065ab52e4e4ffc2057e0cc86065cc50dca6cb01435fa1 SHA512 312e42fda60549a7171eed7b19e92e74a98d306f0b2f8f218e538a4653408a805573de838e476250b8fc54b8b75d0a83a6b5f261ca62a39171c69656d8235265
-DIST es_VE-0.7.oxt 1435033 BLAKE2B 4b0c3bf2d0b4aed3db2d2cd2a895692a9e3ffec16d0f91795f2f8f462f22783bd4240359670ce0f0e35383d0b0ff1f78c3be130134604de6c9b3515f63b599ca SHA512 e70ab6b64931dd0f572625564295844d471e68d0e6d38dba5e2c27646d5caf416a412f179e31ac647ace9fcc673a40727abd1375c1edd69d80246b4888380969
-DIST es_VE-2.3.oxt 1411856 BLAKE2B d746113298bce3db8c8c4d4ee8caf369f809ef73971612fc207470ba1ebfc67521235e855fa6243d2b6850184f273723c7d83a0b8d22293c3abd9fb550826ff2 SHA512 4d10b818e4d00f60f07f9f64d519b02f549298cfb1da6a344504cd8953fb54793607c662ff2f0505dfa9924e1d1ba45c1ef6d2d6bc4cf2d37d3d1bef99078569
DIST es_VE-2.6.oxt 1399975 BLAKE2B bfa3f6e06c39bd2359300f58d43a1bda5604a9435143ea6f7d84a4b4bff0f71363074d2e4cef1f6c5749b041d53b178492d4b583bfed66b12dd53623bdd56f0e SHA512 026f808b8050d0ef2135679c9ae8af026f9181a2d004a033c79eb3ea9c43673fee091a3603527bb1f73595c8129949d6c569f97f56e6970d490460f3aca1e647
diff --git a/app-dicts/myspell-es/myspell-es-0.7.ebuild b/app-dicts/myspell-es/myspell-es-0.7.ebuild
deleted file mode 100644
index 632e70449e65..000000000000
--- a/app-dicts/myspell-es/myspell-es-0.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# yay for modern download tools like redmine and their unique IDs as part of
-# the URL - this means that someone needs to check the download page if there
-# are new releases:
-# http://forja.rediris.es/frs/?group_id=341
-# When checking ensure you update id above as well as the order of MUTATIONS if
-# necessary.
-MUTATIONS="es_ANY es_VE es_UY es_SV es_PY es_PR es_PE es_PA es_NI es_MX es_HN
-es_GT es_ES es_EC es_DO es_CU es_CR es_CO es_CL es_BO es_AR"
-d_id=2933
-
-MYSPELL_DICT=( )
-MYSPELL_HYPH=(
- "hyph_es_ANY.dic"
-)
-MYSPELL_THES=(
- "th_es_ES_v2.dat"
- "th_es_ES_v2.idx"
-)
-
-SRC_URI=""
-for i in ${MUTATIONS}; do
- MYSPELL_DICT+=(
- "${i}.dic"
- "${i}.aff"
- )
- SRC_URI+=" http://forja.rediris.es/frs/download.php/${d_id}/${i}.oxt -> ${i}-${PV}.oxt"
- let d_id=${d_id}+1
-done
-unset i d_id
-
-inherit myspell-r2
-
-DESCRIPTION="Spanish dictionaries for myspell/hunspell"
-HOMEPAGE="http://rla-es.forja.rediris.es/"
-LICENSE="GPL-3 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
- # remove license files
- rm -rf {GPL,LGPL,MPL}*
- default
-}
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
deleted file mode 100644
index 094dcd7286b6..000000000000
--- a/app-dicts/myspell-es/myspell-es-2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MUTATIONS=(
- "es_ANY" "es_AR" "es_BO" "es_CL" "es_CO" "es_CR" "es_CU" "es_DO" "es_EC"
- "es_ES" "es_GT" "es_HN" "es_MX" "es_NI" "es_PA" "es_PE" "es_PH" "es_PR"
- "es_PY" "es_SV" "es_US" "es_UY" "es_VE"
-)
-
-MYSPELL_DICT=( )
-MYSPELL_HYPH=(
- "hyph_es_ANY.dic"
-)
-MYSPELL_THES=(
- "th_es_ES_v2.dat"
- "th_es_ES_v2.idx"
-)
-
-SRC_URI=""
-for i in "${MUTATIONS[@]}"; do
- MYSPELL_DICT+=(
- "${i}.dic"
- "${i}.aff"
- )
- SRC_URI+=" https://github.com/sbosio/rla-es/releases/download/v${PV}/${i}.oxt -> ${i}-${PV}.oxt"
-done
-unset i MUTATIONS
-
-inherit myspell-r2
-
-DESCRIPTION="Spanish dictionaries for myspell/hunspell"
-HOMEPAGE="https://github.com/sbosio/rla-es"
-LICENSE="GPL-3 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-src_prepare() {
- # remove license files
- rm {GPL,LGPL,MPL}* || die
- default
-}
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index 67cc54e476fb..6a469d2ba26b 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -1,2 +1 @@
-DIST lo-oo-ressources-linguistiques-fr-v5-7.oxt 3419712 BLAKE2B e74657424b460b222b68a2753a21bfdbcaec8ad60e02014bb6b49b3f4bb9f2b7c8b26a0d73bdd83b28d52a70b3c2656b1112f028107598a16e642b3262bff3e1 SHA512 9406fdb7401908ed7a9797735ac9f7b9769373ddc0f016b310344f85d36ae48853ab9300bcae9ac290442f482318ab1b743983d359679e9a7c9f211b4ab35405
DIST myspell-fr-7.0.tar.gz 3537269 BLAKE2B 4ed449860ed5c62ebe0669c513160c9380cb791f4eb0a4b9b8fb21ee6a0a845aabf3af1533a540d1697a2b9d980fc42a6ee60841da8149ba970eb34edd2f4e8a SHA512 af96495d8970d79283908226adc638a4cd387c94361bc9533df309a063eef53b625650ef5d899604b39cf6a2e97fcdc2200c914a252af425d55e4d076ce14ea7
diff --git a/app-dicts/myspell-fr/myspell-fr-5.7-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-5.7-r1.ebuild
deleted file mode 100644
index acce3fe797fc..000000000000
--- a/app-dicts/myspell-fr/myspell-fr-5.7-r1.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
-
-MYSPELL_DICT=(
- "fr-classique.aff"
- "fr-classique.dic"
- "fr-moderne.aff"
- "fr-moderne.dic"
- "fr-reforme1990.aff"
- "fr-reforme1990.dic"
- "fr_FR.aff"
- "fr_FR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_fr.dic"
- "hyph_fr.iso8859-1.dic"
-)
-
-MYSPELL_THES=(
- "thes_fr.dat"
- "thes_fr.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="French dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/dictionnaires-francais"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/lo-oo-ressources-linguistiques-fr-v5-7.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
-
-DOCS=( package-description.txt README_dict_fr.txt README_hyph_fr-2.9.txt README_hyph_fr-3.0.txt README_thes_fr.txt )
-
-src_prepare() {
- default
- mv fr-toutesvariantes.aff fr_FR.aff || die
- mv fr-toutesvariantes.dic fr_FR.dic || die
- rm -r french_flag_16.bmp french_flag.png || die
-}
diff --git a/app-dicts/myspell-ga/Manifest b/app-dicts/myspell-ga/Manifest
index e2e279f703a4..8e462d3b7bf3 100644
--- a/app-dicts/myspell-ga/Manifest
+++ b/app-dicts/myspell-ga/Manifest
@@ -1,2 +1 @@
-DIST myspell-ga-20160213.oxt 8475451 BLAKE2B f8fbd0c763df5022142ec824eb7771ee14d0091a9defc5578b5cc830e02d646f031907fd970f69320a8668465c9aa50aa978d05d293fe8c4be24e553052340ec SHA512 bf1d17c8edd174a84c853489a6404da51a21fd47e7abbbd6f1bac98753a6327c6ada7213ffb0fa6bf5ecd62510e8119e35697ae868db00b2086503a801895d0b
DIST myspell-ga-20171203.oxt 8748465 BLAKE2B 5fe5147d8f297228bc1e968e60546281110095ab2c3155be2bb31eadd8e486a0f56b7f41bbe661ea568ff191233134955a3a26d271d99d97b3ff82f2f1761e16 SHA512 37c5e03998fd3c036df90f45fa28aba7fbb16fca32df1f82ea3ffeafdb19081b739e6716c5be448f7344b9ec548bbeef09d0bbc4423f6312d53a7a5468c4512c
diff --git a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
deleted file mode 100644
index c52c035b4e70..000000000000
--- a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "ga_IE.aff"
- "ga_IE.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_ga_IE.dic"
-)
-
-MYSPELL_THES=(
- "th_ga_IE_v2.dat"
- "th_ga_IE_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Irish dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.openoffice.org/en/project/irish-language-spell-checker-thesaurus-and-hyphenation-patterns"
-SRC_URI="mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-gl/Manifest b/app-dicts/myspell-gl/Manifest
index f2dfc86d4e75..1025871639be 100644
--- a/app-dicts/myspell-gl/Manifest
+++ b/app-dicts/myspell-gl/Manifest
@@ -1,2 +1 @@
-DIST myspell-gl-20131013.oxt 771221 BLAKE2B cee0815ae69d00334cca4341ed5c694c3d8f97a3904f5427b7deb94d706947e536adc890b2bfbff41c666b8ae6c5c277edc4843f4c4ef4131548145a42b2313d SHA512 ae13d7137e6b8e51570bcbeba00f73d9887a24556c2409249a39858d385168a03aff3ec2cf3222cad50686a4169debbe310a05ce3bd40aaab408de3ed01885ee
DIST myspell-gl-20180710.oxt 1929371 BLAKE2B f5ffbcd9417935828db5e951b1b37deb6a72c22f19afd48cc9e03f167bbc3285b3ae3141c2393aeff50be48752cd8620167e2539f6d2eb28f29c72ca56f88c84 SHA512 ea19a917a3f4a7d6a144a9219e30f1a8cdd4865c98c1a3f901dd2ffb8a20143c2e80c4b458ea71ce97684042a4209852c9d21861710c52658fa7391eb221c7a4
diff --git a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
deleted file mode 100644
index abf3cad1ab7b..000000000000
--- a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "gl_ES.aff"
- "gl_ES.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_gl.dic"
-)
-
-MYSPELL_THES=(
- "thesaurus_gl.dat"
- "thesaurus_gl.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Galician dictionaries for myspell/hunspell"
-LICENSE="GPL-2 LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego"
-SRC_URI="mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-hu/Manifest b/app-dicts/myspell-hu/Manifest
index 98d86ca077e1..7c385142dd71 100644
--- a/app-dicts/myspell-hu/Manifest
+++ b/app-dicts/myspell-hu/Manifest
@@ -1,4 +1 @@
-DIST LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz 3764761 BLAKE2B f85c0dcad7dcbcd0a644720a4a0fb48098918be5cb38bc4168134c4db29002449763b864449299a099e15b91a7bc42f7d0e726a6bef945862eceb8cf5e13a48e SHA512 088a2c898299b61ff10f9397f68aba404bac4de7ead1880088dd16f841b7b403059a82bde7a5e719dda772e494f02d014255782f8e5c43c7a8eb2c07358c66bf
DIST LibreOffice_7.1.3.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3315084 BLAKE2B 5cd3c33f66aacf4b1474d6c418c025dde77667e59027916c0ace16281a85f7e14fa37e607f18ad94e1b2fd04e65e692998652f739ac0180fd27274254b3d92d9 SHA512 b45be281c8ea37d92236676f6d69e77874399412737d2cd4f13f876a39b70db2f61e94a58924bf52d30d8b59a94611d63de4b2e2378f607292c397f3729017be
-DIST hu_HU-1.6.1.tar.gz 730641 BLAKE2B 53d08ee9aa073e4a2b5810a90b1a4a8ec42f95b507f0b9c3f1ac401cac39d4d667f18886745352ced180441f231651829bf8480a7a98b336c53cd1fb61337f8d SHA512 7ae1f99b16b714158c33b41ee5c7a3aaeb84bf59a1d1c13a02b0ba30972bfd2b3dd0d04a28997f0f5a97943a89d3cf9f0da55fb219ce24917ae1e3aed0a5484f
-DIST huhyphn_v20110815_LibO.tar.gz 545413 BLAKE2B b65bc84c01a5a34a1650e6fb6d491f71afd8486e9b8f49b4d3d41850f6e2086518ac7360287f376015551e7897033bada50435d67d81e26015cc57dfda05e08e SHA512 147d3d74c5d7278075bdf3734492662c723970630da10e5b1520f960d3f3d89916cd674d44f3b27ccf8e9b81031a75bbf6311614a296f76a39b1de576ad34b10
diff --git a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
deleted file mode 100644
index 09b57f3ec6a9..000000000000
--- a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "hu_HU-${PV}/hu_HU.aff"
- "hu_HU-${PV}/hu_HU.dic"
-)
-
-MYSPELL_HYPH=(
- "huhyphn_v20110815_LibO/hyph_hu_HU.dic"
-)
-
-MYSPELL_THES=(
- "opt/libreoffice3.6/share/extensions/dict-hu/th_hu_HU_v2.dat"
- "opt/libreoffice3.6/share/extensions/dict-hu/th_hu_HU_v2.idx"
-)
-
-inherit rpm myspell-r2
-
-DESCRIPTION="Hungarian dictionaries for myspell/hunspell"
-HOMEPAGE="http://magyarispell.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/magyarispell/hu_HU-${PV}.tar.gz
- mirror://sourceforge/magyarispell/huhyphn_v20110815_LibO.tar.gz
- http://downloadarchive.documentfoundation.org/libreoffice/old/3.6.0.4/rpm/x86/LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz
-"
-# Hyphen seems to have no releases but was not updated in last 4 years, just use
-# one arived version from libreoffice and be done with it. If it needs update
-# users can ope a bug.
-
-LICENSE="GPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-src_unpack() {
- myspell-r2_src_unpack
-
- rpm_unpack ./LibO_3.6.0.4_Linux_x86_langpack-rpm_hu/RPMS/libreoffice3.6-dict-hu-3.6.0.4-104.i586.rpm
-}
diff --git a/app-dicts/myspell-is/Manifest b/app-dicts/myspell-is/Manifest
index 430924733f16..761b4960b544 100644
--- a/app-dicts/myspell-is/Manifest
+++ b/app-dicts/myspell-is/Manifest
@@ -1,2 +1 @@
-DIST hunspell-is-2012.09.01.oxt 678230 BLAKE2B f8a4fa14c1cc9c89213a236d38fbd6b3621fbbaa4803eb3bb70761ec387cddc0404546c3b9ee719c104c0321f5736394506993e153e0b575b790376d2081818f SHA512 39af86809f735e5f0698b060d514bc2d9d53cc4ec7ef4edb6edbd92674af337ea48fc69bfaddb2dc2532be74ae5a079068cd691212042bac70a622d1f02eebe6
DIST hunspell-is-2014-08-18.oxt 763157 BLAKE2B 123c833075f5cd1404c316ba6d564be04c290fc12c219804f34f849fa7ba73294221cbd1317fcea8621c7fa5caecf42802daf1a01f9b71a2d2858278ca800788 SHA512 62f81d57064761e9367b984ae6347149e6c16069733fa7c3b68f0603830c21b44aa03d1512772634287be6f760b1bffb66754c02d0ee5a7faa3b257e46b78f0c
diff --git a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
deleted file mode 100644
index 52b7e2350f0b..000000000000
--- a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "is.aff"
- "is.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Icelandic dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project"
-SRC_URI="https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/${PV}/hunspell-is-${PV}.oxt"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-km/Manifest b/app-dicts/myspell-km/Manifest
index b40e2b8531ab..5e4f5e526cf6 100644
--- a/app-dicts/myspell-km/Manifest
+++ b/app-dicts/myspell-km/Manifest
@@ -1,2 +1 @@
-DIST sbbic-khmer-spelling-checker-1.6.oxt 355760 BLAKE2B f9b87b3ab40204cb756440b0d705156c9b7d7d2220db9a1baba8b3c5247b6cee76c7326e7e5f69d6f7f2ae926b0e865fd7dc2f1c38db40608ddaee5159f407b2 SHA512 0cbe28a5b9c1c7aebe8cb14ab76115dd3d08c75f20200bd0685d05b5d462b2c53b3e658b150d58a44dcf1589df99eb92a68aae3f5d5afb63591ae19a338230b8
DIST sbbic-khmer-spelling-checker-libreoffice-1-82.oxt 606267 BLAKE2B 9b876a252266f933eaecc065869b0a6f52d202a4122d24d229b438585dc39cbb0798fc5c5dc84f0fc7cb38b4a1653cb53339bd8a0ddefd5f69ae50bbefa9cb3a SHA512 b73daa7a0363880aeebcafa0b4f38b48d9a2d24858cdcf393d04dd367a119fa86047ccd72f7bbd184c0883369d53c08dcf48a3fb2c29639ae42c8d801a869e96
diff --git a/app-dicts/myspell-km/myspell-km-1.6.ebuild b/app-dicts/myspell-km/myspell-km-1.6.ebuild
deleted file mode 100644
index 7035347b731e..000000000000
--- a/app-dicts/myspell-km/myspell-km-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "km_KH.aff"
- "km_KH.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Khmer dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version"
-SRC_URI="https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/${PV}/sbbic-khmer-spelling-checker-${PV}.oxt"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-lt/Manifest b/app-dicts/myspell-lt/Manifest
index 234704d54b9f..bbacc03bb95d 100644
--- a/app-dicts/myspell-lt/Manifest
+++ b/app-dicts/myspell-lt/Manifest
@@ -1,2 +1 @@
-DIST myspell-lt-1.3.zip 339657 BLAKE2B 9549d1968d3b60a2b712360dab35fe696369afbdb34097eb7484ea0497b67becb43592878cec5e64691e0069babc9d56817b4d170dbb1ef092d50de64b076420 SHA512 e18f22efb665e3c4cfe0398bafc9e0626c4322009e4b056f3f5cb074778af851bd463be05c55e1bb0bfbc1a04d06d022a3aa37c89e7efac2aa38b525ab415cf2
DIST openoffice-spellcheck-lt-1-3.oxt 327929 BLAKE2B 9dbc0018e0b077748ecb6312239cc987157b6ba00beb0a19c54c249647b177f9b9a4d44c9e1aad921824154f3655f5b6f52569e26bc0d4d961f04210cfb507fd SHA512 c16e420f0b0c0bd764c144cc771986398d1a72588fc84e0b486991bd424a562f9df5e3e0615db69dee06bd9c630e714ffe8a691da7c23981a573ccc49782f501
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
deleted file mode 100644
index 5e5627e3e1f5..000000000000
--- a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "${P}/lt_LT.aff"
- "${P}/lt_LT.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Lithuanian dictionaries for myspell/hunspell"
-HOMEPAGE="https://launchpad.net/ispell-lt"
-SRC_URI="https://launchpad.net/ispell-lt/main/${PV}/+download/${P}.zip"
-
-LICENSE="BSD LPPL-1.3b"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-mi/Manifest b/app-dicts/myspell-mi/Manifest
index 9bf5a92592ac..73eed673200f 100644
--- a/app-dicts/myspell-mi/Manifest
+++ b/app-dicts/myspell-mi/Manifest
@@ -1,2 +1 @@
DIST myspell-mi-20190630.tar.gz 79193 BLAKE2B c6055c9d8c31a982a77180a59265ed294856cb9e7c7d8ab5b31274792c3b3340ed52da9336683abb287b6f8da749527b27c2aaf32c51237f3dd9012d9d631d60 SHA512 a8a5212f3a8b41b19d20776fa9db04d2fd67b6bbce4fa5b94ddde54a22aabaff46d0bc8a91f44a35e66caad31e9a99b8e50b02c95bbbec5314a16e4bea3f61ef
-DIST myspell-mi_NZ-20060316.zip 78777 BLAKE2B 4e694d2ee35c86d677ec9abef3346e4c47364c80ae327178cab8556a514dc810f71af589349e5730367a9ac952165fe634545d426f8352bbe99096d22cf33e83 SHA512 391f70bbd7d66ede4c8df7f7d5544bc7f40c3e97b80b509ce887e74770f9183ca98475715dbf9e6ceecb3445d1d3c5c1de35d1ea540e13a3a17eef690c91925d
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
deleted file mode 100644
index 5ee59ba9adbc..000000000000
--- a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "mi_NZ.aff"
- "mi_NZ.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Maori dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="https://www.openoffice.org/lingucomponent/"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-${PV}.zip"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-nb/Manifest b/app-dicts/myspell-nb/Manifest
index 3d5bb5877f99..df349b174c5a 100644
--- a/app-dicts/myspell-nb/Manifest
+++ b/app-dicts/myspell-nb/Manifest
@@ -1,2 +1 @@
DIST dictionary-no-no-1-0.oxt 3212600 BLAKE2B 38c1771ad680079ae63a3466c51a4dbe99365be65180ee18f6c54aad1b92aa3530c2630703ae83ad5ba9774198bff20a05563cacea82557ee858cd7868996189 SHA512 23339e6a660039d045413f24828ab0df5eb0c4ac76fd323f4bb0e7ca72e91fb8f74f7dc99c12854eb0f7a8baf50fbd0692c50aae31b7fc1847499d76e208d961
-DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
diff --git a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
deleted file mode 100644
index 0ba969f2dc45..000000000000
--- a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "nb_NO.aff"
- "nb_NO.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_nb_NO.dic"
-)
-
-MYSPELL_THES=(
- "th_nb_NO_v2.dat"
- "th_nb_NO_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-src_unpack() {
- default
- myspell-r2_src_unpack
-
- for i in *.zip; do
- unzip ${i} || die
- done
-}
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
deleted file mode 100644
index 612d29945826..000000000000
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
- "nl.aff"
- "nl.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_nl.dic"
-)
-
-MYSPELL_THES=(
- "th_nl_v2.dat"
- "th_nl_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Dutch dictionaries for myspell/hunspell"
-HOMEPAGE="https://www.opentaal.org"
-# Thesarus is not versioned at all, I suppose we could bump it with each dict
-# release, or when people say that the download uri checksum changed.
-SRC_URI="
- https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
- https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
-"
-
-LICENSE="BSD-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
- default
- # Fix regions, bug #607080
- mv nl_NL.aff nl.aff || die
- mv nl_NL.dic nl.dic || die
- mv hyph_nl_NL.dic hyph_nl.dic || die
-
- # remove dutch translated license so it aint installed
- rm -rf licentie* || die
-}
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
index a2a87d3077cf..3c32f1549a04 100644
--- a/app-dicts/myspell-pl/Manifest
+++ b/app-dicts/myspell-pl/Manifest
@@ -1,4 +1 @@
-DIST myspell-pl-20130306-hyph.zip 14013 BLAKE2B aef123b7936d2e15b632955b56e3ab7d7043185d3e236c43f65dd626ee65986662beb8ab65eb25c23a631acc2e5b2af6ae8c3a75117b7e933101fc121a68ecd2 SHA512 931c9fb2e58b0c5d65edc19a7f4bde7e0ccef496d76466944c8b0e249506370145d21c10d9209b6703dddd58887651ac8a2cc7579a1aab8deeed0ccac2908605
-DIST myspell-pl-20130306-thes.zip 1576689 BLAKE2B ebd21dcf7670821d6fa4db4a7d5448cccf8b6e0094e5e8c91a962fc44f5fb14c30e219c8555d2ddb9155c1f36521c939057e18d84f2a399203e504fd738b6ea3 SHA512 c9f5c9c0e5acb0f079c99120ec517d37d39155af22c727bcd9b3af987afc9e217ae0d84539e491246c6a4bfcd2667b556b141ff7003df06927ce873f4572aca2
DIST myspell-pl-20210428.tar.gz 2111971 BLAKE2B edbf08abcd9e0b0120be3df2b74320698cc6d86dec47dce39e7aa4dc82531bd6ec51cfdfced7216052cebea4293cac94c74407505249de682a1648839d30db6b SHA512 2d1142d83dd113ddb4601b1d7a835a96b1c39eb4eab8ae34eab2ce78817dbdedb177eb96f84a295aabafe10d5b2474e1f8c4b17848e19c377ff0de24916dd979
-DIST sjp-myspell-pl-20130306.zip 1126237 BLAKE2B e627de2424dbbe0ea20750d41ebb809cc95b237e8a635e6a31d0a149dc67cf3747d6561055210deddcdda35ba09775d7d140996fbc11a174cb2e4e0fc7fac172 SHA512 1cd53dfe956be6ab23f10c95a28a7589c4859fb41a217b643870c2662e68bf94c96be421f0437ca196fbdce4ca4bc60696e07a1d783a238c544b35cec7f25ec5
diff --git a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
deleted file mode 100644
index d9361c693535..000000000000
--- a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "pl_PL.aff"
- "pl_PL.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_pl_PL.dic"
-)
-
-MYSPELL_THES=(
- "th_pl_PL_v2.dat"
- "th_pl_PL_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Polish dictionaries for myspell/hunspell"
-# dict is bumped every day but nothing changes, RECHECK BEFORE DOING VERSION BUMP!
-# hyphen has no website
-# thesarus released last in 2k8
-HOMEPAGE="
- https://sjp.pl/slownik/en/
- https://sourceforge.net/projects/synonimy/
-"
-SRC_URI="
- http://sjp.pl/slownik/ort/sjp-myspell-pl-${PV}.zip
- http://www.openoffice.org/pl/pliki/hyph_pl_PL.zip -> ${P}-hyph.zip
- mirror://sourceforge/synonimy/OOo2-Thesaurus-1.5.zip -> ${P}-thes.zip
-"
-LICENSE="CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-src_unpack() {
- myspell-r2_src_unpack
-
- # ZIPCEPTION!
- unzip hyph_pl_PL.zip
- unzip pl_PL.zip
-}
diff --git a/app-dicts/myspell-pt-br/Manifest b/app-dicts/myspell-pt-br/Manifest
index 42bc7e6304be..b3fce3b2e535 100644
--- a/app-dicts/myspell-pt-br/Manifest
+++ b/app-dicts/myspell-pt-br/Manifest
@@ -1,4 +1,2 @@
-DIST VeroptBRV300AOG.oxt 1834826 BLAKE2B 479c26994a35bf3083e713f469dcdb5f5224150654e6b05b99e1bbec67be0cc5fd8a8ef774ca1807a08cfb79113836ce09db4194660f49528cbaa67dc0475e27 SHA512 1211af8aba9d9d9eae2ec9885a922d2ad70097d55c3628080754e00f30d46c061eb3eead634c7c4729837c96d722a6f3b615fd85f12b57afe417151c0e332351
-DIST myspell-pt-br-3.0.0-thes.oxt 4561516 BLAKE2B 5016f8ffdb64ae3d6545fd723b502c6bccf6d95f88faa8f1ff41c32033046b25ff00e56bf09eeb70fa03ce5bcfd86a75b5602eaa9219f01495a7171861c7bf67 SHA512 194e8b547ca65a1b7d3c8fbffe6674f539e116840dc546e3ebba03a58d67d6ae649d0387f1addcc05e8df1a80f7941b036580acaa984df016b1ba55c7597a260
DIST myspell-pt-br-3.2.0-thes.oxt 4561516 BLAKE2B 5016f8ffdb64ae3d6545fd723b502c6bccf6d95f88faa8f1ff41c32033046b25ff00e56bf09eeb70fa03ce5bcfd86a75b5602eaa9219f01495a7171861c7bf67 SHA512 194e8b547ca65a1b7d3c8fbffe6674f539e116840dc546e3ebba03a58d67d6ae649d0387f1addcc05e8df1a80f7941b036580acaa984df016b1ba55c7597a260
DIST veroptbrv320aoc.oxt 2065441 BLAKE2B 91f8d059132364b96980f6310ad2b1830624138dee68334b1a2f5848103ce305697a07777b4b571cbeeb0b3abc142a19a5a5d0facca268181c2db7e1603e3003 SHA512 217d25ecc532c4b3386593cea4d430094ec4badb81e12648d3ca87a7f2e29243a94028a1287ff50db4532c6e1a33e52a0839fd0d45ae8c167bc89df940209b14
diff --git a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
deleted file mode 100644
index c37496473526..000000000000
--- a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "pt_BR.aff"
- "pt_BR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_pt_BR.dic"
-)
-
-MYSPELL_THES=(
- "th_pt_BR.dat"
- "th_pt_BR.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Brazilian dictionaries for myspell/hunspell"
-HOMEPAGE="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/"
-SRC_URI="
- http://pt-br.libreoffice.org/assets/VeroptBRV${PV//./}AOG.oxt
- http://wiki.documentfoundation.org/images/f/ff/DicSin-BR.oxt -> ${P}-thes.oxt
-"
-
-LICENSE="LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index 2caab9f1c8a0..04fe7b5a1433 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -1,3 +1 @@
-DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916312c7904266ed34dffc832b4761887d7d316793c5b0863fdb4cf95808b7afaa24914598c1cdd839e3e073f08aee1fab6 SHA512 00e63f5abcfbb2fecd72dc2a2b80dc5ebb4d16aac909b2f63670235edadd0d22a5ed3ae0508bfdb273a85f32ee60df4e84dc620fa1a44f42543848b71a9d1b01
-DIST dict_pack_ru-aot-0-4-3.oxt 1393032 BLAKE2B 8fa0587ae31a155631f799dc7c0214cab0f6c58a059d6948c540061afd7111eee26c18cc638a560928201ff718a638178cebcbd1b7eb17e65b45709217b47332 SHA512 17c0f4d75c397014e3fcb653c8e20d907d9acb2594ba9e43986312d1081f46638a0e3737cb1bf3932d602342f53add26f02efc4edb7e24dd29522aba901f240a
DIST dict_pack_ru-aot-0.4.5.oxt 1584360 BLAKE2B 14282262644c8a2c1b1f7951f4c5e330213302d20b25f6fdcd431a72dbd0d42e47302402862b8bf5774d202b9c7975669cf395822d5926f6d6bf02f5a81cb342 SHA512 85391cbadbb152aecb30aee148ef936d950d1dc39d0722cc28650f50241cc0fae32c60ccc57d2a9fe8746dbb4df4579f5c002a6beefebd936322ed480aa13bd0
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
deleted file mode 100644
index 5a58decae94e..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=( ru_RU.{dic,aff} )
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extensions"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/russian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/file/${MY_PN}-${MY_PV//./-}.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
-
-src_prepare() {
- default
- mv russian-aot.dic ru_RU.dic || die
- mv russian-aot.aff ru_RU.aff || die
-}
diff --git a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
deleted file mode 100644
index 251e7847e82c..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=( ru_RU.{dic,aff} )
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extensions"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.3"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/russian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/0-4.3/@@download/file/${MY_PN}-${MY_PV//./-}.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-
-src_prepare() {
- default
- mv russian-aot.dic ru_RU.dic || die
- mv russian-aot.aff ru_RU.aff || die
-}
diff --git a/app-dicts/myspell-sk/Manifest b/app-dicts/myspell-sk/Manifest
index eb405a22243e..3ea0e862738d 100644
--- a/app-dicts/myspell-sk/Manifest
+++ b/app-dicts/myspell-sk/Manifest
@@ -1,2 +1 @@
-DIST myspell-sk-20110224.zip 1351228 BLAKE2B c2f5862083d541e9d9d0f169150e06a120c527cb63b19d1275095c47d1205424eaa48f1567eba381098523f317fca6dc6704b2b62355e2d44e179ee4aed78cfe SHA512 853790825816b3c2ad547c072f38d4441dc35fe6435d602de3741cae6a2ba4890e42fefe38dfda8f7bcfc2db61461a1a4220faee0edaf06c51875a1516fedf1b
DIST slovak-dictionaries-2020-05.oxt 1229188 BLAKE2B 9aacfceaecc04e7259eae30dcf4e82cf9bd172b0a64d8bf48fd5aaacb5d4ddcd99f951db9064876459a38eb2793de1bbed466fb65b183246eb3b68e99e25ae04 SHA512 d6d4b49c435037eb04515ce86aeafce418dffcbc0d8b4716a3cf653c3e6b88eccc402190538188c81d4f644081b036a98054c8d4ef731c925cdac7a12da3d1c5
diff --git a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
deleted file mode 100644
index 99558aab1413..000000000000
--- a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sk_SK/sk_SK.aff"
- "sk_SK/sk_SK.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_sk_SK/hyph_sk_SK.dic"
-)
-
-MYSPELL_THES=(
- "thes_sk_SK_v2/th_sk_SK_v2.dat"
- "thes_sk_SK_v2/th_sk_SK_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Slovak dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.liberix.cz/doplnky/slovniky/ooo/"
-SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-sl/Manifest b/app-dicts/myspell-sl/Manifest
index 5b2438ceb265..04c82566ff13 100644
--- a/app-dicts/myspell-sl/Manifest
+++ b/app-dicts/myspell-sl/Manifest
@@ -1,2 +1 @@
DIST myspell-sl-20201231.oxt 1606834 BLAKE2B 10a1bcebcd00809d863228c7b03011548153bf4dbdc8861dc89d1a7c18bead3231dc3e4415f4a5360f95ee8b8dbd07f6665f3c2241924bbfee4832774118dfc2 SHA512 0e0ca6dee5ce0a68ca4deca46652a4b385ca4077e8e542d5591f173f9c67b7544f7e2523ff7ea20a46030404f08ae899cb9f5da8a435a5fc88d09db5a527558e
-DIST pack-sl.oxt 1506739 BLAKE2B 801c7dd557c534c3b83e1360a765555b146eb23387a12e8ec779f9f4878760b9a87115ab97d6eb667bdde72bc367ee4c59d28fc2492cff764b5b44d33244c94f SHA512 7309e1f9e5c42ed41c660a195421b5dbfc9995c4970641c9da087d0f4f44126c5a98ddeaaae13f7ba563314cfaf981c8216c45d80fae2fda1d7c49fd943c32ee
diff --git a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
deleted file mode 100644
index 5e18b83e88a4..000000000000
--- a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sl_SI.aff"
- "sl_SI.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_sl_SI.dic"
-)
-
-MYSPELL_THES=(
- "th_sl_SI_v2.dat"
- "th_sl_SI_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Slovenian dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/${PV}/pack-sl.oxt"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-sw/Manifest b/app-dicts/myspell-sw/Manifest
index 8b0e7ee6ae18..fb9ba563a77d 100644
--- a/app-dicts/myspell-sw/Manifest
+++ b/app-dicts/myspell-sw/Manifest
@@ -1,2 +1 @@
-DIST myspell-sw-20110106.oxt 423064 BLAKE2B 32e74434714c62b4f5248775ac0ca0262d774a339c84899c822d0099ba1d90830620f748796d246373b566f5b1bbeddbb0b46fd3cf5d9c02168e2f0c18263dbf SHA512 734e760fb3ed95905f7ececc38ad3d4d87f77d5a953e5427d6d242ec73567a35311fea26d1298edb5d1650d6e07a6859c82bff8a6f309d226307873067cc7e98
DIST swahilidictionary-2013-03-12.oxt 423284 BLAKE2B 0b25ba69bd363234c21049e34a69c8addbe0b56f0b7b7a06108b0007a3fe388629323a6054fdb1e9035a5f4e06d7faffc6eb2d9ce0ae62fb9054571cf0ebe1f8 SHA512 e2980e682263b67179dbadea185c6bfe8e1871adbe62b217d09512e4b673547f8201dfcbe27187bb9eaf4915f456e83da8dfa24427c5bea5aab79354f64e76be
diff --git a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
deleted file mode 100644
index 2b356d110425..000000000000
--- a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sw_KE.aff"
- "sw_KE.dic"
- "sw_TZ.aff"
- "sw_TZ.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Kiswahili dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/swahili-dictionary"
-SRC_URI="mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/myspell-tn/Manifest b/app-dicts/myspell-tn/Manifest
index c81b4c8fda76..9d2a28910f47 100644
--- a/app-dicts/myspell-tn/Manifest
+++ b/app-dicts/myspell-tn/Manifest
@@ -1,2 +1 @@
DIST hunspell-tn-2-0-0.oxt 185743 BLAKE2B e583fd22e72e64f3824665faaf69b84bd25bd6944383c2e08a5b0e256a9621c2d0bf620f89cb81ce9b1d58cc94b6ce4d86f21cc3638fea5cf7fc372daf4e52b5 SHA512 4d591985e3c6b176c385c3a8e5f975c6b1b347e2ef070b1b6264a079403963d4eeddb12d5a61fe43b9fb1ec70d4f029a9cde243bfb54b2e8625a6d8229a9cb57
-DIST myspell-tn_ZA-20060316.zip 17125 BLAKE2B 74832b044863dd74c4b486d7ad57aec20c3caa32dc87ccecade5b3e19c2ad9fdfd2fd76525eb174e473db7c29c2c71f934f158adb8f40314e5b6d8967b61d869 SHA512 5cf59152ff423686e736356525fd3b35059158b410e8229ea7707597b99b0f5933b4a03f5ba9f851d77d02b7ef06d72b3dd37f690064f1d2d3902c459d0be50d
diff --git a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
deleted file mode 100644
index df6d5075aedc..000000000000
--- a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "tn_ZA.aff"
- "tn_ZA.dic"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Setswana dictionaries for myspell/hunspell"
-HOMEPAGE="https://www.openoffice.org/lingucomponent/"
-SRC_URI="mirror://gentoo/myspell-tn_ZA-20060316.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-uk/Manifest b/app-dicts/myspell-uk/Manifest
index 5f4aa19139b6..6fcd30c7e3f3 100644
--- a/app-dicts/myspell-uk/Manifest
+++ b/app-dicts/myspell-uk/Manifest
@@ -1,2 +1 @@
DIST dict-uk_UA-5.3.1.oxt 1787200 BLAKE2B 1dcc1fc2427f71ba8cc71df0638e8608beba2c3b65aea7ba915b1edfaf0a759c2768d0b6c32f6df5d70feb685f505364e6d9eddfc95a84dbbe7c2f818074922e SHA512 6a1d17a7f7b358eeef84451384f0ad951b70a76070097b7c1519eab79a67da086f9cae9b4e775e8feb723f2b8d77d744890ab5a83e47237e055ac4e5f7374873
-DIST dict-uk_ua-1.6.5.oxt 854246 BLAKE2B f8fba14ad3a57279993dc7f98b0084ba9a1f30054ce88747dfe817e3873394643b5365c2bcf9640065ba30263946580f6d510fc22c6cdcd7df6583ce01de2d91 SHA512 e1b74e299909af291e40674a6b783eacd289b16c7419e3311ea153c47520e06db70ff45a497db6d3f1cbe44bff10260e9fa6c7382d7a87e3efb2211ce1cb5ce8
diff --git a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
deleted file mode 100644
index fccdf38a0d95..000000000000
--- a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "uk_UA.aff"
- "uk_UA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_uk_UA.dic"
-)
-
-MYSPELL_THES=(
- "th_uk_UA.dat"
- "th_uk_UA.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
-SRC_URI="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/${PV}/dict-uk_ua-${PV}.oxt"
-
-LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index 4c1f7c52b8d4..f8304dddee8e 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1,2 +1 @@
-DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
DIST verbiste-0.1.47.tar.gz 781085 BLAKE2B 39f92bffc2165b49a2cd66ced4337aa4eb4253a1d767f0c26cea0bc10e965a5547158ab0de796b76016fd46bd220b305a14c9be42b76f5a25f0fde85e4ff1b97 SHA512 cc06d3e4a09b9edf2fe3996f527ae05fa50af909cc5ea6ed830d1b4f5706cf9b29028160cff842a211148e13d736f7e2cb74f10b3c5fd84d93a1038e05a26cbf
diff --git a/app-dicts/verbiste/verbiste-0.1.44.ebuild b/app-dicts/verbiste/verbiste-0.1.44.ebuild
deleted file mode 100644
index 216d19d2a72a..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.44.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
-
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- domenu src/gnome/verbiste.desktop
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if use gtk; then
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2f27de61ad90..ba0813f6e6f7 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 9e5a2b3007ba..56207e431ffe 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,3 +1,4 @@
DIST ghex-3.41.1.tar.xz 1499804 BLAKE2B dd75dc1cc5d847ae3b932ed0bb98b8e15f44943f76f0ba9f053c6770d05e31d211c9f75a910c93c09cf2de143db8fa0eda4fdb876a0ea3ed0534650e7ac36a65 SHA512 5eccf81c41f5ae56bfe5eab0fb843db0095c75080e7dfc0b19a4c71f40f89931e1cbcd2c58744a6b249d16e2a2e4f96513aaac4c41f46d3b5ae8b2bc851851a0
DIST ghex-42.0.tar.xz 1007772 BLAKE2B db85755e22470f345fcd926e26addcb3ea71c90bc0d71fb5f02ad71e875b3b0100856e4365f950a4040f266c1826be992e6a7a23e32ddebbf9ccdfce88e45f46 SHA512 20eb8b876e65e3a63b2bf5bcb7258f4c196380395805e7aa374a4dba79e8e0356507b7dad660cdfd49490cb9832863e84dfcfa74dd680f05d34742a3c23f6108
DIST ghex-42.1.tar.xz 1002984 BLAKE2B c526536c9e2a1b115a2af591ebf4a044950411ec6000c3d5a6e662813219d060ac0a0bd34549c76c9663c82c9ae3777b99e92e810de07e71905c524c37a76355 SHA512 7dc6ef8fc84b53e82367794ad4684232bb492fd8ae9320db499fb5d2ff5e15f23ae5e4839b91c0828ea74ec81d7bdc30383f3087e3165bc67761eaafa03efd61
+DIST ghex-42.2.tar.xz 1003120 BLAKE2B db44dbb7c2cb7447dea3dd48a1ad90ee75c6ce5b9c76178550be1f638f63a9748144e8aac7434d526c24c3eddd0c6f7c0178c6976d2a11e32e943127b7f09219 SHA512 d7c64013d894d1803e03b1afc025a3f39fa65d156aaf7885e692b2b10574f320fb329abd8059a9c084c701a655d7708b8f0dec09f8300c8491fc75a66b475bf7
diff --git a/app-editors/ghex/ghex-42.2.ebuild b/app-editors/ghex/ghex-42.2.ebuild
new file mode 100644
index 000000000000..b9a8b8490096
--- /dev/null
+++ b/app-editors/ghex/ghex-42.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ FDL-1.1+"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
+SLOT="4"
+
+RDEPEND="
+ >=dev-libs/glib-2.66.0:2
+ >=gui-libs/gtk-4.0.0:4
+ dev-libs/gobject-introspection
+ !app-editors/ghex:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? ( dev-util/gi-docgen )
+ test? (
+ dev-util/desktop-file-utils
+ dev-libs/appstream-glib
+ )
+ dev-util/gtk-update-icon-cache
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ -Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
+ -Dintrospection=enabled
+ $(meson_use gtk-doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
index 9f9908a37a0f..995a75551972 100644
--- a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wereturtle/ghostwriter/archive/refs/tags/${PV}.tar.g
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug"
BDEPEND="dev-qt/linguist-tools:5"
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 296b2fe990c5..490acf481053 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,3 +1,3 @@
DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
-DIST nano-6.1.tar.gz 3146292 BLAKE2B ade773182d12b6d6452c23896e564a097d850630c87b0af622fe7766931aa2e5ef5e9d868e521e46e029851cdd428cd60b6c3e95bdb28df0733cba8b432f202a SHA512 e034c9d7c96bf6d7ac22a2188fccf87693dd5d19ddbcfb907f817544fb2ddfce2ee9331842d885870718617ea4fd0c9151f62b3e8dc52a486cec9a30e84539c0
DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
+DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
diff --git a/app-editors/nano/nano-6.1.ebuild b/app-editors/nano/nano-6.1.ebuild
deleted file mode 100644
index 71abe2ce7b3e..000000000000
--- a/app-editors/nano/nano-6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
- inherit git-r3 autotools
-else
- MY_P="${PN}-${PV/_}"
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- 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"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
- >=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
- sys-libs/ncurses:=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- magic? ( !minimal )
-"
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
-
- # Since nano-5.0 these are no longer being "enabled" by default
- # (bug #736848)
- local rcdir="/usr/share/nano"
- mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
- rmdir "${ED}"${rcdir}/extra || die
-
- insinto "${rcdir}"
- doins "${FILESDIR}/gentoo.nanorc"
- fi
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-6.2.ebuild b/app-editors/nano/nano-6.2.ebuild
index 71abe2ce7b3e..10c087a181cc 100644
--- a/app-editors/nano/nano-6.2.ebuild
+++ b/app-editors/nano/nano-6.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
new file mode 100644
index 000000000000..9bd57c68b191
--- /dev/null
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+ inherit git-r3 autotools
+else
+ MY_P="${PN}-${PV/_}"
+ SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+ >=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+ sys-libs/ncurses:=[static-libs(+)]
+ magic? ( sys-apps/file[static-libs(+)] )
+ nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="
+ magic? ( !minimal )
+"
+
+src_prepare() {
+ default
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --htmldir=/trash
+ $(use_enable !minimal color)
+ $(use_enable !minimal multibuffer)
+ $(use_enable !minimal nanorc)
+ $(use_enable magic libmagic)
+ $(use_enable spell speller)
+ $(use_enable justify)
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable unicode utf8)
+ $(use_enable minimal tiny)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ # don't use "${ED}" here or things break (#654534)
+ rm -r "${D}"/trash || die
+
+ dodoc doc/sample.nanorc
+ docinto html
+ dodoc doc/faq.html
+ insinto /etc
+ newins doc/sample.nanorc nanorc
+ if ! use minimal ; then
+ # Enable colorization by default.
+ sed -i \
+ -e '/^# include /s:# *::' \
+ "${ED}"/etc/nanorc || die
+
+ # Since nano-5.0 these are no longer being "enabled" by default
+ # (bug #736848)
+ local rcdir="/usr/share/nano"
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+ rmdir "${ED}"${rcdir}/extra || die
+
+ insinto "${rcdir}"
+ doins "${FILESDIR}/gentoo.nanorc"
+ fi
+
+ use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index ad20434b2ed1..25ad3e614940 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
MY_P="${PN}-${PV/_}"
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+ SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
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"
fi
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 72165178aa2f..ac2e22b114d3 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ace-window/Manifest b/app-emacs/ace-window/Manifest
new file mode 100644
index 000000000000..62262c0bdbbb
--- /dev/null
+++ b/app-emacs/ace-window/Manifest
@@ -0,0 +1 @@
+DIST ace-window-0.10.0.tar.gz 12929 BLAKE2B 7cf6274004d47894471b850054f625af251b7eb3d09a9e7163580e5823b18f62f76ac46722f8885badb56435d04de652cdd81f5c3ef2aa008e601a717f195340 SHA512 15153b3b3e70337804a5fa0f51eba79b4fe4970b431b3a9cabeaf387a4cc83364a916045163e21b89104b23254a612491ae2e9f968a97f3b5232350ef571c5dd
diff --git a/app-emacs/ace-window/ace-window-0.10.0.ebuild b/app-emacs/ace-window/ace-window-0.10.0.ebuild
new file mode 100644
index 000000000000..64abbd9be25b
--- /dev/null
+++ b/app-emacs/ace-window/ace-window-0.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Quickly switch windows in Emacs"
+HOMEPAGE="https://github.com/abo-abo/ace-window/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-emacs/avy"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ace-window/files/50ace-window-gentoo.el b/app-emacs/ace-window/files/50ace-window-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ace-window/files/50ace-window-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ace-window/metadata.xml b/app-emacs/ace-window/metadata.xml
new file mode 100644
index 000000000000..7a9a52217acc
--- /dev/null
+++ b/app-emacs/ace-window/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/abo-abo/ace-window/issues/
+ abo-abo/ace-window
+
+
diff --git a/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild b/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..f37f89180fc6
--- /dev/null
+++ b/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Key-chord binding helper for use-package-chords"
+HOMEPAGE="https://github.com/jwiegley/use-package/"
+SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
+ -> use-package-${PV}.tar.gz"
+S="${WORKDIR}"/use-package-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-emacs/bind-key
+ app-emacs/key-chord
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ${PN}.el
+}
+
+src_install() {
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} ${PN}.el{,c}
+}
diff --git a/app-emacs/bind-chord/bind-chord-2.4.1.ebuild b/app-emacs/bind-chord/bind-chord-2.4.1.ebuild
deleted file mode 100644
index d920466ce87f..000000000000
--- a/app-emacs/bind-chord/bind-chord-2.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Key-chord binding helper for use-package-chords"
-HOMEPAGE="https://github.com/jwiegley/use-package/"
-SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
- -> use-package-${PV}.tar.gz"
-S="${WORKDIR}"/use-package-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- app-emacs/bind-key
- app-emacs/key-chord
-"
-BDEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp-compile ${PN}.el
-}
-
-src_install() {
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN}.el{,c}
-}
diff --git a/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild b/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..9a2527d8396d
--- /dev/null
+++ b/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Simple way to manage personal keybindings"
+HOMEPAGE="https://github.com/jwiegley/use-package/"
+SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
+ -> use-package-${PV}.tar.gz"
+S="${WORKDIR}"/use-package-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ${PN}.el
+}
+
+src_install() {
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} ${PN}.el{,c}
+}
diff --git a/app-emacs/bind-key/bind-key-2.4.1.ebuild b/app-emacs/bind-key/bind-key-2.4.1.ebuild
deleted file mode 100644
index eca71e9ca659..000000000000
--- a/app-emacs/bind-key/bind-key-2.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Simple way to manage personal keybindings"
-HOMEPAGE="https://github.com/jwiegley/use-package/"
-SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
- -> use-package-${PV}.tar.gz"
-S="${WORKDIR}"/use-package-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp-compile ${PN}.el
-}
-
-src_install() {
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN}.el{,c}
-}
diff --git a/app-emacs/bnf-mode/Manifest b/app-emacs/bnf-mode/Manifest
new file mode 100644
index 000000000000..9f6c1ef69a22
--- /dev/null
+++ b/app-emacs/bnf-mode/Manifest
@@ -0,0 +1 @@
+DIST bnf-mode-0.4.5_pre20220102.tar.gz 27103 BLAKE2B 816637a440cfbe009873ea1c5033532a24ef1b8e842415665458b18d3ba7e9f37a1521e67e43c6287a598c8eb671b514563b1d255031ad255ec51ad5995579cd SHA512 d3d7215efb19c313aba1a99100616b1ee7345d41933921d5150c6d72c7afc5f4b86e085a07bddce78aac7400cf605d8d0ba1c24232df79ad01fef5744567778f
diff --git a/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
new file mode 100644
index 000000000000..8c438602742d
--- /dev/null
+++ b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=d9329dd90e5d4f629295e85898362d9682047898
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing BNF grammars"
+HOMEPAGE="https://github.com/sergeyklay/bnf-mode/"
+SRC_URI="https://github.com/sergeyklay/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ app-emacs/buttercup
+ app-emacs/undercover
+ )
+"
+
+DOCS=( NEWS README.org )
+ELISP_REMOVE=".dir-locals.el"
+ELISP_TEXINFO="bnf-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
new file mode 100644
index 000000000000..2679585378f2
--- /dev/null
+++ b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bnf-mode "bnf-mode"
+ "A major mode for editing BNF grammars." t)
+(add-to-list 'auto-mode-alist '("\\.bnf\\'" . bnf-mode))
diff --git a/app-emacs/bnf-mode/metadata.xml b/app-emacs/bnf-mode/metadata.xml
new file mode 100644
index 000000000000..5dc13c7cc06e
--- /dev/null
+++ b/app-emacs/bnf-mode/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/sergeyklay/bnf-mode/issues/
+ sergeyklay/bnf-mode
+
+
diff --git a/app-emacs/bui/Manifest b/app-emacs/bui/Manifest
new file mode 100644
index 000000000000..178ff21e1166
--- /dev/null
+++ b/app-emacs/bui/Manifest
@@ -0,0 +1 @@
+DIST bui-1.2.1_p20210108.tar.gz 38639 BLAKE2B a1c460db08e75d64247dc071ba80776e35a398d88c323d01a7de0bc79cb843699094626c181328714618a45f5841b07eae79c2c38a57a5d9938af5568dfeb872 SHA512 11c67b9eb34be8350fba029bc7a29703b89aecf8bf1b407f23930c97f883264a69907e079c8b88fa7b7c586d70d5506de3885fa81bbf93f0a7f822b0f576b5e9
diff --git a/app-emacs/bui/bui-1.2.1_p20210108.ebuild b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
new file mode 100644
index 000000000000..8b85fbff9f3b
--- /dev/null
+++ b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=f3a137628e112a91910fd33c0cff0948fa58d470
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Buffer interface library for Emacs"
+HOMEPAGE="https://github.com/alezost/bui.el/"
+SRC_URI="https://github.com/alezost/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-emacs/dash"
+BDEPEND="${RDEPEND}"
+
+DOCS=( NEWS README.org examples )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bui/files/50bui-gentoo.el b/app-emacs/bui/files/50bui-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/bui/files/50bui-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/bui/metadata.xml b/app-emacs/bui/metadata.xml
new file mode 100644
index 000000000000..4bd2abf9fc87
--- /dev/null
+++ b/app-emacs/bui/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/alezost/bui.el/master/NEWS
+ https://github.com/alezost/bui.el/issues/
+ alezost/bui.el
+
+
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index 07dbcd1e884b..361966f289e9 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1 +1,2 @@
DIST buttercup-1.24.tar.gz 85337 BLAKE2B fb40d0899f68aff5f2fdb989b2c0e42005e6667ecfe8a4ca806ddb4139f497f0eed5328ba6407136b757a0f13bc6ec5ee488792da3de1e84edba394a781c410c SHA512 0a436f5e5bcf386a3675ef281ac6c9f0125917058de88a5557d879004bbf7cd4298086aa3fb86f2bd807f46c166b0fb02e248cc485878891293147656525f8ca
+DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
diff --git a/app-emacs/buttercup/buttercup-1.24-r1.ebuild b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
new file mode 100644
index 000000000000..58f468512d73
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+DESCRIPTION="Behaviour-driven Elisp testing"
+HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
+SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# https://github.com/jorgenschaefer/emacs-buttercup/pull/210
+PATCHES=( "${FILESDIR}"/${P}-properties-equal.patch )
+
+DOCS=( docs/{running,writing}-tests.md )
+ELISP_REMOVE="buttercup-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l buttercup \
+ -f buttercup-run-discover || die "tests failed"
+}
+
+src_install() {
+ elisp_src_install
+ dobin bin/${PN}
+}
diff --git a/app-emacs/buttercup/buttercup-1.24.ebuild b/app-emacs/buttercup/buttercup-1.24.ebuild
deleted file mode 100644
index a10a06a28765..000000000000
--- a/app-emacs/buttercup/buttercup-1.24.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="24.3"
-
-inherit elisp
-
-DESCRIPTION="Behaviour-driven Elisp testing"
-HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
-SRC_URI="https://github.com/jorgenschaefer/emacs-buttercup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-buttercup-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://github.com/jorgenschaefer/emacs-buttercup/pull/210
-PATCHES=( "${FILESDIR}"/${PN}-1.24-properties-equal.patch )
-
-DOCS=( docs/{running,writing}-tests.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp_src_compile
- elisp-make-autoload-file
-}
-
-src_test() {
- ${EMACS} ${EMACSFLAGS} -L . -l buttercup \
- -f buttercup-run-discover || die "tests failed"
-}
-
-src_install() {
- elisp_src_install
- dobin bin/${PN}
-}
diff --git a/app-emacs/buttercup/buttercup-1.25.ebuild b/app-emacs/buttercup/buttercup-1.25.ebuild
new file mode 100644
index 000000000000..aaf465a347d8
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.25.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+DESCRIPTION="Behaviour-driven Elisp testing"
+HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
+SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( docs/{running,writing}-tests.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l buttercup \
+ -f buttercup-run-discover || die "tests failed"
+}
+
+src_install() {
+ elisp_src_install
+ dobin bin/${PN}
+}
diff --git a/app-emacs/buttercup/files/50buttercup-gentoo.el b/app-emacs/buttercup/files/50buttercup-gentoo.el
index 102ffcd8d3b9..431f7e90ae73 100644
--- a/app-emacs/buttercup/files/50buttercup-gentoo.el
+++ b/app-emacs/buttercup/files/50buttercup-gentoo.el
@@ -1,2 +1 @@
(add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/buttercup-autoloads" nil t)
diff --git a/app-emacs/cfrs/Manifest b/app-emacs/cfrs/Manifest
new file mode 100644
index 000000000000..150bfdcc6f4d
--- /dev/null
+++ b/app-emacs/cfrs/Manifest
@@ -0,0 +1 @@
+DIST cfrs-1.6.0.tar.gz 27891 BLAKE2B 7eeaab09b5376382c07d55492126dba4b45124e626ad4671c0ed3d45c65761a5a044dd63452a7d6de6d00336814a7ee59242b4c3f691294a610b028073fb730d SHA512 a56d9329768b4f06ad55f9d351b98bc22a899b5e9e8c261f296f035b6b8d389f7271705a0e268ce4500dcf3d814a7f8eb881e30d8e3c2aa29376f2de872ed725
diff --git a/app-emacs/cfrs/cfrs-1.6.0.ebuild b/app-emacs/cfrs/cfrs-1.6.0.ebuild
new file mode 100644
index 000000000000..b95d7c81e888
--- /dev/null
+++ b/app-emacs/cfrs/cfrs-1.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Child Frame Read String, alternative to read-string"
+HOMEPAGE="https://github.com/Alexander-Miller/cfrs/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+ app-emacs/dash
+ app-emacs/posframe
+ app-emacs/s
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org cfrs.png )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/cfrs/files/50cfrs-gentoo.el b/app-emacs/cfrs/files/50cfrs-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/cfrs/files/50cfrs-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/cfrs/metadata.xml b/app-emacs/cfrs/metadata.xml
new file mode 100644
index 000000000000..a8b09c169723
--- /dev/null
+++ b/app-emacs/cfrs/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/Alexander-Miller/cfrs/issues/
+ Alexander-Miller/cfrs
+
+
diff --git a/app-emacs/dap-mode/Manifest b/app-emacs/dap-mode/Manifest
new file mode 100644
index 000000000000..2ddf4ae9ac55
--- /dev/null
+++ b/app-emacs/dap-mode/Manifest
@@ -0,0 +1 @@
+DIST dap-mode-0.7.tar.gz 6147924 BLAKE2B 300a058134e58e5ae5f94fd62251c1c621478b3148e7453ef5acd062a2c6088f0036e3ac2588ce22138d39b77221396c3f310177914b08a2bbc177cfbc14efce SHA512 ba8d8e2b3e9b699b27226b13624b24a6f78ea884fe9e8e7667537e06285354bf996f7f5d621e2576ad34bbf02ede316bf001444b8b5c67fa604aa5dc5d9416ff
diff --git a/app-emacs/dap-mode/dap-mode-0.7.ebuild b/app-emacs/dap-mode/dap-mode-0.7.ebuild
new file mode 100644
index 000000000000..38928cefa99b
--- /dev/null
+++ b/app-emacs/dap-mode/dap-mode-0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Debug Adapter Protocol mode"
+HOMEPAGE="https://github.com/emacs-lsp/dap-mode/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-emacs/bui
+ app-emacs/dash
+ app-emacs/f
+ app-emacs/ht
+ app-emacs/lsp-mode
+ app-emacs/lsp-treemacs
+ app-emacs/posframe
+ app-emacs/s
+"
+BDEPEND="
+ ${RDEPEND}
+ test? ( app-emacs/ert-runner )
+"
+
+DOCS=( CHANGELOG.org README.org )
+PATCHES=( "${FILESDIR}"/${PN}-dap-ui-images-root-dir.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i dap-ui.el || die
+}
+
+src_test() {
+ ert-runner -L . -L test --reporter ert+duration || die
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+}
diff --git a/app-emacs/dap-mode/files/50dap-mode-gentoo.el b/app-emacs/dap-mode/files/50dap-mode-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/dap-mode/files/50dap-mode-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch b/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch
new file mode 100644
index 000000000000..53bbb2ad13b2
--- /dev/null
+++ b/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch
@@ -0,0 +1,12 @@
+index ba02fee..56be79f 100644
+--- a/dap-ui.el
++++ b/dap-ui.el
+@@ -486,7 +486,7 @@ DEBUG-SESSION is the debug session triggering the event."
+
+
+ ;; dap-ui posframe stuff
+-(defvar dap-ui--control-images-root-dir (f-join (f-dirname (file-truename (or load-file-name buffer-file-name))) "icons/vscode"))
++(defvar dap-ui--control-images-root-dir "@SITEETC@/icons/vscode")
+ (defvar dap-ui--control-buffer " *dap-ui*")
+
+ (defun dap-ui--create-command (image command hover-text)
diff --git a/app-emacs/dap-mode/metadata.xml b/app-emacs/dap-mode/metadata.xml
new file mode 100644
index 000000000000..c5f3eebffb11
--- /dev/null
+++ b/app-emacs/dap-mode/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/emacs-lsp/dap-mode/master/CHANGELOG.org
+ https://github.com/emacs-lsp/dap-mode/issues/
+ emacs-lsp/dap-mode
+
+
diff --git a/app-emacs/deferred/Manifest b/app-emacs/deferred/Manifest
new file mode 100644
index 000000000000..e6e48ba7ba57
--- /dev/null
+++ b/app-emacs/deferred/Manifest
@@ -0,0 +1 @@
+DIST deferred-0.5.1.tar.gz 55894 BLAKE2B 61ba363620d56ad4c5f3fb9434f9550015681f6b8eafb318a9e6aa227aa17875218c12338fe377a840bdc429972d6e285a9744ec6640f277bfe7e4bdaee4a733 SHA512 357890f73917c7929cbb79f71a26901ac24abe9ea532181b730deee8eba97709b41c360904e2a2a8028ee1295e7ae845da5c702c74256a450f3d144080960a2b
diff --git a/app-emacs/deferred/deferred-0.5.1.ebuild b/app-emacs/deferred/deferred-0.5.1.ebuild
new file mode 100644
index 000000000000..a128977ca6b4
--- /dev/null
+++ b/app-emacs/deferred/deferred-0.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Deferred and Concurrent - simple asynchronous functions for Emacs Lisp"
+HOMEPAGE="https://github.com/kiwanami/emacs-deferred/"
+SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ app-emacs/ert-runner
+ app-emacs/undercover
+ )
+"
+
+DOCS=( README-concurrent.ja.markdown README-concurrent.markdown
+ README.ja.markdown README.markdown sample )
+
+# "Concurrent" tests pass, "Deferred" tests are malformed
+ELISP_REMOVE="test/${PN}-test.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ert-runner --reporter ert+duration || die
+}
diff --git a/app-emacs/deferred/files/50deferred-gentoo.el b/app-emacs/deferred/files/50deferred-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/deferred/files/50deferred-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/deferred/metadata.xml b/app-emacs/deferred/metadata.xml
new file mode 100644
index 000000000000..1ee0a0b8a641
--- /dev/null
+++ b/app-emacs/deferred/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/kiwanami/emacs-deferred/issues/
+ kiwanami/emacs-deferred
+
+
diff --git a/app-emacs/elixir-mode/Manifest b/app-emacs/elixir-mode/Manifest
new file mode 100644
index 000000000000..886db9f4938e
--- /dev/null
+++ b/app-emacs/elixir-mode/Manifest
@@ -0,0 +1 @@
+DIST elixir-mode-2.3.2_p20220314.tar.gz 35711 BLAKE2B f4d712bce35f1056a2b2baf23077fff6204d572f215bf3afe31e26fc15691927afdbe880f942073e80dbe0ce3937dc619b24f89f821a6655f944a448db995744 SHA512 f4467459918db88408c2fa04fcb053fcdf2987c5907f0481034fa18bc3c7a805a7a01d071d7662f4d0db16aa02faa312f225b2b6f45587ccf06a616a1b6df485
diff --git a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
new file mode 100644
index 000000000000..82a834e2aec9
--- /dev/null
+++ b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=e0d0466d83ec80ddb412bb1473908a21baad1ec3
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Elixir files"
+HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
+SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/${H}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-elixir-${H}
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ app-emacs/ert-runner
+ dev-lang/elixir
+ )
+"
+
+DOCS=( CHANGELOG.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ert-runner -L . -L tests --reporter ert+duration tests || die
+}
diff --git a/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el b/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el
new file mode 100644
index 000000000000..d90ae53151be
--- /dev/null
+++ b/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elixir-mode "elixir-mode"
+ "Major mode for editing Elixir code." t)
+(add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("mix\\.lock" . elixir-mode))
diff --git a/app-emacs/elixir-mode/metadata.xml b/app-emacs/elixir-mode/metadata.xml
new file mode 100644
index 000000000000..5f5dd3fd1e80
--- /dev/null
+++ b/app-emacs/elixir-mode/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/elixir-editors/emacs-elixir/issues/
+ elixir-editors/emacs-elixir
+
+
diff --git a/app-emacs/elpher/Manifest b/app-emacs/elpher/Manifest
new file mode 100644
index 000000000000..2ef1286704a2
--- /dev/null
+++ b/app-emacs/elpher/Manifest
@@ -0,0 +1 @@
+DIST elpher-3.3.3.tar.gz 57439 BLAKE2B f8e3f2acba0faf0eeae06fe86699dc97def0119a6d6e2fa2ad34555e20907deb566f99a669e8f98380c95293c4a38cca9bc47678f36597c898ba1e33dc6d0880 SHA512 ca40dcb92af8b5f3635cd45f0877f750746d0eb61aff71fc16754770709d15f35d0f335a04ecd9ee6b6f13440f9a9e55afb2cdb2934e550157b3218d428fdfa1
diff --git a/app-emacs/elpher/elpher-3.3.3.ebuild b/app-emacs/elpher/elpher-3.3.3.ebuild
new file mode 100644
index 000000000000..0213ce72cc37
--- /dev/null
+++ b/app-emacs/elpher/elpher-3.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=ab75cff
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
+HOMEPAGE="https://thelambdalab.xyz/elpher/"
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( ISSUES.org README )
+ELISP_REMOVE="elpher-pkg.el"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/elpher/files/50elpher-gentoo.el b/app-emacs/elpher/files/50elpher-gentoo.el
new file mode 100644
index 000000000000..a73fc867a088
--- /dev/null
+++ b/app-emacs/elpher/files/50elpher-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elpher "elpher"
+ "Start elpher with default landing page." t)
diff --git a/app-emacs/elpher/metadata.xml b/app-emacs/elpher/metadata.xml
new file mode 100644
index 000000000000..717a115d639c
--- /dev/null
+++ b/app-emacs/elpher/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
diff --git a/app-emacs/flycheck-package/Manifest b/app-emacs/flycheck-package/Manifest
new file mode 100644
index 000000000000..4c6e2c0a7a17
--- /dev/null
+++ b/app-emacs/flycheck-package/Manifest
@@ -0,0 +1 @@
+DIST flycheck-package-0.14.tar.gz 3214 BLAKE2B 8e4eafdd34d4e0e5e00f15ae0684725d4ddff867bc13913012068da95bd3233b8c05e60b7d746b4941c6e4bce02299acfbecf1cae1d4754fd12e61a4fbbc761d SHA512 c1a94ae2c3c460843225f121f4e9c837c8fc86e958987e9a31b95aafc9999c9a7475491f08ed16a5cc95085be5dedee045b08b9ee114688a722b612cef096bfa
diff --git a/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
new file mode 100644
index 000000000000..834c2c4d32fe
--- /dev/null
+++ b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-package-setup "flycheck-package"
+ "Setup flycheck-package." t nil)
+(eval-after-load 'flycheck '(flycheck-package-setup))
diff --git a/app-emacs/flycheck-package/flycheck-package-0.14.ebuild b/app-emacs/flycheck-package/flycheck-package-0.14.ebuild
new file mode 100644
index 000000000000..fa804db7e21c
--- /dev/null
+++ b/app-emacs/flycheck-package/flycheck-package-0.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Flycheck checker for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/flycheck-package/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+ app-emacs/flycheck
+ app-emacs/package-lint
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flycheck-package/metadata.xml b/app-emacs/flycheck-package/metadata.xml
new file mode 100644
index 000000000000..8fb4e80caddb
--- /dev/null
+++ b/app-emacs/flycheck-package/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/purcell/flycheck-package/issues/
+ purcell/flycheck-package
+
+
diff --git a/app-emacs/hydra/Manifest b/app-emacs/hydra/Manifest
new file mode 100644
index 000000000000..056b7d9a81d9
--- /dev/null
+++ b/app-emacs/hydra/Manifest
@@ -0,0 +1 @@
+DIST hydra-0.15.0.tar.gz 36150 BLAKE2B 6e7d1ed6501d5b0fb40f3545d61469e461363dc7ec8900c7c697116cb19704529acfd9e886a1fef09ae50dfd68666e6455c62447140f55b1f4651490855c2b3a SHA512 815a8c425aaeb4d2aeb5d9faa0f66a41e37420b8e9435d93b9e78913c0e0722d1e39cad2e8f4bc12cfe34dad2e3fc1290b23d816181b12fd093f9e4d9d37e814
diff --git a/app-emacs/hydra/files/50hydra-gentoo.el b/app-emacs/hydra/files/50hydra-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/hydra/files/50hydra-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/hydra/hydra-0.15.0.ebuild b/app-emacs/hydra/hydra-0.15.0.ebuild
new file mode 100644
index 000000000000..dcfd674f615e
--- /dev/null
+++ b/app-emacs/hydra/hydra-0.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Make Emacs bindings that stick around"
+HOMEPAGE="https://github.com/abo-abo/hydra/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="app-emacs/lv"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md doc/Changelog.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ rm hydra-test.el{,c} lv.el{,c} || die
+ elisp_src_install
+}
diff --git a/app-emacs/hydra/metadata.xml b/app-emacs/hydra/metadata.xml
new file mode 100644
index 000000000000..9197a9c94fad
--- /dev/null
+++ b/app-emacs/hydra/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/abo-abo/hydra/master/doc/Changelog.org
+ https://github.com/abo-abo/hydra/issues/
+ abo-abo/hydra
+
+
diff --git a/app-emacs/lsp-java/Manifest b/app-emacs/lsp-java/Manifest
new file mode 100644
index 000000000000..f297d2a6bc4b
--- /dev/null
+++ b/app-emacs/lsp-java/Manifest
@@ -0,0 +1 @@
+DIST lsp-java-3.1.tar.gz 823300 BLAKE2B eacf2090822b629ea775e5848ddc9993ba09217e1eb9563ce9532da075a6cfd1f001010ca886f8bd42ac9af95d12c91dac9ac946ddafb1b6e544943cf44a2036 SHA512 34951a1c4a050215d388fb5f273c9f2cb76788b9e2120d4b0f49b20cd5a1151be039351bece6ae311fb7f37a6ee72a2e641a49f6194886c9729b5b5659e02428
diff --git a/app-emacs/lsp-java/files/50lsp-java-gentoo.el b/app-emacs/lsp-java/files/50lsp-java-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/lsp-java/files/50lsp-java-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/lsp-java/files/lsp-java-icons.patch b/app-emacs/lsp-java/files/lsp-java-icons.patch
new file mode 100644
index 000000000000..5c89490d8688
--- /dev/null
+++ b/app-emacs/lsp-java/files/lsp-java-icons.patch
@@ -0,0 +1,25 @@
+index b7f8083..571a19e 100644
+--- a/lsp-java.el
++++ b/lsp-java.el
+@@ -78,7 +78,7 @@ Use http://download.eclipse.org/che/che-ls-jdt/snapshots/che-jdt-language-server
+ :risky t
+ :type 'directory)
+
+-(defcustom lsp-java-themes-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons")
++(defcustom lsp-java-themes-directory "@SITEETC@/icons"
+ "Directory containing themes."
+ :type 'directory
+ :group 'lsp-java)
+diff --git a/lsp-jt.el b/lsp-jt.el
+index 4aecfd9..ea05a51 100644
+--- a/lsp-jt.el
++++ b/lsp-jt.el
+@@ -185,7 +185,7 @@
+ (-uniq (gethash 'jdtls (lsp-session-server-id->folders (lsp-session)))))
+
+ (treemacs-modify-theme "Default"
+- :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode")
++ :icon-directory "@SITEETC@/icons/vscode/"
+ :config
+ (progn
+ (treemacs-create-icon :file "class.png" :extensions (java-test-class) :fallback "-")
diff --git a/app-emacs/lsp-java/lsp-java-3.1.ebuild b/app-emacs/lsp-java/lsp-java-3.1.ebuild
new file mode 100644
index 000000000000..d67e027ae82a
--- /dev/null
+++ b/app-emacs/lsp-java/lsp-java-3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs Java IDE using Eclipse JDT Language Server"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-java/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+RESTRICT="test" # Tests are unnecessary, they run "build compile checkdoc lint"
+
+RDEPEND="
+ app-emacs/dap-mode
+ app-emacs/dash
+ app-emacs/f
+ app-emacs/ht
+ app-emacs/lsp-mode
+ app-emacs/markdown-mode
+ app-emacs/request
+ app-emacs/treemacs
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md images )
+PATCHES=( "${FILESDIR}"/${PN}-icons.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i ${PN}.el -i lsp-jt.el || die
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+}
diff --git a/app-emacs/lsp-java/metadata.xml b/app-emacs/lsp-java/metadata.xml
new file mode 100644
index 000000000000..5fcc78f3e9bc
--- /dev/null
+++ b/app-emacs/lsp-java/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/emacs-lsp/lsp-java/issues/
+ emacs-lsp/lsp-java
+
+
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..ec668118c0b9
--- /dev/null
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Emacs client/library for the Language Server Protocol"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-emacs/dash-2.18.0
+ >=app-emacs/f-0.20.0
+ app-emacs/ht
+ app-emacs/lv
+ app-emacs/markdown-mode
+ app-emacs/spinner
+"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ app-emacs/deferred
+ app-emacs/ecukes
+ app-emacs/el-mock
+ app-emacs/ert-runner
+ app-emacs/espuds
+ app-emacs/flycheck
+ app-emacs/undercover
+ )
+"
+
+DOCS=( AUTHORS CHANGELOG.org README.md refcard )
+BYTECOMPFLAGS="-L . -L clients"
+ELISP_REMOVE="test/lsp-clangd-test.el test/lsp-common-test.el
+ test/lsp-integration-test.el" # Remove failing tests
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp_src_compile
+ elisp-compile clients/*.el
+}
+
+src_test() {
+ ert-runner -L clients --reporter ert+duration -t "!no-win" -t "!org" || die
+}
+
+src_install() {
+ elisp_src_install
+ elisp-install ${PN}/clients clients/*
+}
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
deleted file mode 100644
index 610948576522..000000000000
--- a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Emacs client/library for the Language Server Protocol"
-HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
-SRC_URI="https://github.com/emacs-lsp/lsp-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-DOCS="CHANGELOG.org README.md"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
- >=app-emacs/dash-2.18.0
- >=app-emacs/f-0.20.0
- >=app-emacs/ht-2.3
- app-emacs/lv
- >=app-emacs/markdown-mode-2.3
- >=app-emacs/spinner-1.7.3
-"
-DEPEND=${RDEPEND}
-
-# Requires unpackaged dependencies, e.g. Cask
-RESTRICT="test"
-
-src_install() {
- elisp_src_install
-
- elisp-install ${PN}/clients clients/*
-}
diff --git a/app-emacs/lsp-treemacs/Manifest b/app-emacs/lsp-treemacs/Manifest
new file mode 100644
index 000000000000..0da450066a20
--- /dev/null
+++ b/app-emacs/lsp-treemacs/Manifest
@@ -0,0 +1 @@
+DIST lsp-treemacs-0.4.tar.gz 1414056 BLAKE2B 508032a0514cb32e6f05974966dcc035d35f4780ef936f730901c3b5c9d5ab3f632ae22faf0a37fb81cf0e3388e53453c28e304f48ee5a8e090c9b771db47caf SHA512 e9e7ae5459c924d201fd164eaf245fd872187388bf9ead39e51962ad867919a7511f23543da01c17cad08f3fc0fe7b7607d6a2a5bc4d04dd392c6e6c5f3374d3
diff --git a/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el b/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch b/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch
new file mode 100644
index 000000000000..da681081c975
--- /dev/null
+++ b/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch
@@ -0,0 +1,39 @@
+index 3a24127..2dbe570 100644
+--- a/lsp-treemacs-themes.el
++++ b/lsp-treemacs-themes.el
+@@ -32,7 +32,7 @@
+ :group 'lsp-treemacs)
+
+ (treemacs-modify-theme "Default"
+- :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode")
++ :icon-directory "@SITEETC@/icons/vscode"
+ :config
+ (progn
+ (treemacs-create-icon :file "BooleanData.png" :extensions (boolean-data) :fallback "-")
+@@ -107,7 +107,7 @@
+
+ (treemacs-create-theme "Eclipse"
+ :extends "Default"
+- :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/eclipse")
++ :icon-directory "@SITEETC@/icons/eclipse"
+ :config
+ (progn
+ (treemacs-create-icon :file "vscode/Namespace.png" :extensions (namespace) :fallback "-")
+@@ -140,7 +140,7 @@
+
+ (treemacs-create-theme "Netbeans"
+ :extends "Default"
+- :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/netbeans")
++ :icon-directory "@SITEETC@/icons/netbeans"
+ :config
+ (progn
+ (treemacs-create-icon :file "vscode/Namespace.png" :extensions (namespace) :fallback "-")
+@@ -173,7 +173,7 @@
+
+ (treemacs-create-theme "Idea"
+ :extends "Default"
+- :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/idea")
++ :icon-directory "@SITEETC@/icons/idea"
+ :config
+ (progn
+ (treemacs-create-icon :file "vscode/template.png" :extensions (template) :fallback "-")
diff --git a/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild b/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild
new file mode 100644
index 000000000000..ef05f39a0638
--- /dev/null
+++ b/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Integration between lsp-mode and treemacs"
+HOMEPAGE="https://github.com/emacs-lsp/lsp-treemacs/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+ app-emacs/dash
+ app-emacs/f
+ app-emacs/ht
+ app-emacs/lsp-mode
+ app-emacs/treemacs
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-themes-icon-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i ${PN}-themes.el || die
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+}
diff --git a/app-emacs/lsp-treemacs/metadata.xml b/app-emacs/lsp-treemacs/metadata.xml
new file mode 100644
index 000000000000..f1fee62f0029
--- /dev/null
+++ b/app-emacs/lsp-treemacs/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/emacs-lsp/lsp-treemacs/issues/
+ emacs-lsp/lsp-treemacs
+
+
diff --git a/app-emacs/package-lint/Manifest b/app-emacs/package-lint/Manifest
new file mode 100644
index 000000000000..a55a783a16b8
--- /dev/null
+++ b/app-emacs/package-lint/Manifest
@@ -0,0 +1 @@
+DIST package-lint-0.16.tar.gz 224744 BLAKE2B a1d26ae28727e305416498b66da188cbadababc9f415c199eff380dbce4888ee3137b6f13a26147d427142a9d244c784e192d21df3173d0a0c2dde4acb1e8630 SHA512 f5d79b69d37671233614a622cd5fd6c28c230adb0d5b7934ccd6bedc12228adb7bdef6739fdd32be383cefceb65b9538a00f763b49be6499e4b6e3f8b1a34616
diff --git a/app-emacs/package-lint/files/50package-lint-gentoo.el b/app-emacs/package-lint/files/50package-lint-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/package-lint/files/50package-lint-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch b/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch
new file mode 100644
index 000000000000..1b8644976721
--- /dev/null
+++ b/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch
@@ -0,0 +1,26 @@
+index 2ecaef5..8178375 100644
+--- a/package-lint.el
++++ b/package-lint.el
+@@ -106,13 +106,15 @@ a backport library shipping the feature and VERSION is an
+ optional minimum version containing the feature.")
+
+ (defconst package-lint-symbol-info
+- (let* ((stdlib-changes (with-temp-buffer
+- (insert-file-contents
+- (expand-file-name "data/stdlib-changes"
+- (if load-file-name
+- (file-name-directory load-file-name)
+- default-directory)))
+- (read (current-buffer))))
++ (let* ((stdlib-changes
++ (with-temp-buffer
++ (insert-file-contents
++ (let ((siteetc-stdlib-changes
++ (expand-file-name "data/stdlib-changes" "@SITEETC@")))
++ (if (file-exists-p siteetc-stdlib-changes)
++ siteetc-stdlib-changes
++ (expand-file-name "data/stdlib-changes" default-directory))))
++ (read (current-buffer))))
+ (info (make-hash-table)))
+ (pcase-dolist (`(,version . ,data) stdlib-changes)
+ (pcase-dolist (`(,syms . ,action)
diff --git a/app-emacs/package-lint/metadata.xml b/app-emacs/package-lint/metadata.xml
new file mode 100644
index 000000000000..ddaf53faef36
--- /dev/null
+++ b/app-emacs/package-lint/metadata.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/purcell/package-lint/issues/
+ purcell/package-lint
+
+
+ This library provides a linter for the metadata in Emacs Lisp files which
+ are intended to be packages. You can integrate it into your build process.
+ package-lint detects various issues that may make your package
+ uninstallable or unusable for some users, and it warns about significant
+ deviations from the Elisp coding conventions, such as non-compliant symbol
+ naming, and use of reserved keybindings. Among other community uses,
+ package-lint is a prerequisite for submission of packages to MELPA.
+ package-lint can be used standalone, but see also the flycheck-package and
+ package-lint-flymake packages, which both use package-lint to conveniently
+ display packaging errors directly in the buffer while writing elisp
+ packages.
+
+
diff --git a/app-emacs/package-lint/package-lint-0.16-r1.ebuild b/app-emacs/package-lint/package-lint-0.16-r1.ebuild
new file mode 100644
index 000000000000..4f165583d630
--- /dev/null
+++ b/app-emacs/package-lint/package-lint-0.16-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Linting library for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/package-lint/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-symbol-info-data-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+ elisp-install ${PN} ${PN}{,-flymake}.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ insinto ${SITEETC}/${PN}
+ doins -r data
+
+ einstalldocs
+}
diff --git a/app-emacs/pfuture/Manifest b/app-emacs/pfuture/Manifest
new file mode 100644
index 000000000000..d02447d045a1
--- /dev/null
+++ b/app-emacs/pfuture/Manifest
@@ -0,0 +1 @@
+DIST pfuture-1.10.3.tar.gz 6187 BLAKE2B e00c7226239c08802d548f03d08aea628ea28dbab9bb22209979d9d7bdee7927485a929979534ae68d9ad28bfc1318e26c6c2e8fedcb4303a802d3bc6b6adc1f SHA512 1dbb0e4f168c36617f8c6890894bb618c4e13b667fae32a00ddfc01b7ccdb5c1742e7f93ddcc2e61e24fd69236debb32107c7a34efe9c19d66796c044d9ea1d5
diff --git a/app-emacs/pfuture/files/50pfuture-gentoo.el b/app-emacs/pfuture/files/50pfuture-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/pfuture/files/50pfuture-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/pfuture/metadata.xml b/app-emacs/pfuture/metadata.xml
new file mode 100644
index 000000000000..5757b6106d73
--- /dev/null
+++ b/app-emacs/pfuture/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/Alexander-Miller/pfuture/issues/
+ Alexander-Miller/pfuture
+
+
diff --git a/app-emacs/pfuture/pfuture-1.10.3.ebuild b/app-emacs/pfuture/pfuture-1.10.3.ebuild
new file mode 100644
index 000000000000..6c894e8c2968
--- /dev/null
+++ b/app-emacs/pfuture/pfuture-1.10.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.2
+
+inherit elisp
+
+DESCRIPTION="Simple wrapper around asynchronous processes"
+HOMEPAGE="https://github.com/Alexander-Miller/pfuture/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/posframe/Manifest b/app-emacs/posframe/Manifest
new file mode 100644
index 000000000000..069e294ba5b4
--- /dev/null
+++ b/app-emacs/posframe/Manifest
@@ -0,0 +1 @@
+DIST posframe-0.8.5.tar.gz 77569 BLAKE2B bf379f4641ed78f7cd92fcb443f3e01f78360113dc9eec4b1dcbba581ec0df5b11eeeda27eaea6dd28f7aa324c33aa499079afe9665da9d1d2328904117364d9 SHA512 ce9c76f8a943d206f3438b82ba637b96a9f3cf0d1078f8b940ab8a0aaa9940aa308a76be5b678d7394b25716f631ca3305e25b850fd25ffa18d79551baff0586
diff --git a/app-emacs/posframe/files/50posframe-gentoo.el b/app-emacs/posframe/files/50posframe-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/posframe/files/50posframe-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/posframe/metadata.xml b/app-emacs/posframe/metadata.xml
new file mode 100644
index 000000000000..0d737d94d3d1
--- /dev/null
+++ b/app-emacs/posframe/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/tumashu/posframe/issues/
+ tumashu/posframe
+
+
diff --git a/app-emacs/posframe/posframe-0.8.5.ebuild b/app-emacs/posframe/posframe-0.8.5.ebuild
new file mode 100644
index 000000000000..b0e865665969
--- /dev/null
+++ b/app-emacs/posframe/posframe-0.8.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Pop up a frame at point"
+HOMEPAGE="https://github.com/tumashu/posframe/"
+SRC_URI="https://github.com/tumashu/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md snapshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/projectile/files/50projectile-gentoo.el b/app-emacs/projectile/files/50projectile-gentoo.el
index 05c734668e49..8b3f91f32ec4 100644
--- a/app-emacs/projectile/files/50projectile-gentoo.el
+++ b/app-emacs/projectile/files/50projectile-gentoo.el
@@ -1,2 +1,3 @@
(add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/projectile-autoload.el")
+(autoload 'projectile-mode "projectile"
+ "Minor mode to assist project management and navigation." t)
diff --git a/app-emacs/projectile/projectile-2.5.0-r1.ebuild b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..26f4e8b00c5e
--- /dev/null
+++ b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="25.1"
+
+inherit elisp
+
+DESCRIPTION="A project interaction library for Emacs"
+HOMEPAGE="https://docs.projectile.mx"
+SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+SITEFILE="50projectile-gentoo.el"
+DOCS=( README.md )
+
+src_test() {
+ mkdir -p "${HOME}"/.emacs.d || die # For "projectile--directory-p" test
+ buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/projectile/projectile-2.5.0.ebuild b/app-emacs/projectile/projectile-2.5.0.ebuild
deleted file mode 100644
index 9ebbdf6b49f5..000000000000
--- a/app-emacs/projectile/projectile-2.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="25.1"
-
-inherit elisp
-
-DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
-
-SITEFILE="50projectile-gentoo.el"
-DOCS=( README.md )
-
-src_test() {
- mkdir -p "${HOME}"/.emacs.d || die # For "projectile--directory-p" test
- buttercup -L . -L test --traceback full || die
-}
-
-src_install() {
- elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
- elisp_src_install
-}
diff --git a/app-emacs/request/Manifest b/app-emacs/request/Manifest
new file mode 100644
index 000000000000..e8456622f911
--- /dev/null
+++ b/app-emacs/request/Manifest
@@ -0,0 +1 @@
+DIST request-0.3.2.tar.gz 47511 BLAKE2B df01bfd32d1580e416b8f934ee2e9803c052630d366b46134364646e6bf0bba4d0ce18b3a33c675833c6b5c07d28fcc0a03763aa8217e116a03319dd071cc0b6 SHA512 41420a2ede5a8dbc1acb2e04536d7b27b5c973ed4bebc280070b042e28ae6d15e808dad3ba84122a7f680f624bafbe72a027c374413bfd43996a3fb8720fa6b3
diff --git a/app-emacs/request/files/50request-gentoo.el b/app-emacs/request/files/50request-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/request/files/50request-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/request/metadata.xml b/app-emacs/request/metadata.xml
new file mode 100644
index 000000000000..4397e5c9d019
--- /dev/null
+++ b/app-emacs/request/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/tkf/emacs-request/issues/
+ tkf/emacs-request
+
+
diff --git a/app-emacs/request/request-0.3.2.ebuild b/app-emacs/request/request-0.3.2.ebuild
new file mode 100644
index 000000000000..abf719fc30a0
--- /dev/null
+++ b/app-emacs/request/request-0.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Compatible layer for URL request"
+HOMEPAGE="https://github.com/tkf/emacs-request/"
+SRC_URI="https://github.com/tkf/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="app-emacs/deferred"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.rst )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/sly/Manifest b/app-emacs/sly/Manifest
new file mode 100644
index 000000000000..b29638518d9b
--- /dev/null
+++ b/app-emacs/sly/Manifest
@@ -0,0 +1 @@
+DIST sly-1.0.43.tar.gz 1835404 BLAKE2B ab6868f3ee29d3d98d80984de4dd1ba39076279b86d86de49ce4e95323c419cbd6a16da81d9cbdff8bc8d12fb2d868096ecffd681b276e35a192feb723f99baf SHA512 e2785a34cabc3537efb06cd2ce9da05aef02ce7077ef73e2d82ace4e3534c00d9269969319294207759e11e2682111ca4d150f1d3d8e02b8f682752394640447
diff --git a/app-emacs/sly/files/50sly-gentoo.el b/app-emacs/sly/files/50sly-gentoo.el
new file mode 100644
index 000000000000..c69b93515bcb
--- /dev/null
+++ b/app-emacs/sly/files/50sly-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@SITELISP@/contrib")
+(require 'sly-autoloads)
diff --git a/app-emacs/sly/metadata.xml b/app-emacs/sly/metadata.xml
new file mode 100644
index 000000000000..1f4866127cad
--- /dev/null
+++ b/app-emacs/sly/metadata.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ SLY is Sylvester the Cat's Common Lisp IDE for Emacs.
+ SLY is a fork of SLIME. All SLIME's familar features (debugger, inspector,
+ xref, etc...) are still available, with improved overall UX. SLY's
+ highlights are:
+ A full-featured REPL based on Emacs's comint.el. Everything can be copied
+ to the REPL;
+ Stickers, or live code annotations that record values as code traverses
+ them.
+ Flex-style completion out-of-the-box, using Emacs's completion API.
+ Company, Helm, and other supported natively, no plugin required;
+ An interactive Trace Dialog;
+ Cleanly ASDF-loaded by default, including contribs, enabled out-of-the-box;
+ Multiple inspectors and multiple REPLs;
+ "Presentations" replaced by interactive backreferences which highlight the
+ object and remain stable throughout the REPL session;
+ Support for NAMED-READTABLES, macrostep.el and quicklisp.
+ A portable, annotation-based stepper in early but functional prototype
+ stage.
+
+
+
+ https://github.com/joaotavora/sly/issues/
+ joaotavora/sly
+
+
diff --git a/app-emacs/sly/sly-1.0.43.ebuild b/app-emacs/sly/sly-1.0.43.ebuild
new file mode 100644
index 000000000000..ebec756037f0
--- /dev/null
+++ b/app-emacs/sly/sly-1.0.43.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Sylvester the Cat's Common Lisp IDE for GNU Emacs"
+HOMEPAGE="https://github.com/joaotavora/sly/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc xref"
+
+RDEPEND="
+ dev-lisp/asdf
+ dev-lisp/sbcl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-apps/texinfo
+ doc? ( virtual/texi2dvi )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ default
+
+ # Remove failing tests (sly-fontifying-fu-tests is a part of "check-fancy")
+ rm test/sly-fontifying-fu-tests.el || die
+
+ # Remove xref.lisp (which is non-free) unless USE flag is set
+ use xref || rm slynk/xref.lisp || die
+}
+
+src_compile() {
+ emake EMACS="${EMACS}" compile compile-contrib
+
+ emake -C doc ${PN}.info
+
+ if use doc ; then
+ VARTEXFONTS="${T}"/fonts emake -C doc all
+ fi
+}
+
+src_test() {
+ # NOTICE: "check-core" has some failing tests under root/portage user
+ emake check-fancy
+}
+
+src_install() {
+ elisp-install ${PN} *el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ elisp-install ${PN}/contrib/ contrib/*
+ elisp-install ${PN}/lib/ lib/* lib/.nosearch
+ elisp-install ${PN}/slynk/ slynk/*
+ elisp-install ${PN}/slynk/backend/ slynk/backend/*
+
+ doinfo doc/${PN}.info
+ dodoc CONTRIBUTING.md NEWS.md PROBLEMS.md README.md
+
+ use doc && dodoc doc/*.pdf
+}
diff --git a/app-emacs/treemacs/Manifest b/app-emacs/treemacs/Manifest
new file mode 100644
index 000000000000..6ce00e3b55f9
--- /dev/null
+++ b/app-emacs/treemacs/Manifest
@@ -0,0 +1 @@
+DIST treemacs-2.9.5.tar.gz 4134227 BLAKE2B 1fbdb278e9524fdb14cbc7699bc787ab694b00d37a91ec3e91e106079bc02f6b8b39207608873d45c70fd6355a22553bf1a0636a948b79df77adfe0b4a3f799f SHA512 adc026d7ad459418fae531c5a1a7df7f9308e63dec82240c1c5e278eb00fdf8d6dff1ee2112ea73d5a05c4266efe24623bb84f8819a6f07fbb4fde6e644ca9ad
diff --git a/app-emacs/treemacs/files/50treemacs-gentoo.el b/app-emacs/treemacs/files/50treemacs-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/treemacs/files/50treemacs-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch b/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch
new file mode 100644
index 000000000000..d1ac5022064a
--- /dev/null
+++ b/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch
@@ -0,0 +1,12 @@
+index 2cd9baf..e6ea521 100644
+--- a/src/elisp/treemacs-icons.el
++++ b/src/elisp/treemacs-icons.el
+@@ -273,7 +273,7 @@ Necessary since root icons are not rectangular."
+ (ht-set! tui-icons it tui-icon))))
+
+ (treemacs-create-theme "Default"
+- :icon-directory (treemacs-join-path treemacs-dir "icons/default")
++ :icon-directory "@SITEETC@/icons/default"
+ :config
+ (progn
+ ;; directory and other icons
diff --git a/app-emacs/treemacs/metadata.xml b/app-emacs/treemacs/metadata.xml
new file mode 100644
index 000000000000..2b59c18813b9
--- /dev/null
+++ b/app-emacs/treemacs/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/Alexander-Miller/treemacs/issues/
+ Alexander-Miller/treemacs
+
+
diff --git a/app-emacs/treemacs/treemacs-2.9.5.ebuild b/app-emacs/treemacs/treemacs-2.9.5.ebuild
new file mode 100644
index 000000000000..ea3b8ab8544a
--- /dev/null
+++ b/app-emacs/treemacs/treemacs-2.9.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Tree style project file explorer"
+HOMEPAGE="https://github.com/Alexander-Miller/treemacs/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-emacs/ace-window
+ app-emacs/cfrs
+ app-emacs/dash
+ app-emacs/ht
+ app-emacs/hydra
+ app-emacs/pfuture
+ app-emacs/s
+"
+BDEPEND="
+ ${RDEPEND}
+ test? ( app-emacs/buttercup )
+"
+
+DOCS=( Changelog.org Extensions.org README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-icons-icon-directory.patch )
+
+BYTECOMPFLAGS="-L . -L src/elisp"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die
+}
+
+src_compile() {
+ elisp-compile src/elisp/*.el
+}
+
+src_test() {
+ buttercup ${BYTECOMPFLAGS} -L test --traceback full || die
+}
+
+src_install() {
+ elisp-install ${PN} src/elisp/*.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f5eaa470657a..39aa5edc0b25 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
index 4547aa0ebc0b..5626fdc34c99 100644
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@@ -1,2 +1 @@
-DIST guestfs-tools-1.46.1.tar.gz 12665804 BLAKE2B 7800954dfa961900035b127f6ac2556f584dd2d156143bf82fd1ba9fd1f327091706987192d91cb4251295d9565e56f769ab06bdac677160ac31d2e8f9d9a488 SHA512 d2bd0790343d54a2517237e56d1b982cd41335654fd205cfeec42a1b7cbbf4c0923597b767b8769dfe74766e078a817d520db251895990b922522030806d0b85
DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489
diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
deleted file mode 100644
index ed65ee9489f6..000000000000
--- a/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64"
-IUSE="doc +ocaml +perl test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-COMMON_DEPEND="
- !=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
- app-emulation/libvirt:=
- >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
- dev-lang/perl:=
- dev-libs/libpcre2:=
- dev-libs/libxml2:2
- dev-libs/jansson:=
- >=sys-apps/fakechroot-2.8
- sys-fs/squashfs-tools:*
- sys-libs/libxcrypt:=
- virtual/libcrypt:=
- ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
- perl? (
- virtual/perl-Data-Dumper
- virtual/perl-Getopt-Long
- dev-perl/Module-Build
- dev-perl/libintl-perl
- virtual/perl-ExtUtils-MakeMaker
- >=dev-perl/Sys-Virt-0.2.4
- dev-perl/String-ShellQuote
- test? ( virtual/perl-Test-Simple )
- )
-"
-# Some OCaml is always required
-# bug #729674
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/ocaml-4.03:=[ocamlopt]
- dev-ml/findlib[ocamlopt]
- doc? ( app-text/po4a )
- ocaml? (
- dev-ml/ounit2[ocamlopt]
- || (
-
-Date: Fri, 7 Dec 2018 11:21:25 +0100
-Subject: [PATCH 1/2] Fix install failure when not built with OCaml support
-
-Makefile rules in po/ require builder/index-parse.c to be generated to
-allow translation utilities to work on it, however builder/ is
-completely masked behind OCaml conditional build even if some tools do
-not require it and proper guards are in place already.
-
-Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cc363341f..5d96093a1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -164,7 +164,6 @@ SUBDIRS += common/mlvisit
- SUBDIRS += common/mlxml
- SUBDIRS += common/mltools
- SUBDIRS += customize
--SUBDIRS += builder builder/templates
- SUBDIRS += get-kernel
- SUBDIRS += resize
- SUBDIRS += sparsify
-@@ -178,6 +177,9 @@ SUBDIRS += dib
- endif
- endif
-
-+# Tools mixed with more OCAML based tools
-+SUBDIRS += builder builder/templates
-+
- # Perl tools.
- if HAVE_TOOLS
- SUBDIRS += tools
---
-2.19.2
-
diff --git a/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch
deleted file mode 100644
index 017ba699599b..000000000000
--- a/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b8a31fcfe81a680ffed1fa0879ac20a3e0e8753a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue
-Date: Fri, 7 Dec 2018 12:14:15 +0100
-Subject: [PATCH 2/2] Loosen build time requirement on bash-completion
-
-Distributions might avoid pulling bash-completion during build as it is
-an optional feature and would only make sense at runtime anyway. Since
-this setting is well-known across a given distribution, allow them to
-provide the value and avoid the dependency.
---- a/m4/guestfs-bash-completion.m4
-+++ b/m4/guestfs-bash-completion.m4
-@@ -16,14 +16,13 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- dnl Bash completion.
--PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
-- bash_completion=yes
-- AC_MSG_CHECKING([for bash-completions directory])
-- BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
-- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
-- AC_SUBST([BASH_COMPLETIONS_DIR])
--],[
-- bash_completion=no
-- AC_MSG_WARN([bash-completion not installed])
--])
--AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
-+AC_ARG_WITH([bashcompletiondir],
-+ AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
-+ [],
-+ [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
-+ with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
-+ ] , [
-+ with_bashcompletiondir=${datadir}/bash-completion/completions
-+ ])])
-+AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir])
-+AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"])
---
-2.19.2
-
diff --git a/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild b/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
deleted file mode 100644
index 6142ac3f5146..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Failures - doc
-COMMON_DEPEND="
- >=app-admin/augeas-1.8.0
- app-arch/cpio
- app-arch/lzma
- app-arch/rpm
- app-arch/unzip[natspec]
- app-arch/xz-utils
- app-cdr/cdrtools
- app-crypt/gnupg
- >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
- >=app-misc/hivex-1.3.1
- dev-lang/perl:=
- dev-libs/libconfig:=
- dev-libs/libpcre:3
- dev-libs/libxml2:2=
- dev-libs/jansson:=
- >=dev-libs/yajl-2.0.4
- net-libs/libtirpc:=
- sys-libs/ncurses:0=
- >=sys-apps/fakechroot-2.8
- sys-apps/fakeroot
- sys-apps/file
- sys-devel/gettext
- sys-fs/squashfs-tools:*
- sys-libs/libcap
- sys-libs/readline:=
- virtual/acl
- virtual/libcrypt:=
- erlang? ( dev-lang/erlang )
- perl? (
- virtual/perl-ExtUtils-MakeMaker
- >=dev-perl/Sys-Virt-0.2.4
- virtual/perl-Getopt-Long
- virtual/perl-Data-Dumper
- dev-perl/libintl-perl
- >=app-misc/hivex-1.3.1[perl?]
- dev-perl/String-ShellQuote
- )
- python? ( ${PYTHON_DEPS} )
- fuse? ( sys-fs/fuse:= )
- gtk? (
- sys-apps/dbus
- x11-libs/gtk+:3
- )
- introspection? (
- >=dev-libs/glib-2.26:2
- >=dev-libs/gobject-introspection-1.30.0:=
- )
- inspect-icons? (
- media-libs/netpbm
- media-gfx/icoutils
- )
- libvirt? ( app-emulation/libvirt )
- lua? ( ${LUA_DEPS} )
- ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
- selinux? (
- sys-libs/libselinux:=
- sys-libs/libsemanage
- )
- systemtap? ( dev-util/systemtap )
-"
-# Some OCaml is always required
-# bug #729674
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/ocaml-4.03:=[ocamlopt]
- dev-util/gperf
- dev-ml/findlib[ocamlopt]
- doc? ( app-text/po4a )
- ocaml? (
- dev-ml/ounit2[ocamlopt]
- || (
- =0.10
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit cargo desktop flag-o-matic python-any-r1 xdg
-
-# 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
-RUFFLE_GIT=(
- "RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp"
- "ruffle-rs gc-arena 4931b3bc25b2b74174ff5eb9c34ae0dda732778b gc-arena:src/gc-arena"
- "ruffle-rs h263-rs 023e14c73e565c4c778d41f66cfbac5ece6419b2 h263-rs:h263,h263-rs-yuv:yuv"
- "ruffle-rs nellymoser 77000f763b58021295429ca5740e3dc3b5228cbd nellymoser-rs:."
- "ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck"
- "ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:."
- "ruffle-rs rust-flash-lso 19fecd07b9888c4bdaa66771c468095783b52bed flash-lso"
-)
-ruffle_uris() {
- cargo_crate_uris
-
- local g
- for g in "${RUFFLE_GIT[@]}"; do
- g=(${g})
- echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
- done
-}
-
-# using _pYYYYMMDD over YYYY.MM.DD given ruffle has an underlaying version
-# (0.1.0) which could get a non-nightly release eventually (YYYY. > 0.1.0)
-MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Flash Player emulator written in Rust"
-HOMEPAGE="https://ruffle.rs/"
-SRC_URI="
- https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
- $(ruffle_uris)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB curl"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/openssl:=
- media-libs/alsa-lib
- sys-libs/zlib:=
- x11-libs/gtk+:3
- x11-libs/libxcb:="
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=virtual/rust-1.56"
-
-QA_FLAGS_IGNORED="
- usr/bin/${PN}
- usr/bin/${PN}_exporter
- usr/bin/${PN}_scanner"
-
-src_prepare() {
- default
-
- # use [patch] directive to register git snapshots of needed crates
- local crate g
- for g in "${RUFFLE_GIT[@]}"; do
- g=(${g})
- echo "[patch.\"https://github.com/${g[0]}/${g[1]}\"]"
- for crate in ${g[3]//,/ }; do
- echo "${crate%:*} = { path = \"../${g[1]}-${g[2]}/${crate#*:}\" }"
- done
- done >> Cargo.toml || die
-}
-
-src_compile() {
- filter-flags '-flto*' # undefined references with ring crate and more
-
- cargo_src_compile --bins # note: configure --bins would skip tests
-}
-
-src_install() {
- dodoc README.md
-
- newicon web/packages/extension/assets/images/icon180.png ${PN}.png
- make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
- "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
-
- cd target/$(usex debug{,} release) || die
-
- newbin ${PN}_desktop ${PN}
- newbin exporter ${PN}_exporter
- dobin ${PN}_scanner
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "${PN} is experimental software that is still under heavy development"
- elog "and only receiving nightly releases. Plans in Gentoo is to update"
- elog "roughly every two weeks if no known major regressions."
- elog
- elog "There is currently no plans to support wasm builds / browser"
- elog "extensions, this provides the desktop viewer and other tools."
- fi
-}
diff --git a/app-emulation/ruffle/ruffle-0_p20220429.ebuild b/app-emulation/ruffle/ruffle-0_p20220429.ebuild
new file mode 100644
index 000000000000..926b057e7ac0
--- /dev/null
+++ b/app-emulation/ruffle/ruffle-0_p20220429.ebuild
@@ -0,0 +1,507 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adler-1.0.2
+ adler32-1.2.0
+ ahash-0.7.6
+ aho-corasick-0.7.18
+ alsa-0.6.0
+ alsa-sys-0.3.1
+ ansi_term-0.12.1
+ approx-0.5.1
+ arrayvec-0.5.2
+ arrayvec-0.7.2
+ ash-0.34.0+1.2.203
+ async-channel-1.6.1
+ atk-sys-0.15.1
+ atty-0.2.14
+ autocfg-1.1.0
+ base64-0.13.0
+ bindgen-0.56.0
+ bit-set-0.5.2
+ bit-vec-0.6.3
+ bit_field-0.10.1
+ bitflags-1.3.2
+ bitflags_serde_shim-0.2.2
+ bitstream-io-1.3.0
+ bitvec-0.19.6
+ block-0.1.6
+ block-buffer-0.10.2
+ bstr-0.2.17
+ build_const-0.2.2
+ bumpalo-3.9.1
+ bytemuck-1.9.1
+ bytemuck_derive-1.1.0
+ byteorder-1.4.3
+ bytes-1.1.0
+ cache-padded-1.2.0
+ cairo-sys-rs-0.15.1
+ calloop-0.9.3
+ castaway-0.1.2
+ cc-1.0.73
+ cesu8-1.1.0
+ cexpr-0.4.0
+ cfg-expr-0.10.2
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ cfg_aliases-0.1.1
+ chrono-0.4.19
+ clang-sys-1.3.1
+ clap-3.1.12
+ clap_derive-3.1.7
+ clap_lex-0.1.1
+ clipboard-0.5.0
+ clipboard-win-2.2.0
+ cocoa-0.24.0
+ cocoa-foundation-0.1.0
+ codespan-reporting-0.11.1
+ color_quant-1.1.0
+ combine-4.6.3
+ concurrent-queue-1.2.2
+ console-0.15.0
+ console_error_panic_hook-0.1.7
+ console_log-0.2.0
+ cookie-factory-0.3.2
+ copyless-0.1.5
+ core-foundation-0.7.0
+ core-foundation-0.9.3
+ core-foundation-sys-0.7.0
+ core-foundation-sys-0.8.3
+ core-graphics-0.19.2
+ core-graphics-0.22.3
+ core-graphics-types-0.1.1
+ core-video-sys-0.1.4
+ coreaudio-rs-0.10.0
+ coreaudio-sys-0.2.9
+ cpal-0.13.5
+ cpufeatures-0.2.1
+ crc-1.8.1
+ crc32fast-1.3.2
+ crossbeam-channel-0.5.4
+ crossbeam-deque-0.8.1
+ crossbeam-epoch-0.9.8
+ crossbeam-utils-0.8.8
+ crypto-common-0.1.3
+ csv-1.1.6
+ csv-core-0.1.10
+ ctor-0.1.21
+ cty-0.2.2
+ curl-0.4.43
+ curl-sys-0.4.53+curl-7.82.0
+ d3d12-0.4.1
+ darling-0.13.1
+ darling_core-0.13.1
+ darling_macro-0.13.1
+ deflate-1.0.0
+ derive-try-from-primitive-1.0.0
+ diff-0.1.12
+ digest-0.10.3
+ dirs-4.0.0
+ dirs-sys-0.3.6
+ dispatch-0.2.0
+ dlib-0.5.0
+ downcast-rs-1.2.0
+ either-1.6.1
+ embed-resource-1.7.2
+ encode_unicode-0.3.6
+ encoding_rs-0.8.31
+ enum-map-2.1.0
+ enum-map-derive-0.8.0
+ enumset-1.0.8
+ enumset_derive-0.5.5
+ env_logger-0.9.0
+ euclid-0.22.6
+ event-listener-2.5.2
+ exr-1.4.1
+ fastrand-1.7.0
+ flate2-1.0.23
+ float_next_after-0.1.5
+ flume-0.10.12
+ fnv-1.0.7
+ foreign-types-0.3.2
+ foreign-types-shared-0.1.1
+ form_urlencoded-1.0.1
+ funty-1.1.0
+ futures-0.3.21
+ futures-channel-0.3.21
+ futures-core-0.3.21
+ futures-executor-0.3.21
+ futures-io-0.3.21
+ futures-lite-1.12.0
+ futures-macro-0.3.21
+ futures-sink-0.3.21
+ futures-task-0.3.21
+ futures-util-0.3.21
+ fxhash-0.2.1
+ gdk-pixbuf-sys-0.15.1
+ gdk-sys-0.15.1
+ generational-arena-0.2.8
+ generic-array-0.14.5
+ getrandom-0.2.6
+ gif-0.11.3
+ gio-sys-0.15.7
+ glib-sys-0.15.7
+ glob-0.3.0
+ glow-0.11.2
+ gobject-sys-0.15.9
+ gpu-alloc-0.5.3
+ gpu-alloc-types-0.2.0
+ gpu-descriptor-0.2.2
+ gpu-descriptor-types-0.1.1
+ gtk-sys-0.15.3
+ half-1.8.2
+ hashbrown-0.11.2
+ hashbrown-0.9.1
+ heck-0.4.0
+ hermit-abi-0.1.19
+ hexf-parse-0.2.1
+ http-0.2.6
+ humantime-2.1.0
+ ident_case-1.0.1
+ idna-0.2.3
+ image-0.24.1
+ indexmap-1.6.2
+ indicatif-0.16.2
+ inflate-0.4.5
+ inplace_it-0.3.3
+ instant-0.1.12
+ isahc-1.7.0
+ itoa-0.4.8
+ itoa-1.0.1
+ jni-0.19.0
+ jni-sys-0.3.0
+ jobserver-0.1.24
+ jpeg-decoder-0.1.22
+ jpeg-decoder-0.2.4
+ js-sys-0.3.57
+ khronos-egl-4.1.0
+ lazy_static-1.4.0
+ lazycell-1.3.0
+ lebe-0.5.1
+ lexical-core-0.7.6
+ libc-0.2.120
+ libflate-1.2.0
+ libflate_lz77-1.1.0
+ libloading-0.7.3
+ libnghttp2-sys-0.1.7+1.45.0
+ libz-sys-1.1.5
+ lock_api-0.4.6
+ log-0.4.16
+ lyon-0.17.10
+ lyon_algorithms-0.17.7
+ lyon_geom-0.17.6
+ lyon_path-0.17.7
+ lyon_tessellation-0.17.10
+ lzma-rs-0.2.0
+ mach-0.3.2
+ malloc_buf-0.0.6
+ matches-0.1.9
+ memchr-2.4.1
+ memmap2-0.3.1
+ memoffset-0.6.5
+ metal-0.23.1
+ mime-0.3.16
+ minimal-lexical-0.2.1
+ minimp3-0.5.1
+ minimp3-sys-0.3.2
+ miniz_oxide-0.5.1
+ mio-0.8.1
+ miow-0.3.7
+ naga-0.8.5
+ nanorand-0.7.0
+ ndk-0.5.0
+ ndk-0.6.0
+ ndk-context-0.1.0
+ ndk-glue-0.5.1
+ ndk-glue-0.6.1
+ ndk-macro-0.3.0
+ ndk-sys-0.2.2
+ ndk-sys-0.3.0
+ nix-0.22.3
+ nix-0.23.1
+ nom-5.1.2
+ nom-6.1.2
+ nom-7.1.1
+ ntapi-0.3.7
+ num-complex-0.4.0
+ num-derive-0.3.3
+ num-integer-0.1.44
+ num-iter-0.1.42
+ num-rational-0.4.0
+ num-traits-0.2.14
+ num_cpus-1.13.1
+ num_enum-0.5.7
+ num_enum_derive-0.5.7
+ number_prefix-0.4.0
+ objc-0.2.7
+ objc-foundation-0.1.1
+ objc_exception-0.1.2
+ objc_id-0.1.1
+ oboe-0.4.5
+ oboe-sys-0.4.5
+ once_cell-1.10.0
+ openssl-probe-0.1.5
+ openssl-sys-0.9.72
+ os_str_bytes-6.0.0
+ output_vt100-0.1.3
+ pango-sys-0.15.1
+ parking-2.0.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ path-slash-0.1.4
+ peeking_take_while-0.1.2
+ percent-encoding-2.1.0
+ pin-project-1.0.10
+ pin-project-internal-1.0.10
+ pin-project-lite-0.2.8
+ pin-utils-0.1.0
+ pkg-config-0.3.24
+ png-0.17.5
+ polling-2.2.0
+ ppv-lite86-0.2.16
+ pretty_assertions-1.2.1
+ primal-check-0.3.1
+ proc-macro-crate-1.1.3
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro2-1.0.36
+ profiling-1.0.5
+ quote-1.0.18
+ radium-0.5.3
+ rand-0.8.5
+ rand_chacha-0.3.1
+ rand_core-0.6.3
+ range-alloc-0.1.2
+ raw-window-handle-0.4.2
+ rayon-1.5.2
+ rayon-core-1.9.2
+ redox_syscall-0.2.11
+ redox_users-0.4.0
+ regex-1.5.5
+ regex-automata-0.1.10
+ regex-syntax-0.6.25
+ regress-0.4.1
+ renderdoc-sys-0.7.1
+ rfd-0.8.2
+ rle-decode-fast-1.0.3
+ ron-0.7.0
+ rustc-hash-1.1.0
+ rustc_version-0.4.0
+ rustdct-0.7.0
+ rustfft-6.0.1
+ ryu-1.0.9
+ safe_arch-0.6.0
+ same-file-1.0.6
+ schannel-0.1.19
+ scoped-tls-1.0.0
+ scoped_threadpool-0.1.9
+ scopeguard-1.1.0
+ semver-1.0.6
+ serde-1.0.136
+ serde_derive-1.0.136
+ serde_json-1.0.79
+ sha2-0.10.2
+ shlex-0.1.1
+ sid-0.6.1
+ slab-0.4.5
+ slice-deque-0.3.0
+ slotmap-1.0.6
+ sluice-0.5.5
+ smallvec-1.8.0
+ smithay-client-toolkit-0.15.3
+ socket2-0.4.4
+ spin-0.9.2
+ spirv-0.2.0+1.5.4
+ static_assertions-1.1.0
+ stdweb-0.1.3
+ strength_reduce-0.2.3
+ strsim-0.10.0
+ svg-0.10.0
+ symphonia-0.5.0
+ symphonia-bundle-mp3-0.5.0
+ symphonia-core-0.5.0
+ symphonia-metadata-0.5.0
+ syn-1.0.91
+ synstructure-0.12.6
+ system-deps-6.0.2
+ tap-1.0.1
+ termcolor-1.1.3
+ terminal_size-0.1.17
+ textwrap-0.15.0
+ thiserror-1.0.30
+ thiserror-impl-1.0.30
+ threadpool-1.8.1
+ tiff-0.7.1
+ time-0.1.43
+ tinyvec-1.5.1
+ tinyvec_macros-0.1.0
+ toml-0.5.8
+ tracing-0.1.32
+ tracing-attributes-0.1.20
+ tracing-core-0.1.23
+ tracing-futures-0.2.5
+ transpose-0.2.1
+ typenum-1.15.0
+ unicode-bidi-0.3.7
+ unicode-normalization-0.1.19
+ unicode-width-0.1.9
+ unicode-xid-0.2.2
+ url-2.2.2
+ vcpkg-0.2.15
+ version-compare-0.1.0
+ version_check-0.9.4
+ vswhom-0.1.0
+ vswhom-sys-0.1.1
+ waker-fn-1.1.0
+ walkdir-2.3.2
+ wasi-0.10.2+wasi-snapshot-preview1
+ wasi-0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-0.2.80
+ wasm-bindgen-backend-0.2.80
+ wasm-bindgen-futures-0.4.30
+ wasm-bindgen-macro-0.2.80
+ wasm-bindgen-macro-support-0.2.80
+ wasm-bindgen-shared-0.2.80
+ wayland-client-0.29.4
+ wayland-commons-0.29.4
+ wayland-cursor-0.29.4
+ wayland-protocols-0.29.4
+ wayland-scanner-0.29.4
+ wayland-sys-0.29.4
+ weak-table-0.3.2
+ web-sys-0.3.57
+ webbrowser-0.7.0
+ weezl-0.1.5
+ wepoll-ffi-0.1.2
+ wgpu-0.12.0
+ wgpu-core-0.12.2
+ wgpu-hal-0.12.4
+ wgpu-types-0.12.0
+ wide-0.7.4
+ widestring-0.5.1
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ windows-0.35.0
+ windows_aarch64_msvc-0.35.0
+ windows_i686_gnu-0.35.0
+ windows_i686_msvc-0.35.0
+ windows_x86_64_gnu-0.35.0
+ windows_x86_64_msvc-0.35.0
+ winit-0.26.1
+ winreg-0.10.1
+ wyz-0.2.0
+ x11-clipboard-0.3.3
+ x11-dl-2.19.1
+ xcb-0.8.2
+ xcursor-0.3.4
+ xml-rs-0.8.4"
+# python is needed by xcb-0.8.2 until update to >=0.10
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit cargo desktop flag-o-matic python-any-r1 xdg
+
+# 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
+RUFFLE_GIT=(
+ "RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp"
+ "ruffle-rs gc-arena 4931b3bc25b2b74174ff5eb9c34ae0dda732778b gc-arena:src/gc-arena"
+ "ruffle-rs h263-rs 023e14c73e565c4c778d41f66cfbac5ece6419b2 h263-rs:h263,h263-rs-yuv:yuv"
+ "ruffle-rs nellymoser 4a33521c29a918950df8ae9fe07e527ac65553f5 nellymoser-rs:."
+ "ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck"
+ "ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:."
+ "ruffle-rs rust-flash-lso 19fecd07b9888c4bdaa66771c468095783b52bed flash-lso"
+)
+ruffle_uris() {
+ cargo_crate_uris
+
+ local g
+ for g in "${RUFFLE_GIT[@]}"; do
+ g=(${g})
+ echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
+ done
+}
+
+# using _pYYYYMMDD over YYYY.MM.DD given ruffle has an underlaying version
+# (0.1.0) which could get a non-nightly release eventually (YYYY. > 0.1.0)
+MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Flash Player emulator written in Rust"
+HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+ https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+ $(ruffle_uris)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB curl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/openssl:=
+ media-libs/alsa-lib
+ sys-libs/zlib:=
+ x11-libs/gtk+:3
+ x11-libs/libxcb:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ >=virtual/rust-1.56"
+
+QA_FLAGS_IGNORED="
+ usr/bin/${PN}
+ usr/bin/${PN}_exporter
+ usr/bin/${PN}_scanner"
+
+src_prepare() {
+ default
+
+ # use [patch] directive to register git snapshots of needed crates
+ local crate g
+ for g in "${RUFFLE_GIT[@]}"; do
+ g=(${g})
+ echo "[patch.\"https://github.com/${g[0]}/${g[1]}\"]"
+ for crate in ${g[3]//,/ }; do
+ echo "${crate%:*} = { path = \"../${g[1]}-${g[2]}/${crate#*:}\" }"
+ done
+ done >> Cargo.toml || die
+}
+
+src_compile() {
+ filter-flags '-flto*' # undefined references with ring crate and more
+
+ cargo_src_compile --bins # note: configure --bins would skip tests
+}
+
+src_install() {
+ dodoc README.md
+
+ newicon web/packages/extension/assets/images/icon180.png ${PN}.png
+ make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
+ "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
+
+ cd target/$(usex debug{,} release) || die
+
+ newbin ${PN}_desktop ${PN}
+ newbin exporter ${PN}_exporter
+ dobin ${PN}_scanner
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "${PN} is experimental software that is still under heavy development"
+ elog "and only receiving nightly releases. Plans in Gentoo is to update"
+ elog "roughly every two weeks if no known major regressions."
+ elog
+ elog "There is currently no plans to support wasm builds / browser"
+ elog "extensions, this provides the desktop viewer and other tools."
+ fi
+}
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index e981a65df9b0..9c6cea100300 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,5 +1,6 @@
DIST virt-viewer-10.0.tar.xz 256372 BLAKE2B 3368164c2f770f8aa963e0fb93e713249b05d31600747b68197864a40bf6fdb221ad44abb8ea5465706543241bd5898353cadf2a3e0917455383283722fdfd4f SHA512 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
+DIST virt-viewer-11.0.tar.xz 259772 BLAKE2B 41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a SHA512 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a
DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
DIST virt-viewer-9.0.tar.gz 1176991 BLAKE2B bc4df73575195888b769dddd8de5c0eda9daa257902f3f3ce8099f9096d0cd9be28547c8671decb70e83e5f0de71633793886bfe78bd9ab5f360dc9759afcc5b SHA512 a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 9a4bdbb764b1..4acf8131c37a 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -10,6 +10,8 @@
managed by libvirt.
Support connecting to SPICE-enabled virtual
machines.
+ Enable terminal support (x11-libs/vte)
+ in the GTK+ interface
Support connecting to VNC-enabled virtual
machines.
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
index e87604e77799..30941a31c9d7 100644
--- a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${GIT_HASH}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+libvirt sasl +spice +vnc"
RDEPEND="dev-libs/glib:2
diff --git a/app-emulation/virt-viewer/virt-viewer-11.0.ebuild b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
new file mode 100644
index 000000000000..f90932e555c0
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="https://virt-manager.org/"
+if [[ ${PV} == *_p* ]] ; then
+ GIT_HASH="f0cc7103becccbce95bdf0c80151178af2bace5a"
+ SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${GIT_HASH}/${PN}-${GIT_HASH}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${PN}-${GIT_HASH}"
+else
+ SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libvirt sasl +spice +vnc vte"
+
+RDEPEND="dev-libs/glib:2
+ >=dev-libs/libxml2-2.6
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ libvirt? (
+ >=app-emulation/libvirt-0.10.0:=[sasl?]
+ app-emulation/libvirt-glib
+ )
+ spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
+ vte? ( x11-libs/vte:2.91 )
+ vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
+DEPEND="${RDEPEND}
+ spice? ( >=app-emulation/spice-protocol-0.12.10 )"
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl
+ virtual/pkgconfig"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0_p20210730-meson-0.61.patch
+)
+
+src_prepare() {
+ default
+
+ # Fix python shebangs for python-exec[-native-symlinks], #811408
+ local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+ python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature libvirt)
+ $(meson_feature vte)
+ $(meson_feature vnc)
+ $(meson_feature spice)
+
+ -Dgit_werror=disabled
+ )
+
+ meson_src_configure
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
index 5c0e8352fb77..145e42fb64b0 100644
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit rpm linux-info
+inherit rpm linux-info udev
PV_BASE=${PV/_*}
PV_FULL=${PV/_p/-}
@@ -43,8 +43,8 @@ src_install() {
dosbin xe-daemon
dosbin xe-linux-distribution
dosbin xe-update-guest-attrs
- insinto /lib/udev/rules.d
- newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+ udev_newrules xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
if use xenstore; then
dobin usr/bin/xeninfo
@@ -54,6 +54,8 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
+
if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
elog "To start the xe-daemon automatically by default"
elog "you should add it to the boot runlevel :"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index aec5a25357be..8558f6697880 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-iptables/Manifest b/app-eselect/eselect-iptables/Manifest
index bc40c152da5d..0688000c54fc 100644
--- a/app-eselect/eselect-iptables/Manifest
+++ b/app-eselect/eselect-iptables/Manifest
@@ -1,2 +1 @@
-DIST eselect-iptables-20211203.tar.xz 2144 BLAKE2B 9a53784a0831e7d2c150a974faba6c9dc124b0eafdd22cd8a56d342f77d9d4741fb0ff289e429351b8cff2e7576d00ba7e66d36c73ebe7c43c9d42cf56c13292 SHA512 5a670d72f20722df12bae7baa9ad68175e9678610657e24c4182ef83f30cc356b7af2f3bd8ea22e16aa83ba34cf5c407761c6dc2b937a4488b2da47dcb9eca97
DIST eselect-iptables-20220320.tar.xz 2152 BLAKE2B 82813bf7814b91f1cf6da35c5c893e8ca28a8f5b5885e234c12853b5dc3afd73b3e0512e9d3d379e81b466706eabef8774d1b5738dd12582bbf1e344294a80f8 SHA512 7783d94d3bc463e0e8e084368c3906358efd03c9e47898686943d4900babd84e038991338f78459fca410f618dd5a62020e3d2af5ae45554f323a70a9b284135
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20211203.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20211203.ebuild
deleted file mode 100644
index 3decd511c878..000000000000
--- a/app-eselect/eselect-iptables/eselect-iptables-20211203.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Manages the {,/usr}/sbin/iptables symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="app-admin/eselect"
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins iptables.eselect
-
- local symlink
- for symlink in {eb,arp}tables; do
- dosym iptables.eselect /usr/share/eselect/modules/${symlink}.eselect
- done
-}
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
index 793531185311..7dd19f3fb45d 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
index 15b745817032..f796bb18f6d4 100644
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild
index a88d776c25e6..69925d681de3 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index 210ce3086bec..07ff86c60c09 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 x86"
fi
DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 6474edbbc22e..5bee13babc6d 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index e8259b0ab2ef..93ead550b71b 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -87,7 +87,7 @@ src_prepare() {
if ! use emoji; then
touch \
tools/main.vala \
- ui/gtk3/panel.vala || dile
+ ui/gtk3/panel.vala || die
fi
if ! use appindicator; then
touch ui/gtk3/panel.vala || die
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index 27f3f0c86a8d..d269665dd5e9 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
inherit autotools ruby-utils
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 6489ae38bacb..de774624d6d1 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/thinkfan/thinkfan-1.2.2.ebuild b/app-laptop/thinkfan/thinkfan-1.2.2.ebuild
index d59a97b5a27a..085f1edafd76 100644
--- a/app-laptop/thinkfan/thinkfan-1.2.2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="atasmart nvidia +yaml"
DEPEND="atasmart? ( dev-libs/libatasmart )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e69821a8b7fe..669f65ac2855 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index ff578f85c757..df33f8c73503 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,2 +1 @@
-DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
DIST asciinema-2.1.0.tar.gz 82022 BLAKE2B 2f7c68caef228a6cb98f3503212edc393bd8f7a3653a369b0509d45a6e19b8373630fac88498a771c0eaa2a322a95ab816b268660b8b2384d1ec25c617b06a5a SHA512 df77ccea13e06e9c5feda22be2366aa702acf510fdc6cbc9a09b20d67ae43a47214891fbb5ef080ff9af9c3ee2f450694c306ee1dbdbdef3f9862dc6dee60750
diff --git a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
deleted file mode 100644
index cf6a18f64899..000000000000
--- a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- sed -i -e "s|data_files=\[('share/doc/asciinema|&-${PVR}|" setup.py || die
-}
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 1aecc57e1922..a1e262077a58 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ S="${WORKDIR}"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="!
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
+ https://bugs.kde.org/
+
+
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
index fe416c8dcd3c..18bc8e8e792b 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
IUSE="offlinehelp"
#
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index 0740e633f32a..d40ccb686da2 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 9ff16e49b665..ea5e9f23096b 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild b/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
index 1289ab37de7a..45b1dfe68c6f 100644
--- a/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
REQUIRED_USE="cdr? ( gstreamer )"
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
index f606dff213fb..64a6166579d0 100644
--- a/app-pda/gtkpod/metadata.xml
+++ b/app-pda/gtkpod/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ chewi@gentoo.org
+ James Le Cuirot
+
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c51786539f75..d1f02790deec 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index 4c89c0d9be20..d564118c306a 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 mips ppc ppc64 ~riscv ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-portage/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
index 7870b58347a6..831da3331919 100644
--- a/app-portage/elicense/elicense-9999.ebuild
+++ b/app-portage/elicense/elicense-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-portage/elt-patches/elt-patches-20211104.ebuild b/app-portage/elt-patches/elt-patches-20211104.ebuild
index 9cf32e76ec39..d08e6c4a6427 100644
--- a/app-portage/elt-patches/elt-patches-20211104.ebuild
+++ b/app-portage/elt-patches/elt-patches-20211104.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="sys-apps/gentoo-functions"
BDEPEND="app-arch/xz-utils"
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
index 206c761c09ca..91faae2f631c 100644
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ b/app-portage/gemato/gemato-16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="+gpg tools"
RDEPEND="
diff --git a/app-portage/layman/layman-2.4.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index f07e9364aa7b..298dc099aaf9 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Tool to manage Gentoo overlays"
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 47a4cf73907d..0f5addf3ecee 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Tool to manage Gentoo overlays"
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 6856826a1190..24a6e4b3447b 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1 @@
-DIST mgorny-dev-scripts-13.tar.gz 8162 BLAKE2B 0ac4b8d61119b64d3d6420861ac466f975606972e5274be76a3a66210536783077ab4c066167553e11d5f913ea32ce49536f6757e2b806a355f85e2698c858f9 SHA512 53bb2fcc99f9bd048adf14b6b760a1293bb87e5b48ec1959d3037cd2b8a09583150309632451444e6048abfe9296f3a63346720c4a5de6c6103a9807f13874cc
-DIST mgorny-dev-scripts-14.tar.gz 10869 BLAKE2B 674f20874b1815d6c5e2e507f33e86da8dce5c2024cc77b66a47bfd0203718ae149729c3ed5d70714f89e5e754b3b68f2d0c2f0cbc40505e51fc2d352e823e7c SHA512 57822f981db90b9e4b1ea14a6117e14ab8d6668b6d01e63c719637b870e5ddae3c1fd9bf7aed27618c42c12df8c40476c96de36d6c753dfbae92a1d0bf7d3b8b
-DIST mgorny-dev-scripts-15.tar.gz 11310 BLAKE2B 118221dd081c90d6a498d95626d206df7b6e064a63f9330f8c8a140c8cc7a689797de33229ab4baa4bb476045db63eb1dcbb868e96929a89f31076c0a5d81ac8 SHA512 50b9e9992def0ae9d231977a48ac8f550835d04b63473256a22eb85bbdee27aed047bd868890bd5861fa91904b198806c563e928c1df1fd1dc0de661ee098944
+DIST mgorny-dev-scripts-16.tar.gz 11300 BLAKE2B f90c9149eb161606415789db12b83d8fd3afe7737aad5d9993ec5de73f7a45e61da8bb8400974d835faab25c19fbca83690905bf1d2da2257cb8d88dfb333d21 SHA512 3c99080eae230527f95a789ced9ce668ff640383f24d7ed4e16c694ff004ef0c65254106e886deec5bee467cce332e10ebfd352e5745e58cbcd37f6040dcb7ff
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13-r1.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13-r1.ebuild
deleted file mode 100644
index 5b5fe99fba2a..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- app-portage/repoman
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-14.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-14.ebuild
deleted file mode 100644
index 0ada4ceeb0dc..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff
-"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-15.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-15.ebuild
deleted file mode 100644
index 0ada4ceeb0dc..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff
-"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild
new file mode 100644
index 000000000000..0d68e063bf34
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+
+RDEPEND="
+ app-portage/gentoolkit
+ dev-perl/URI
+ dev-util/pkgcheck
+ dev-vcs/git
+ net-misc/wget
+ sys-apps/portage
+ x11-misc/xdg-utils
+ !dev-util/pkgdiff
+"
+
+src_install() {
+ dodoc README.rst
+ rm -f COPYING README.rst || die
+ dobin *
+}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 3240616c5a14..10e4609b7c89 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,3 +1 @@
-DIST nattka-0.2.19.tar.gz 93800 BLAKE2B 65efff2454cdb24f3b71dc5713adbf3bda3976ed958622f7adec14e3708a53531aac6801e838fd21346ce02974fa79bcb82c3f4d2a6555095fa8d81db9ad2992 SHA512 7508a78fa774a9229caa573426839ec84210e9a2d38b7ca9cd47d857b9922b946e9e31fadf946f001565ce6dc65103bca8af58935d7eb2fcf32da423345ce61a
DIST nattka-0.3.1.tar.gz 95368 BLAKE2B cefe8236694ceffe9adf3c5af9c8c3521613fbc09b6e27804ee855a376f940baa5e7bf3d6d5d62371d37cea090748ec7053963dd675e88b9cedb48d595425ff4 SHA512 14b04b2f6fff41cc9705afe5cfc522a3009b14afa4ff5759c1913387afd04c97231fe2ad5661cef43c5ebfe764012cec251fd78463bbca924fbf33068a31aaee
-DIST nattka-0.3.tar.gz 93914 BLAKE2B c38ec336ed202e508e1cb4bfcae0586b94a6fd55df97d5be514caddf0113b9588496492ebc68dbda45c4a3034451368d32a3f53f5ebc8f3136515614ac70ecab SHA512 390b276ab11e5de056e165f95574b5a97edbcad3adf876e20bb6ef8accf94629428c4fc60bbea4eaf883d5e0a9f6e7ea00aff74989d31bdd59c418041d9164dc
diff --git a/app-portage/nattka/nattka-0.2.19.ebuild b/app-portage/nattka/nattka-0.2.19.ebuild
deleted file mode 100644
index 5e140d0ba09c..000000000000
--- a/app-portage/nattka/nattka-0.2.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-util/pkgcheck[${PYTHON_USEDEP}]
- dev-vcs/git
- sys-apps/pkgcore[${PYTHON_USEDEP}]
- depgraph-order? (
- dev-python/networkx[${PYTHON_USEDEP}]
- )"
-BDEPEND="
- test? (
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.3.1.ebuild b/app-portage/nattka/nattka-0.3.1.ebuild
index 21887d3d2c57..57dec4861b07 100644
--- a/app-portage/nattka/nattka-0.3.1.ebuild
+++ b/app-portage/nattka/nattka-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="depgraph-order"
RDEPEND="
diff --git a/app-portage/nattka/nattka-0.3.ebuild b/app-portage/nattka/nattka-0.3.ebuild
deleted file mode 100644
index 92798cde8626..000000000000
--- a/app-portage/nattka/nattka-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-util/pkgcheck[${PYTHON_USEDEP}]
- dev-vcs/git
- sys-apps/pkgcore[${PYTHON_USEDEP}]
- depgraph-order? (
- dev-python/networkx[${PYTHON_USEDEP}]
- )
-"
-BDEPEND="
- test? (
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/portage-utils/portage-utils-0.93.3.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
index 67a59e37d9ff..294c81e74145 100644
--- a/app-portage/portage-utils/portage-utils-0.93.3.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
else
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 5fc3412f25e5..326000ed21a6 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-5.1_p12.ebuild b/app-shells/bash/bash-5.1_p12.ebuild
deleted file mode 100644
index 1cdb10c438d9..000000000000
--- a/app-shells/bash/bash-5.1_p12.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
- case ${PV} in
- *_alpha*|*_beta*|*_rc*) return 1 ;;
- *) return 0 ;;
- esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
- SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
- SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
- >=sys-libs/ncurses-5.2-r2:0=
- nls? ( virtual/libintl )
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
- ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # Patches from Chet sent to bashbug ml
- "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
- # bug #7332
- if is-flag -malign-double ; then
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if is_release ; then
- rm -rf lib/{readline,termcap}/* || die
- touch lib/{readline,termcap}/Makefile.in || die # for config.status
- sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches, bug #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/* || die
-
- eapply -p0 "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --disable-profiling
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
- --with-curses
-
- $(use_enable mem-scramble)
- $(use_enable net net-redirections)
- $(use_enable readline)
- $(use_enable readline bang-history)
- $(use_enable readline history)
- $(use_with afs)
- $(use_with mem-scramble bash-malloc)
- )
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
-
- # Don't even think about building this statically without
- # reading bug #7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER%%_*}
-
- if is_release ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins ; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
-
- # bug #444070
- tc-export AR
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
- keepdir /etc/bash/bashrc.d
-
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
-
- if ! use readline ; then
- # bug #432338
- sed_args+=(
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
-
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- docinto ${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- dodoc ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-5.1_p16.ebuild b/app-shells/bash/bash-5.1_p16.ebuild
index 04915ee41df9..a274960e97fe 100644
--- a/app-shells/bash/bash-5.1_p16.ebuild
+++ b/app-shells/bash/bash-5.1_p16.ebuild
@@ -51,7 +51,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild
deleted file mode 100644
index d6e14de6e704..000000000000
--- a/app-shells/bash/bash-5.1_p8.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
- case ${PV} in
- *_alpha*|*_beta*|*_rc*) return 1 ;;
- *) return 0 ;;
- esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
- SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
- SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
- >=sys-libs/ncurses-5.2-r2:0=
- nls? ( virtual/libintl )
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
- ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005)
-#BDEPEND="virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # Patches from Chet sent to bashbug ml
- "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
- # bug #7332
- if is-flag -malign-double ; then
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if is_release ; then
- rm -rf lib/{readline,termcap}/* || die
- touch lib/{readline,termcap}/Makefile.in || die # for config.status
- sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches, bug #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/* || die
-
- eapply -p0 "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --disable-profiling
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
- --with-curses
-
- $(use_enable mem-scramble)
- $(use_enable net net-redirections)
- $(use_enable readline)
- $(use_enable readline bang-history)
- $(use_enable readline history)
- $(use_with afs)
- $(use_with mem-scramble bash-malloc)
- )
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
-
- # Don't even think about building this statically without
- # reading bug #7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER%%_*}
-
- if is_release ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins ; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
-
- # bug #444070
- tc-export AR
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
- keepdir /etc/bash/bashrc.d
-
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
-
- if ! use readline ; then
- # bug #432338
- sed_args+=(
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
-
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- docinto ${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- dodoc ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index ef0e3519c722..ebddbeec1dcc 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,2 +1 @@
-DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf
diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild
deleted file mode 100644
index 6e0bed98e161..000000000000
--- a/app-shells/dash/dash-0.5.11.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Debian Almquist Shell"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
-)
-
-src_prepare() {
- default
-
- # Fix the invalid sort
- sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
- # Use pkg-config for libedit linkage
- sed -i \
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
- configure || die
-}
-
-src_configure() {
- if [[ ${CHOST} == *-solaris* ]] ; then
- # don't redefine stat, open, dirent, etc. on Solaris
- export ac_cv_func_stat64=yes
- export ac_cv_func_open64=yes
-
- # if your headers strictly adhere to POSIX, you'll need this too
- [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
- fi
- if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
- sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
- src/jobs.c || die
- fi
- append-cppflags -DJOBS=$(usex libedit 1 0)
- use static && append-ldflags -static
- # Do not pass --enable-glob due to #443552.
- local myeconfargs=(
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- --bindir="${EPREFIX}"/bin
- --enable-fnmatch
- $(use_with libedit)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index b54a8c2c3334..4a0cd57d26f5 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,2 +1 @@
-DIST loksh-7.0.tar.xz 211536 BLAKE2B 7633b89f6f3659cbe714f9dc3ab5b1a8a537d7ddf47bf34ee79617e4a3aa4238067d04be715b6abc2ce37212edb40e841006ec1e2b8e560236075eec364250f6 SHA512 d6eb0e0a639afb79b0d7df85477ded0d48d3ad27dbbd2068c24b81705000501c4542034586222a490a49443da36e7d1c64b5d714c94f942f507a14b89a0c389e
DIST loksh-7.1.tar.xz 211636 BLAKE2B 7604d6a5d3d3bce7dc51cde1d53ec10b927411afe700192e243e8dc022011cb3d89668768ba7940af22e97d95fd074638860e7b74fcacc8c83de4ad995654da4 SHA512 f46221f765f2799856049fbfe1650e6f3d13d597cf97843d4b54b9803b9ecedbf8a8c9364e1ba9b981b667004a8fe4da043006945f8b61f094678d3578518716
diff --git a/app-shells/loksh/loksh-7.0.ebuild b/app-shells/loksh/loksh-7.0.ebuild
deleted file mode 100644
index 15ac3aeb0099..000000000000
--- a/app-shells/loksh/loksh-7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/loksh/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="
- ${DEPEND}
- !app-shells/ksh
-"
-
-src_prepare() {
- default
- sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
-}
-
-src_configure() {
- # we want it as /bin/ksh
- meson_src_configure --bindir=../bin
-}
diff --git a/app-shells/zsh-syntax-highlighting/metadata.xml b/app-shells/zsh-syntax-highlighting/metadata.xml
index 48d3ded01150..31a6399a74d8 100644
--- a/app-shells/zsh-syntax-highlighting/metadata.xml
+++ b/app-shells/zsh-syntax-highlighting/metadata.xml
@@ -1,8 +1,9 @@
-
- zlogene@gentoo.org
- Mikle Kolyada
-
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1c05342fe488..41506f829291 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
deleted file mode 100644
index b0454f1c5135..000000000000
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic libtool
-
-DESCRIPTION="A thesaurus lib, tool and database"
-HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- gtk? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_prepare() {
- default
- # Needed to make relink work on FreeBSD, without it won't install.
- # Also needed for a sane .so versionning there.
- elibtoolize
-}
-
-src_configure() {
- filter-flags -fno-exceptions
- econf $(use_with gtk)
-}
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index 9e5e3851e780..e8daaacf166e 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
LICENSE="BSD CC-BY-3.0 ZLIB"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
IUSE="doc"
RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 1be84d940c1f..f00d05a8510d 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,2 +1,3 @@
DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e
+DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
index c62da59add92..e354a2c7f348 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-libs/libxml2
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
new file mode 100644
index 000000000000..a4684d16c16d
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ dev-libs/libxml2
+ || ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+ has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+ # export for bug #490754
+ export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+ default
+}
+
+pkg_postinst() {
+ # New version -> regen files
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index e3188ba498f9..6c957cfa7620 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index ee19a3db01c8..c173cd212615 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index b9ce7d99daff..c94e3db4beae 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index b9ce7d99daff..c94e3db4beae 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 1e1416abedfa..ba35adf04592 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND="
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
index 01202d5bee1a..f40c183d7f32 100644
--- a/app-text/enchant/enchant-2.3.3-r1.ebuild
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell nuspell test voikko"
RESTRICT="!test? ( test )"
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index cfe1827107c0..209f4d06cc31 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,4 +1,5 @@
DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
+DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild
new file mode 100644
index 000000000000..124d0962c321
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+ SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_configure() {
+ # non-autoconf configure
+ tc-export CXX
+ ./configure || die
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ MANDIR="${EPREFIX}/usr/share/man" \
+ DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+ install
+}
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index f7558b5e8e28..124d0962c321 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text"
LICENSE="GPL-2"
SLOT="0"
-src_prepare() {
- default
+src_configure() {
+ # non-autoconf configure
tc-export CXX
+ ./configure || die
}
src_compile() {
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index d7d1db048749..3d7322d22af7 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,2 +1,3 @@
DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd5123270ec84d3e27e914bda8f734758b36ea850126aa1ecd6ab36b9442577ac591024c373bdf6540b95816ed750b SHA512 04312d21c4f45b1630efd597ffafd69fc46ceff1fd5872d296a7811940f9d34da805c4ef4fa543af839de7e8bb4225c6ef5e680e9675eae4f56de669ec975669
+DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05.ebuild
new file mode 100644
index 000000000000..dc26753ae52b
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.05.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+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"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ # Not an autoconf script.
+ ./configure --fixed || die
+}
+
+src_compile() {
+ # Nothing to build (avoids the "all" target)
+ :
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+ einstalldocs
+
+ rm -r "${ED}"/etc/bash_completion.d || die
+ newbashcomp less_completion less
+}
+
+pkg_preinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+ elog "The latter is the Gentoo-specific version. Make sure to update your"
+ elog "LESSOPEN environment variable if you wish to use this copy."
+ fi
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
index 7493c2947bb9..b2d0bb4788dd 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
else
MDDS_VER="2.0"
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index b7576e139572..85eb33c30553 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 49301d4d54ef..625fe3ffedb5 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}
diff --git a/app-text/mdbook/mdbook-0.4.18.ebuild b/app-text/mdbook/mdbook-0.4.18.ebuild
index d8ca08e385d4..c10d0f673b2f 100644
--- a/app-text/mdbook/mdbook-0.4.18.ebuild
+++ b/app-text/mdbook/mdbook-0.4.18.ebuild
@@ -231,7 +231,7 @@ S="${WORKDIR}/${P/b/B}"
# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="doc"
QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c901a64470da..5c05a175105b 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
+DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild
new file mode 100644
index 000000000000..6fb208168306
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.19.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo
+ media-libs/freetype:2=
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0
+ javascript? ( >=dev-lang/mujs-1.0.7:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ "${FILESDIR}"/${PN}-1.19.0-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/opensp/opensp-1.5.2-r7.ebuild b/app-text/opensp/opensp-1.5.2-r7.ebuild
index 0611f6bab276..9f6b4f539bb4 100644
--- a/app-text/opensp/opensp-1.5.2-r7.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="MIT"
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 ~loong ~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="doc nls static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index ac8365be630a..7b14026889dd 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -1,10 +1,7 @@
-
- djc@gentoo.org
- Dirkjan Ochtman
-
+
pelican
getpelican/pelican
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index db6bc3212044..9e119d269b2b 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
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 ~loong ~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="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild
index 0e16e00ebff9..da1c08b1b745 100644
--- a/app-text/poppler/poppler-22.03.0.ebuild
+++ b/app-text/poppler/poppler-22.03.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/119" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index d8abdc835b6a..0363e17c1eaa 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
# install-catalog is GPL
LICENSE="FDL-1.1+ GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
deleted file mode 100644
index 9188b524d598..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-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"
-IUSE="latex text"
-
-RDEPEND="
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- || ( sys-apps/util-linux app-misc/getopt )
- text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
- latex? ( dev-texlive/texlive-formatsextra )
-"
-# We only depend on flex when we patch the input lexer.
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
- "${FILESDIR}"/${PN}-0.0.28-allow-links.patch
-)
-
-src_prepare() {
- default
-
- # fix symbol clash on Solaris
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- # We don't want the script to detect /bin/sh if it is bash.
- export ac_cv_path_BASH="${BASH}"
- has_version sys-apps/util-linux || export GETOPT=getopt-long
-
- econf
-}
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index 319eaa49c811..dd8d9b968fc9 100644
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
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 ~loong ~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="latex text"
RDEPEND="
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 1245d62d7d7b..2f10140c5321 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 33e8f637344c..ee91cd5b0e90 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,3 +1 @@
DIST gentoo-syntax-1.tar.bz2 20223 BLAKE2B 846e07354660b4859cc4131a9fbf4f78d3a2ddeda60fc6a3687b649788a52725602dcd22befa9ab9fe88b173eab1470e569076d587326935efaf40d3aaba5b57 SHA512 1e4d947f0edbf6bd24142d683944f30d43b7e0ca86b90311f2e80516d299d9a634a9842cdc90d98a43e7a693f0dd29b3ff8048256bc3fe688591cc2b84808289
-DIST gentoo-syntax-20211208.tar.bz2 18844 BLAKE2B 52e7025d46f5101f2e1c44afcbf3cba0756a1ec9c626f7af312bb5bbae518645c06c94bfc48822a721e2e3c1ed5f61376e88a074a9688cf4b5b3c352a99c87c9 SHA512 f1cfe2af440f7ed3042cbaa16558cb6df8038f439a2c3e7067f81751a37098854a3afb1653c7c3656ef85ad1874d2db9271429b92a25f494da6ee5c68819e631
-DIST gentoo-syntax-20220220.tar.bz2 19433 BLAKE2B 8f7fbbb56e41f4d682c824deb980035441195785f9ce80fd45808b55cf900c8e0455b5c670f82b1fc639c052792b78de5f0be1142eab853b0cabbd44c6ed0776 SHA512 4b515ca7936a16279c48310d1fa0f58979e35b1d84a2971bdcf4a004784efa3de99619851ac9da5ee0ee77a1f65eb28550d01013cffebd45e39fb70c0136ba12
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild
deleted file mode 100644
index 5676ffe9c190..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-MY_P=${P/0.}
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
- default
- if use ignore-glep31 ; then
- for f in ftplugin/*.vim ; do
- ebegin "Removing UTF-8 rules from ${f} ..."
- sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
- || die "waah! bad sed voodoo. need more goats."
- eend $?
- done
- fi
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- if use ignore-glep31 1>/dev/null ; then
- ewarn "You have chosen to disable the rules which ensure GLEP 31"
- ewarn "compliance. When editing ebuilds, please make sure you get"
- ewarn "the character set correct."
- fi
- fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
deleted file mode 100644
index 3cc000eb8ff3..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-MY_P=${P/0.}
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
- default
- if use ignore-glep31 ; then
- for f in ftplugin/*.vim ; do
- ebegin "Removing UTF-8 rules from ${f} ..."
- sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
- || die "waah! bad sed voodoo. need more goats."
- eend $?
- done
- fi
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- if use ignore-glep31 1>/dev/null ; then
- ewarn "You have chosen to disable the rules which ensure GLEP 31"
- ewarn "compliance. When editing ebuilds, please make sure you get"
- ewarn "the character set correct."
- fi
- fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
index cc256f13f274..e0439d327e3e 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
LICENSE="vim"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ignore-glep31"
VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 5713da5846d5..51966b5d4e5b 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild
index c940f6a5b5d6..6574050e3130 100644
--- a/app-xemacs/ada/ada-1.16.ebuild
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/auctex/auctex-1.58.ebuild b/app-xemacs/auctex/auctex-1.58.ebuild
index abcc0717cd1b..21563e35e1e9 100644
--- a/app-xemacs/auctex/auctex-1.58.ebuild
+++ b/app-xemacs/auctex/auctex-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/mail-lib
app-xemacs/edit-utils
app-xemacs/xemacs-ispell
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/bbdb/bbdb-1.35.ebuild b/app-xemacs/bbdb/bbdb-1.35.ebuild
index d0b1737bc70b..2901d52281ba 100644
--- a/app-xemacs/bbdb/bbdb-1.35.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,6 @@ app-xemacs/net-utils
app-xemacs/os-utils
app-xemacs/ecrypto
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild
index d00f8ad08b47..5305b1a12b24 100644
--- a/app-xemacs/build/build-1.18.ebuild
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/dired
app-xemacs/w3
app-xemacs/prog-modes
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild
index b880fa4ef5f5..4b9e64c70415 100644
--- a/app-xemacs/c-support/c-support-1.24.ebuild
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/cc-mode
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild
index 4d94e8a66b4b..4938584742a6 100644
--- a/app-xemacs/calc/calc-1.28.ebuild
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/calendar/calendar-1.42.ebuild b/app-xemacs/calendar/calendar-1.42.ebuild
index bd538a016ec8..8851dd89b417 100644
--- a/app-xemacs/calendar/calendar-1.42.ebuild
+++ b/app-xemacs/calendar/calendar-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
index 04990e2c2d14..c718de6f8826 100644
--- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
index 2d348f44e496..0adf254e3138 100644
--- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild
index 64f49cad4f30..daa5576e67f4 100644
--- a/app-xemacs/clearcase/clearcase-1.12.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
app-xemacs/xemacs-base
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/cogre/cogre-1.04.ebuild b/app-xemacs/cogre/cogre-1.04.ebuild
index 6bbf57b37613..cb5491bdfbb6 100644
--- a/app-xemacs/cogre/cogre-1.04.ebuild
+++ b/app-xemacs/cogre/cogre-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/cedet-common
app-xemacs/eieio
app-xemacs/semantic
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild
index 3ea71fefc0e5..957837cf4012 100644
--- a/app-xemacs/cookie/cookie-1.17.ebuild
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild
index c4c760441eb8..954cdcbb6b35 100644
--- a/app-xemacs/crisp/crisp-1.17.ebuild
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="Crisp/Brief emulation"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/debug/debug-1.21.ebuild b/app-xemacs/debug/debug-1.21.ebuild
index dee1b7628140..157432a2dafb 100644
--- a/app-xemacs/debug/debug-1.21.ebuild
+++ b/app-xemacs/debug/debug-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,6 +11,6 @@ XEMACS_EXPERIMENTAL="true"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/dictionary/dictionary-1.18.ebuild b/app-xemacs/dictionary/dictionary-1.18.ebuild
index 3db061687e14..b0599fb0f4e1 100644
--- a/app-xemacs/dictionary/dictionary-1.18.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/dired/dired-1.22.ebuild b/app-xemacs/dired/dired-1.22.ebuild
index 773ffd7cf2e3..582c35224ab4 100644
--- a/app-xemacs/dired/dired-1.22.ebuild
+++ b/app-xemacs/dired/dired-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/prog-modes
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild
index de47982b3d22..e011f70573b8 100644
--- a/app-xemacs/docbookide/docbookide-0.10.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-ispell
app-xemacs/mail-lib
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild
index 95c3af2c26d6..c86f7dcead22 100644
--- a/app-xemacs/easypg/easypg-1.05.ebuild
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit xemacs-packages
SLOT="0"
DESCRIPTION="GnuPG interface for Emacs"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/dired
diff --git a/app-xemacs/ecb/ecb-1.26.ebuild b/app-xemacs/ecb/ecb-1.26.ebuild
index e7eba06657f0..6f52fdeb9d28 100644
--- a/app-xemacs/ecb/ecb-1.26.ebuild
+++ b/app-xemacs/ecb/ecb-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,6 +24,6 @@ app-xemacs/speedbar
app-xemacs/c-support
app-xemacs/os-utils
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
index 821101086640..44778d794404 100644
--- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/ede/ede-1.07.ebuild b/app-xemacs/ede/ede-1.07.ebuild
index fda014cf474f..b02b4f4816e5 100644
--- a/app-xemacs/ede/ede-1.07.ebuild
+++ b/app-xemacs/ede/ede-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,4 +10,4 @@ inherit xemacs-packages
SLOT="0"
DESCRIPTION="Emacs Development Environment"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild
index e6f892a3f7ef..a6ce39de1026 100644
--- a/app-xemacs/edebug/edebug-1.24.ebuild
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-devel
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild
index c9a25cb2ba0d..f6e22a45a0c1 100644
--- a/app-xemacs/edict/edict-1.19.ebuild
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
RDEPEND="app-xemacs/mule-base
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild
index 5f225320dbbd..57c0d4f56b15 100644
--- a/app-xemacs/ediff/ediff-1.84.ebuild
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,6 +18,6 @@ app-xemacs/tramp
app-xemacs/vc
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.59.ebuild b/app-xemacs/edit-utils/edit-utils-2.59.ebuild
index 09766526bb92..ae3880ff76a8 100644
--- a/app-xemacs/edit-utils/edit-utils-2.59.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
app-xemacs/dired
app-xemacs/mail-lib
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/edt/edt-1.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild
index a6367a8a3345..3cc67129d0ab 100644
--- a/app-xemacs/edt/edt-1.16.ebuild
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild
index c2aed63ee149..624a74df55da 100644
--- a/app-xemacs/efs/efs-1.37.ebuild
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/dired
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/egg-its/egg-its-1.29.ebuild b/app-xemacs/egg-its/egg-its-1.29.ebuild
index 70586f694c1d..f8c282fccb2c 100644
--- a/app-xemacs/egg-its/egg-its-1.29.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mule-base
app-xemacs/fsf-compat
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/eieio/eieio-1.10.ebuild b/app-xemacs/eieio/eieio-1.10.ebuild
index d338fb8cc1a3..6ad1d3abb874 100644
--- a/app-xemacs/eieio/eieio-1.10.ebuild
+++ b/app-xemacs/eieio/eieio-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/edebug
app-xemacs/cedet-common
app-xemacs/speedbar
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild
index fa6883d778bd..b3f4e8fd4166 100644
--- a/app-xemacs/elib/elib-1.15.ebuild
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild
index 8dcc13981778..9811ca8233e7 100644
--- a/app-xemacs/emerge/emerge-1.13.ebuild
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="Another interface over GNU patch"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild
index 4c2c0395514a..d2043e43ef78 100644
--- a/app-xemacs/erc/erc-0.26.ebuild
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ SLOT="0"
DESCRIPTION="ERC - The Emacs IRC Client"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild
index 9ad5736ed1c2..c07f700a6b0f 100644
--- a/app-xemacs/escreen/escreen-1.03.ebuild
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/eshell/eshell-1.21.ebuild b/app-xemacs/eshell/eshell-1.21.ebuild
index f527918e2ddf..da63fd053cf9 100644
--- a/app-xemacs/eshell/eshell-1.21.ebuild
+++ b/app-xemacs/eshell/eshell-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-eterm
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/eudc/eudc-1.44.ebuild b/app-xemacs/eudc/eudc-1.44.ebuild
index 9e7d12b98b8b..e505f1a0ccf8 100644
--- a/app-xemacs/eudc/eudc-1.44.ebuild
+++ b/app-xemacs/eudc/eudc-1.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,6 +22,6 @@ app-xemacs/sh-script
app-xemacs/net-utils
app-xemacs/ecrypto
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild
index 37ffb042f47d..8a163aaaf667 100644
--- a/app-xemacs/footnote/footnote-1.18.ebuild
+++ b/app-xemacs/footnote/footnote-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild
index 35d2025c2d92..a055cb06c2e2 100644
--- a/app-xemacs/forms/forms-1.17.ebuild
+++ b/app-xemacs/forms/forms-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
index 06ecd86d4c2c..4518db59f669 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
index bbc1a2b8e154..a87ad2fc40f2 100644
--- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild
index ddc27cb82757..adbc84e15afa 100644
--- a/app-xemacs/games/games-1.23.ebuild
+++ b/app-xemacs/games/games-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/general-docs/general-docs-1.11.ebuild b/app-xemacs/general-docs/general-docs-1.11.ebuild
index 8ff538f85b47..84049a75fde0 100644
--- a/app-xemacs/general-docs/general-docs-1.11.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
XEMACS_EXPERIMENTAL="true"
RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild
index 98e85af7f520..b5b9bbbe6a54 100644
--- a/app-xemacs/gnats/gnats-1.19.ebuild
+++ b/app-xemacs/gnats/gnats-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/gnus/gnus-2.05.ebuild b/app-xemacs/gnus/gnus-2.05.ebuild
index a3336556ada5..eca9d3c25b7c 100644
--- a/app-xemacs/gnus/gnus-2.05.ebuild
+++ b/app-xemacs/gnus/gnus-2.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,6 +25,6 @@ app-xemacs/mailcrypt
app-xemacs/ecrypto
app-xemacs/sasl
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
index 54ca4ffa5aec..c8910393363c 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
app-xemacs/xemacs-base
app-xemacs/edit-utils
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild
index 2851c32ca986..110f8044791e 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,6 @@ XEMACS_EXPERIMENTAL="true"
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
index c7ee4903f83a..fde547672f63 100644
--- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,6 +21,6 @@ app-xemacs/sh-script
app-xemacs/net-utils
app-xemacs/ecrypto
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
index 9d886352a98f..65d8fb15ce2f 100644
--- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild
index d74daaa7b778..fe775bdfd3d4 100644
--- a/app-xemacs/idlwave/idlwave-1.34.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
app-xemacs/mail-lib
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild
index 792e971a81bd..e5830bb534cc 100644
--- a/app-xemacs/igrep/igrep-1.18.ebuild
+++ b/app-xemacs/igrep/igrep-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
app-xemacs/efs
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild
index df17a9edec21..e98ca6e89821 100644
--- a/app-xemacs/ilisp/ilisp-1.38.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
app-xemacs/xemacs-eterm
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/jde/jde-1.54.ebuild b/app-xemacs/jde/jde-1.54.ebuild
index ca4a893cff43..de8e11e39869 100644
--- a/app-xemacs/jde/jde-1.54.ebuild
+++ b/app-xemacs/jde/jde-1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,6 +23,6 @@ app-xemacs/sh-script
app-xemacs/fsf-compat
app-xemacs/os-utils
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
index 50a3de2c31d3..c83232e5b950 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
RDEPEND="app-xemacs/mule-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
index f7278d531d52..b2f17c1ecf17 100644
--- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/leim
app-xemacs/fsf-compat
app-xemacs/dired
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/leim/leim-1.39.ebuild b/app-xemacs/leim/leim-1.39.ebuild
index 81703929ae3e..46286782311b 100644
--- a/app-xemacs/leim/leim-1.39.ebuild
+++ b/app-xemacs/leim/leim-1.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
app-xemacs/xemacs-base
app-xemacs/latin-euro-standards
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild
index aa65fe269726..281045d5d6fe 100644
--- a/app-xemacs/locale/locale-1.30.ebuild
+++ b/app-xemacs/locale/locale-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
RDEPEND="app-xemacs/mule-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild
index 628b0131c205..b8cf69ce8247 100644
--- a/app-xemacs/lookup/lookup-1.17.ebuild
+++ b/app-xemacs/lookup/lookup-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
RDEPEND="app-xemacs/mule-base
app-xemacs/cookie
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/mail-lib-1.85.ebuild b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
index 939d1b1f75be..fef657b15031 100644
--- a/app-xemacs/mail-lib/mail-lib-1.85.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
app-xemacs/sh-script
app-xemacs/ecrypto
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
index 68e7686d674c..35f94789c866 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,6 +16,6 @@ app-xemacs/mh-e
app-xemacs/rmail
app-xemacs/vm
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild
index 52f3662d791e..4138db2afc64 100644
--- a/app-xemacs/mew/mew-1.22.ebuild
+++ b/app-xemacs/mew/mew-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/mail-lib
app-xemacs/xemacs-base
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild
index 34209a11a600..6c189baf32e0 100644
--- a/app-xemacs/mh-e/mh-e-1.35.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,6 +23,6 @@ app-xemacs/ecrypto
app-xemacs/cedet-common
app-xemacs/speedbar
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild
index feb093c1d4cf..8cd2cfa0dd77 100644
--- a/app-xemacs/mine/mine-1.18.ebuild
+++ b/app-xemacs/mine/mine-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild
index 1fa793beae51..964e298aafc3 100644
--- a/app-xemacs/misc-games/misc-games-1.25.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
index adeba0b23c66..9638ba5d00cf 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,6 +12,6 @@ XEMACS_EXPERIMENTAL="true"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
index 48fa77ba4c5c..4e45465ccf95 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
RDEPEND="app-xemacs/mule-base
app-xemacs/latin-euro-standards
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild
index bdae001c2e0c..495fb5dd98a8 100644
--- a/app-xemacs/net-utils/net-utils-1.61.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/bbdb
app-xemacs/xemacs-base
app-xemacs/efs
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
index 20e6d2cb8c80..6464e7f38f84 100644
--- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/hyperbole
app-xemacs/gnus
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild
index 732b24949d36..c32012de57f0 100644
--- a/app-xemacs/os-utils/os-utils-1.44.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild
index 6bf7d8e68e79..a6d8119be291 100644
--- a/app-xemacs/pc/pc-1.30.ebuild
+++ b/app-xemacs/pc/pc-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
index fb611d2fb989..8ff799af9861 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/tramp
app-xemacs/gnus
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
index 0fc28ccce6c4..4384e6020ef2 100644
--- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/sh-script
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
index fed75e5dd655..eba0964541f4 100644
--- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/ps-print
app-xemacs/edit-utils
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild
index 02222c36b726..c98de3099494 100644
--- a/app-xemacs/pgg/pgg-1.10.ebuild
+++ b/app-xemacs/pgg/pgg-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
app-xemacs/edebug
app-xemacs/ecrypto
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/prog-modes-2.34.ebuild b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
index 7b545e4f262a..d1306da775c3 100644
--- a/app-xemacs/prog-modes/prog-modes-2.34.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,6 @@ app-xemacs/cedet-common
app-xemacs/w3
app-xemacs/gnus
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild
index 62fb0fb6347e..0808c53f7f8c 100644
--- a/app-xemacs/ps-print/ps-print-1.14.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/text-modes
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
index 8312cdc56dcf..4fa23b3e7b2c 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
app-xemacs/xemacs-eterm
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/psgml/psgml-1.50.ebuild b/app-xemacs/psgml/psgml-1.50.ebuild
index 3b0d4572f203..62c43c89bf0f 100644
--- a/app-xemacs/psgml/psgml-1.50.ebuild
+++ b/app-xemacs/psgml/psgml-1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,6 +17,6 @@ app-xemacs/xemacs-eterm
app-xemacs/sh-script
app-xemacs/ps-print
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild
index 2f2ef66c2249..d3aa7bf03869 100644
--- a/app-xemacs/python-modes/python-modes-1.16.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/edit-utils
app-xemacs/fsf-compat
app-xemacs/text-modes
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild
index a1927f3fc74f..331d5afff533 100644
--- a/app-xemacs/re-builder/re-builder-1.07.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="Interactive development tool for regular expressions"
XEMACS_PKG_CAT="standard"
RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/reftex/reftex-1.36.ebuild b/app-xemacs/reftex/reftex-1.36.ebuild
index 719391ed14bb..9d23029181e3 100644
--- a/app-xemacs/reftex/reftex-1.36.ebuild
+++ b/app-xemacs/reftex/reftex-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild
index f799934adb8f..ca31af0d3417 100644
--- a/app-xemacs/riece/riece-1.26.ebuild
+++ b/app-xemacs/riece/riece-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
app-xemacs/bbdb
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/rmail/rmail-1.16.ebuild b/app-xemacs/rmail/rmail-1.16.ebuild
index ea3005d9c07b..a1efa05b7316 100644
--- a/app-xemacs/rmail/rmail-1.16.ebuild
+++ b/app-xemacs/rmail/rmail-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/apel
app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
index bc3cc6625d2a..f2c0b3479189 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
app-xemacs/debug
"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild
index 51e7fcc12a0b..ce65c1290317 100644
--- a/app-xemacs/sasl/sasl-1.18.ebuild
+++ b/app-xemacs/sasl/sasl-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/ecrypto
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild
index 3fece40d64a5..5d7e54cf6697 100644
--- a/app-xemacs/scheme/scheme-1.22.ebuild
+++ b/app-xemacs/scheme/scheme-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/semantic/semantic-1.23.ebuild b/app-xemacs/semantic/semantic-1.23.ebuild
index eb08edd5e4f5..658a9435b581 100644
--- a/app-xemacs/semantic/semantic-1.23.ebuild
+++ b/app-xemacs/semantic/semantic-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/cc-mode
app-xemacs/edebug
app-xemacs/sgml
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild
index 34b209674eff..72c97841bb79 100644
--- a/app-xemacs/sgml/sgml-1.13.ebuild
+++ b/app-xemacs/sgml/sgml-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild
index cc3a9b172597..3238f97eb10a 100644
--- a/app-xemacs/sh-script/sh-script-1.26.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild
index d4386114af2b..d869e54bcf71 100644
--- a/app-xemacs/sieve/sieve-1.20.ebuild
+++ b/app-xemacs/sieve/sieve-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/sasl
app-xemacs/ecrypto
app-xemacs/sh-script
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild
index 8d7df71742eb..82fead090fcd 100644
--- a/app-xemacs/skk/skk-1.27.ebuild
+++ b/app-xemacs/skk/skk-1.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/elib
app-xemacs/xemacs-base
app-xemacs/apel
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild
index 2f913f907841..b422a546a62a 100644
--- a/app-xemacs/slider/slider-1.18.ebuild
+++ b/app-xemacs/slider/slider-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="User interface tool"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
index af0280871452..5ae98eca2407 100644
--- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
index 92c1def0866f..17fdcdc1794d 100644
--- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="XEmacs Sun sound files"
XEMACS_PKG_CAT="standard"
RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
index a1ad1f1a4863..f1afe7e684d6 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="XEmacs Microsoft sound files"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild
index 04b2ffa477df..93ab8875c20a 100644
--- a/app-xemacs/speedbar/speedbar-1.32.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
app-xemacs/cedet-common
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild
index 0bbf96187832..5e17aa765d8e 100644
--- a/app-xemacs/strokes/strokes-1.12.ebuild
+++ b/app-xemacs/strokes/strokes-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/edit-utils
app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild
index 313d355bde31..37ca1e36a048 100644
--- a/app-xemacs/sun/sun-1.19.ebuild
+++ b/app-xemacs/sun/sun-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,6 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
RDEPEND="app-xemacs/cc-mode
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild
index b259dd162f24..503b3413fa44 100644
--- a/app-xemacs/supercite/supercite-1.23.ebuild
+++ b/app-xemacs/supercite/supercite-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild
index f71f6324df43..8477629816de 100644
--- a/app-xemacs/texinfo/texinfo-1.32.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/text-modes
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/text-modes/text-modes-2.06.ebuild b/app-xemacs/text-modes/text-modes-2.06.ebuild
index a2dba92de7ad..0fee4950ce53 100644
--- a/app-xemacs/text-modes/text-modes-2.06.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
app-xemacs/fsf-compat
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild
index 87439881d662..cae11d473e61 100644
--- a/app-xemacs/textools/textools-1.17.ebuild
+++ b/app-xemacs/textools/textools-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/time/time-1.18.ebuild b/app-xemacs/time/time-1.18.ebuild
index 4ce86822d768..9dc38473f512 100644
--- a/app-xemacs/time/time-1.18.ebuild
+++ b/app-xemacs/time/time-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,6 +11,6 @@ XEMACS_EXPERIMENTAL="true"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild
index 1c47e3df3020..81b537b8827a 100644
--- a/app-xemacs/tm/tm-1.42.ebuild
+++ b/app-xemacs/tm/tm-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/sh-script
app-xemacs/net-utils
app-xemacs/ecrypto
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
index 1de763b68aa0..9519cd8d58a1 100644
--- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
DESCRIPTION="Support for building with Tooltalk"
XEMACS_PKG_CAT="standard"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild
index 0e936e62855a..c2abf04ddb4b 100644
--- a/app-xemacs/tpu/tpu-1.16.ebuild
+++ b/app-xemacs/tpu/tpu-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="DEC EDIT/TPU support"
XEMACS_PKG_CAT="standard"
RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild
index 0107f1130377..f21b8a395231 100644
--- a/app-xemacs/tramp/tramp-1.57.ebuild
+++ b/app-xemacs/tramp/tramp-1.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,6 +17,6 @@ app-xemacs/ediff
app-xemacs/sh-script
app-xemacs/edebug
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/vc-cc/vc-cc-1.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
index 188ebef26e59..b9a045a47c33 100644
--- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild
index d8b44de2b514..babfd1de400f 100644
--- a/app-xemacs/vc/vc-1.50.ebuild
+++ b/app-xemacs/vc/vc-1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,6 @@ app-xemacs/elib
app-xemacs/edebug
app-xemacs/gnus
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild
index b409e90fd454..6059dcd6a6e7 100644
--- a/app-xemacs/vhdl/vhdl-1.24.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/ps-print
app-xemacs/os-utils
app-xemacs/cedet-common
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild
index 90767db8fbfd..8ff75254c0cf 100644
--- a/app-xemacs/view-process/view-process-1.15.ebuild
+++ b/app-xemacs/view-process/view-process-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild
index 4e7f9b92410e..cd0b1ab0f6ca 100644
--- a/app-xemacs/viper/viper-1.69.ebuild
+++ b/app-xemacs/viper/viper-1.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild
index d8a5e9094369..aee0e7bb4e6c 100644
--- a/app-xemacs/vm/vm-8.11.ebuild
+++ b/app-xemacs/vm/vm-8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/os-utils
app-xemacs/bbdb
app-xemacs/fsf-compat
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/w3/w3-1.42.ebuild b/app-xemacs/w3/w3-1.42.ebuild
index 2854356b260f..2a8658bc0db2 100644
--- a/app-xemacs/w3/w3-1.42.ebuild
+++ b/app-xemacs/w3/w3-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,6 +18,6 @@ app-xemacs/sh-script
app-xemacs/fsf-compat
app-xemacs/xemacs-eterm
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
index df6eeaf0136b..07728ac7efda 100644
--- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
app-xemacs/auctex
app-xemacs/mail-lib
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
index 283d6f9e8bf8..761ae4482984 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,6 @@ app-xemacs/net-utils
app-xemacs/xemacs-eterm
app-xemacs/ecrypto
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
index fdb762b85f11..60541cd22cd4 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Terminal emulation"
SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
index 0ea8e84da73a..43ac8193b031 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ MY_PN=${PN/xemacs-/}
SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
RDEPEND=""
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
index 2972f12f3eb9..0e1cc91aa36e 100644
--- a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
+++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.xemacs.org/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
IUSE="mule"
RDEPEND="
diff --git a/app-xemacs/xetla/xetla-1.04.ebuild b/app-xemacs/xetla/xetla-1.04.ebuild
index 09f1d86df9eb..1f15a2763874 100644
--- a/app-xemacs/xetla/xetla-1.04.ebuild
+++ b/app-xemacs/xetla/xetla-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,6 +21,6 @@ app-xemacs/mail-lib
app-xemacs/dired
app-xemacs/prog-modes
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild
index 44912635970c..a194fe5514b3 100644
--- a/app-xemacs/xlib/xlib-1.16.ebuild
+++ b/app-xemacs/xlib/xlib-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
RDEPEND="app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild
index 0b9284884270..ba8d7e644005 100644
--- a/app-xemacs/xslide/xslide-1.11.ebuild
+++ b/app-xemacs/xslide/xslide-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
app-xemacs/mail-lib
app-xemacs/xemacs-base
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xslt-process/xslt-process-1.14.ebuild b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
index ab18a9aaf9c0..8559210c6eab 100644
--- a/app-xemacs/xslt-process/xslt-process-1.14.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,6 +24,6 @@ app-xemacs/fsf-compat
app-xemacs/xemacs-devel
app-xemacs/os-utils
"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/app-xemacs/xwem/xwem-1.27.ebuild b/app-xemacs/xwem/xwem-1.27.ebuild
index 62f1f29fc25e..4f66315af2fb 100644
--- a/app-xemacs/xwem/xwem-1.27.ebuild
+++ b/app-xemacs/xwem/xwem-1.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,6 +21,6 @@ app-xemacs/ilisp
app-xemacs/mail-lib
app-xemacs/apel
"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
inherit xemacs-packages
diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild
index 18133962fa3c..b2beb3d3cb8a 100644
--- a/app-xemacs/zenirc/zenirc-1.18.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="ZENIRC IRC Client"
XEMACS_PKG_CAT="standard"
RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
inherit xemacs-packages
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b49955ebad39..9ec94ce4afe2 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index caf257c07eb3..e49c384fb94d 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index e48bfd350451..9b10f2e2fc95 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
# -sparc as libunwind is not ported on sparc
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags static-libs test"
RESTRICT="test"
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 88123b2be536..b3672874b744 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags +libunwind llvm-libunwind test"
RESTRICT="!test? ( test )"
@@ -54,3 +54,8 @@ src_configure() {
cmake-multilib_src_configure
}
+
+src_test() {
+ # See bug #832355
+ cmake-multilib_src_test -j1
+}
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
index 26506c43b2ce..98782f199f51 100644
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git"
else
SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
fi
LICENSE="Apache-2.0"
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 5728b4d18b10..c042e0f356b2 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
index d04a75eec66b..93c98ccdaa8e 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit cmake
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
@@ -15,9 +15,9 @@ LICENSE="MIT"
SLOT="0"
src_configure() {
- local mycmakeargs=(
+ local mycmakeargs=(
-DRH_STANDALONE_PROJECT=OFF
-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/share/"
- )
- cmake_src_configure
+ )
+ cmake_src_configure
}
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
index 4fff4a53f17e..6e42350ec553 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
@@ -15,9 +15,9 @@ LICENSE="MIT"
SLOT="0"
src_configure() {
- local mycmakeargs=(
+ local mycmakeargs=(
-DRH_STANDALONE_PROJECT=OFF
-DCMAKE_INSTALL_LIBDIR="${ESYSROOT}/usr/share/"
- )
- cmake_src_configure
+ )
+ cmake_src_configure
}
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
new file mode 100644
index 000000000000..4252ea446423
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
@@ -0,0 +1,27 @@
+https://github.com/oneapi-src/oneTBB/pull/716
+
+From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt
+Date: Wed, 5 Jan 2022 15:13:32 +0100
+Subject: [PATCH] Fix overeager stripping of compile flag
+
+The existing regex strips all occurrences of the given string from
+`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
+flag. For instance, `-Werror=format-security` gets truncated to
+`=format-security`.
+
+The new regex makes sure that only whole words get replaced.
+
+Signed-off-by: Christoph Erhardt
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
+ unset(_tbb_compile_options)
+ if (CMAKE_CXX_FLAGS)
+- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ endif()
+ endmacro()
+
+
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index aa3f0e7c26e2..8c4c5a5883a4 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -32,6 +32,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
# musl again, should be in.. 2022?
"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+
+ "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
)
src_configure() {
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index c0f7bf6468ee..2a51ade355b8 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,3 +1,4 @@
DIST waylandpp-0.2.10.tar.gz 187273 BLAKE2B bc6dd4503665d7fd04ac78e6db26aefe1ce1974bfa33ed751fe3714a3838af90340cef77c53cef95d519c423c639d93c2e15e1fc602301b254d56ca029e021be SHA512 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99
DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
DIST waylandpp-0.2.9.tar.gz 187141 BLAKE2B 0bf1bf62ccc792444d21941f15b675c9584822485c9869b66c40bcddbaac5716dcc25bf98e6110fc549f5f10c1197c9e5188c72b10cb878ba8e133a0e55b2db8 SHA512 abe683c236f3b082fb1bd64ce9cc93e4362040f41b31a42971a280fadc8a7ef06a47c6a02cb5201a3f4f864ccdc8a113a8d9a855ca99b42bf1fc322e2593648f
+DIST waylandpp-1.0.0.tar.gz 203510 BLAKE2B 939262f61051fb242e779fa4817b262af2de6acef50b53a55e8565e6305e84fbf297adad02d27342a39e2a1be920443cc6dd50711e2c584b3322fa1e90a7051c SHA512 64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039
diff --git a/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
new file mode 100644
index 000000000000..ed2592fab36d
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+ >=dev-libs/wayland-1.11.0
+ media-libs/mesa[wayland]
+ >=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ "
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 601b51866b71..12bd673fe968 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/files/mongodb.service-r1 b/dev-db/mongodb/files/mongodb.service-r1
new file mode 100644
index 000000000000..a9adb390bd19
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.service-r1
@@ -0,0 +1,12 @@
+[Unit]
+Description=High-performance, schema-free document-oriented database
+After=network.target
+
+[Service]
+User=mongodb
+ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
+LimitNOFILE=65536
+
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-db/mongodb/mongodb-4.2.15-r2.ebuild b/dev-db/mongodb/mongodb-4.2.15-r2.ebuild
new file mode 100644
index 000000000000..3edd0a731a40
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.15-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+)]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+ ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.0-series. Then upgrade to 4.2 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.17-r1.ebuild b/dev-db/mongodb/mongodb-4.2.17-r1.ebuild
new file mode 100644
index 000000000000..874b0f131583
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.17-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+)]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+ ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.0-series. Then upgrade to 4.2 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
new file mode 100644
index 000000000000..a110d8e1be17
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+ ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.2-series. Then upgrade to 4.4 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
new file mode 100644
index 000000000000..1e73ef98da40
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+ ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.2-series. Then upgrade to 4.4 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-5.0.2-r2.ebuild b/dev-db/mongodb/mongodb-5.0.2-r2.ebuild
new file mode 100644
index 000000000000..f80a7d9aa426
--- /dev/null
+++ b/dev-db/mongodb/mongodb-5.0.2-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="
+ mongosh? ( app-admin/mongosh-bin )
+ tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+ "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ # Bug 809692
+ if use amd64 && ! use cpu_flags_x86_avx; then
+ eerror "MongoDB 5.0 requires use of the AVX instruction set"
+ eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+ die "MongoDB requires AVX"
+ fi
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+ ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.4-series. Then upgrade to 5.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --jobs="$(makeopts_jobs)"
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-5.0.5-r1.ebuild b/dev-db/mongodb/mongodb-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..7cdc397e6121
--- /dev/null
+++ b/dev-db/mongodb/mongodb-5.0.5-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3:=
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+),nls]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ >=dev-libs/openssl-1.0.1g:0=
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="
+ mongosh? ( app-admin/mongosh-bin )
+ tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+ "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+ "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ # Bug 809692
+ if use amd64 && ! use cpu_flags_x86_avx; then
+ eerror "MongoDB 5.0 requires use of the AVX instruction set"
+ eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+ die "MongoDB requires AVX"
+ fi
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+ ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.4-series. Then upgrade to 5.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --jobs="$(makeopts_jobs)"
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mydumper/mydumper-0.11.5.2.ebuild b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
index 72f86aa467fe..ae2803f27c16 100644
--- a/dev-db/mydumper/mydumper-0.11.5.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc"
RDEPEND="app-arch/zstd
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ac46e3ff43fc..4462f4e2632a 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,3 +1,4 @@
DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf
DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845
DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
+DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild
index ebe779b0841d..023aba8e9614 100644
--- a/dev-db/redis/redis-6.2.6.ebuild
+++ b/dev-db/redis/redis-6.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild
new file mode 100644
index 000000000000..daabb56d3c64
--- /dev/null
+++ b/dev-db/redis/redis-6.2.7-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+# - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+# - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+# because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+# Upstream have deviated too far from vanilla Lua, adding their own APIs
+# like lua_enablereadonlytable, but we still need the eclass and such
+# for bug #841422.
+inherit autotools flag-o-matic systemd toolchain-funcs lua-single tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+ ssl? ( dev-libs/openssl:0= )
+ systemd? ( sys-apps/systemd:= )
+ tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ acct-group/redis
+ acct-user/redis
+"
+
+BDEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+ ${COMMON_DEPEND}
+ test? (
+ dev-lang/tcl:0=
+ ssl? ( dev-tcltk/tls )
+ )"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+ ${LUA_REQUIRED_USE}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.2.1-config.patch
+ "${FILESDIR}"/${PN}-5.0-shared.patch
+ "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+ default
+
+ # unstable on jemalloc
+ > tests/unit/memefficiency.tcl || die
+
+ # Copy lua modules into build dir
+ #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+ #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+ # Append cflag for lua_cjson
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+ append-cflags "-DENABLE_CJSON_GLOBAL"
+
+ # now we will rewrite present Makefiles
+ local makefiles="" MKF
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+ # Use the correct pkgconfig name for Lua.
+ # The upstream configure script handles luajit specially, and is not
+ # affected by these changes.
+ sed -i \
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ -e "/PKG_CHECK_MODULES.*\/s,lua5.1,${ELUA},g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoreconf
+}
+
+src_configure() {
+ econf #$(use_with lua_single_target_luajit luajit)
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ local myconf=""
+
+ if use jemalloc; then
+ myconf+="MALLOC=jemalloc"
+ elif use tcmalloc; then
+ myconf+="MALLOC=tcmalloc"
+ else
+ myconf+="MALLOC=libc"
+ fi
+
+ if use ssl; then
+ myconf+=" BUILD_TLS=yes"
+ fi
+
+ export USE_SYSTEMD=$(usex systemd)
+
+ tc-export AR CC RANLIB
+ emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+ # Known to fail with FEATURES=usersandbox
+ if has usersandbox ${FEATURES}; then
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+ fi
+
+ if use ssl; then
+ ./utils/gen-test-certs.sh
+ ./runtest --tls
+ else
+ ./runtest
+ fi
+}
+
+src_install() {
+ insinto /etc/redis
+ doins redis.conf sentinel.conf
+ use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+ fperms 0750 /etc/redis
+ fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd-r2" redis
+ newinitd "${FILESDIR}/redis.initd-6" redis
+
+ systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+ newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+ newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+ newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+ tmpfiles_process redis.conf
+
+ ewarn "The default redis configuration file location changed to:"
+ ewarn " /etc/redis/{redis,sentinel}.conf"
+ ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 9e386905e915..1753527de9dd 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,8 @@
DIST sqlite-doc-3380000.zip 10603776 BLAKE2B f196b00cce01672dc1a27a64d70669ff87c26eacbdb97c76c3c45702cc2c9509507ddcc50180b3a4479afe2991a94dc3a8def59a984d917ad09fba5cbb63da94 SHA512 8e1f77504a1057cd23a8a6c2a285d63c5df50ceaf6ab84054a6f5422286dd868bdb3d5bd9be180b7834caba2b65ca185ffff60455bb504df30801157b62a62ef
DIST sqlite-doc-3380100.zip 10615296 BLAKE2B fa3df2458b9c15d5f7ce8abb02eb050dddb618c6e87cd79e1979612649be53de4ed26d2bb3e1230e43d7fb1293e1d5bfa870d211195a9b7c2a11a97d417d1ab6 SHA512 ccdfee3d07f2c43b6dda52a2240fd3e72ada38be5a644d097b23116e1b0c2e21f539bf56afbae30fc4275b9b4a954393f95b0a5272bcf18c98e1538d190ff6bc
DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
+DIST sqlite-doc-3380300.zip 10626490 BLAKE2B 7f1c2ff11ed4ba4748c35fcd72bedec5ce1ca68d87d00839f0a5f512c7309cf1c60678c0a0d8aecf07dc521c2240acdf1262f47ff3000b95e4953e095f2ec8f2 SHA512 4c30860b6ff0ba8c9455ea037cdda642bab2c1070e8726411ee51046b442f333623ce9c810d1d028a49ce571e6cc4afe363c643e90ba59463e84bb39298c4ad3
DIST sqlite-src-3380000.zip 13236840 BLAKE2B f303e39a9d913994f0756f986de9d316322b2278b8d2aeb505eb37d1c370c2edbb91f6f56e95b73938137a72b0c22a82fc8a2ceb19ab03271c38f653b66f66ea SHA512 9f4d3c406df5e6290f3f0b5e24b568723ab54bb085cb8cd7621ab42b0b8cd4f76e9784a4a29b42ea8cb0d1b7d759267c3cd980913d490d08e7172df05949131d
DIST sqlite-src-3380100.zip 13241298 BLAKE2B 9dbccd5942f146da4c40d6208c491473c191752a74ee18ce131f3dea533976732440974e97906aead460daee39c7d6085ffa0f093d8f17e8f64c813bbb2409ad SHA512 df200916789c15e010a8e62dd8257833f34d4cf3496080a72fdc2330a530c193cda055e3c9ed39a404b87c8001c83a4b187491525ca95b5c5a1dbdd2f41cc222
DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
+DIST sqlite-src-3380300.zip 13244116 BLAKE2B d28c26a72729b49fac009e835068a15cb14b13bcef5e2d45a94929f22329002cbbf09ff9926a7cb041d1bcbd6fb9ebac784cce06196d29a9b9bf56f97645553e SHA512 d0605148931db62d167080e384d058e87452409fcb3ce366603e6eec8e2f68754259ce217c26e641401d5b0ae7714efd45fc4a881671db37597f2f027cd7da51
diff --git a/dev-db/sqlite/sqlite-3.38.1.ebuild b/dev-db/sqlite/sqlite-3.38.1.ebuild
index 299f63bd8868..9477c9a3adc1 100644
--- a/dev-db/sqlite/sqlite-3.38.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.38.2.ebuild b/dev-db/sqlite/sqlite-3.38.2.ebuild
index 1def7739f4fc..c69a893b551d 100644
--- a/dev-db/sqlite/sqlite-3.38.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.2.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.38.3.ebuild b/dev-db/sqlite/sqlite-3.38.3.ebuild
new file mode 100644
index 000000000000..c69a893b551d
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.38.3.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+ DOC_PV="${SRC_PV}"
+ # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+ doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+ PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+ BDEPEND=">=dev-lang/tcl-8.6:0
+ dev-vcs/fossil"
+else
+ BDEPEND="app-arch/unzip
+ >=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+ icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+ S="${WORKDIR}/${PN}"
+else
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_fossil_fetch() {
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ local repo_id="${1}"
+ local repo_uri="${2}"
+
+ local -x FOSSIL_HOME="${HOME}"
+
+ mkdir -p "${T}/fossil/${repo_id}" || die
+ pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+ if [[ -n "${EVCS_OFFLINE}" ]]; then
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+ fi
+ else
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+ fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+ einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+ fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+ echo
+ fi
+
+ (
+ addwrite "${distdir}"
+ mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+ cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+ )
+ fi
+
+ popd > /dev/null || die
+}
+
+_fossil_checkout() {
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ local repo_id="${1}"
+ local branch_or_commit="${2}"
+ local target_directory="${3}"
+
+ local -x FOSSIL_HOME="${HOME}"
+
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+ fi
+
+ if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+ mkdir -p "${T}/fossil/${repo_id}" || die
+ cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+ fi
+
+ mkdir "${target_directory}" || die
+ pushd "${target_directory}" > /dev/null || die
+
+ einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+ fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+ echo
+
+ popd > /dev/null || die
+}
+
+fossil_fetch() {
+ local repo_id="${1}"
+ local repo_uri="${2}"
+ local target_directory="${3}"
+
+ local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+ _fossil_fetch "${repo_id}" "${repo_uri}"
+ _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+ if use doc; then
+ fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+ fi
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ eapply_user
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+ local options=()
+
+ options+=(
+ --enable-load-extension
+ --enable-threadsafe
+ )
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support bytecode and tables_used virtual tables.
+ # https://sqlite.org/compile.html#enable_bytecode_vtab
+ # https://sqlite.org/bytecodevtab.html
+ append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+ # Support column metadata functions.
+ # https://sqlite.org/compile.html#enable_column_metadata
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support sqlite_dbpage virtual table.
+ # https://sqlite.org/compile.html#enable_dbpage_vtab
+ # https://sqlite.org/dbpage.html
+ append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/compile.html#enable_dbstat_vtab
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support sqlite3_serialize() and sqlite3_deserialize() functions.
+ # https://sqlite.org/compile.html#enable_deserialize
+ # https://sqlite.org/c3ref/serialize.html
+ # https://sqlite.org/c3ref/deserialize.html
+ append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+ # Support comments in output of EXPLAIN.
+ # https://sqlite.org/compile.html#enable_explain_comments
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/compile.html#enable_fts3
+ # https://sqlite.org/compile.html#enable_fts3_parenthesis
+ # https://sqlite.org/compile.html#enable_fts4
+ # https://sqlite.org/compile.html#enable_fts5
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support memsys5 memory allocator.
+ # https://sqlite.org/compile.html#enable_memsys5
+ # https://sqlite.org/malloc.html#memsys5
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+ # Support sqlite3_normalized_sql() function.
+ # https://sqlite.org/c3ref/expanded_sql.html
+ append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+ # Support sqlite_offset() function.
+ # https://sqlite.org/compile.html#enable_offset_sql_func
+ # https://sqlite.org/lang_corefunc.html#sqlite_offset
+ append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+ # Support pre-update hook functions.
+ # https://sqlite.org/compile.html#enable_preupdate_hook
+ # https://sqlite.org/c3ref/preupdate_count.html
+ append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/compile.html#enable_rbu
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/compile.html#enable_rtree
+ # https://sqlite.org/compile.html#enable_geopoly
+ # https://sqlite.org/rtree.html
+ # https://sqlite.org/geopoly.html
+ append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+ # Support Session extension.
+ # https://sqlite.org/compile.html#enable_session
+ # https://sqlite.org/sessionintro.html
+ append-cppflags -DSQLITE_ENABLE_SESSION
+
+ # Support scan status functions.
+ # https://sqlite.org/compile.html#enable_stmt_scanstatus
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support sqlite_stmt virtual table.
+ # https://sqlite.org/compile.html#enable_stmtvtab
+ # https://sqlite.org/stmt.html
+ append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+ # Support unknown() function.
+ # https://sqlite.org/compile.html#enable_unknown_sql_function
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+ # Support unlock notification.
+ # https://sqlite.org/compile.html#enable_unlock_notify
+ # https://sqlite.org/c3ref/unlock_notify.html
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+ # https://sqlite.org/compile.html#enable_update_delete_limit
+ # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+ # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+ append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+ # Support soundex() function.
+ # https://sqlite.org/compile.html#soundex
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # Support URI filenames.
+ # https://sqlite.org/compile.html#use_uri
+ # https://sqlite.org/uri.html
+ append-cppflags -DSQLITE_USE_URI
+
+ # debug USE flag.
+ options+=($(use_enable debug))
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if use readline; then
+ options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/compile.html#secure_delete
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+ options+=(
+ --enable-tcl
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+ )
+ else
+ options+=(--disable-tcl)
+ fi
+
+ if [[ "${ABI}" == "x86" ]]; then
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+ append-cflags -mfpmath=sse
+ else
+ append-cflags -ffloat-store
+ fi
+
+ # Skip known-broken test for now
+ # https://sqlite.org/forum/forumpost/d97caf168f
+ # https://sqlite.org/forum/forumpost/50f136d91d
+ if use test ; then
+ rm test/atof1.test || die
+ fi
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+ fi
+
+ if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+ emake tclsqlite3.c
+
+ local build_directory="$(pwd)"
+ build_directory="${build_directory##*/}"
+
+ mkdir "${WORKDIR}/${PN}-doc-build" || die
+ pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+ emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+ rmdir doc/matrix{/*,} || die
+
+ popd > /dev/null || die
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+ # e_uri.test tries to open files in /.
+ # https://bugs.gentoo.org/839798
+ local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+ addpredict "/test.db:/ÿ.db"
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool changeset sqlite3-changeset
+ install_tool dbdump sqlite3-db-dump
+ install_tool dbhash sqlite3-db-hash
+ install_tool dbtotxt sqlite3-db-to-txt
+ install_tool index_usage sqlite3-index-usage
+ install_tool rbu sqlite3-rbu
+ install_tool scrub sqlite3-scrub
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showshm sqlite3-show-shm
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+ install_tool sqlite3_checker sqlite3-checker
+ install_tool sqlite3_expert sqlite3-expert
+ install_tool sqltclsh sqlite3-tclsh
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete || die
+
+ doman sqlite3.1
+
+ if use doc; then
+ if [[ "${PV}" == "9999" ]]; then
+ pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+ else
+ pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+ fi
+
+ find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+ if [[ "${PV}" != "9999" ]]; then
+ rm search search.d/admin || die
+ rmdir search.d || die
+ find -name "*~" -delete || die
+ fi
+
+ (
+ docinto html
+ dodoc -r *
+ )
+
+ popd > /dev/null || die
+ fi
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 8d598df4a7f0..cef3a997a6a4 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/srecord/srecord-1.64-r1.ebuild b/dev-embedded/srecord/srecord-1.64-r1.ebuild
new file mode 100644
index 000000000000..aa4b0214e17d
--- /dev/null
+++ b/dev-embedded/srecord/srecord-1.64-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A collection of powerful tools for manipulating EPROM load files"
+HOMEPAGE="http://srecord.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libgcrypt:0"
+DEPEND="${RDEPEND}
+ app-text/ghostscript-gpl
+ dev-libs/boost
+ sys-apps/groff
+ test? ( app-arch/sharutils )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.57-libtool.patch )
+
+src_prepare() {
+ default
+
+ cp etc/configure.ac "${S}"
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}"
+}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 4d6ee54ddb83..2e1b7e3617e9 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1 +1,2 @@
DIST u-boot-2022.01.tar.bz2 17449627 BLAKE2B 574f9d248a8c19aa20b1b16cb55bb201d6c1ab2162da3f8789d39286a4f4a5a76b772d4a49c17e5572ff69f489d1d6fdc02d6e8f67a8bf6c50159b1a41e7c81d SHA512 d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
+DIST u-boot-2022.04.tar.bz2 17772787 BLAKE2B 5d2035130c0631f8f1b7f7963bedf71578a66994e3950eb103a404a08e85686cd971ba51e8172093ccb75d975101024bf2a94d4064763ad57ad8950c11092319 SHA512 113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
new file mode 100644
index 000000000000..2c89fa57625c
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="envtools"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
+ scripts/kconfig/{g,m,n,q}conf-cfg.sh \
+ scripts/kconfig/Makefile \
+ tools/Makefile || die
+}
+
+src_configure() {
+ tc-export AR BUILD_CC CC PKG_CONFIG
+}
+
+src_compile() {
+ # Unset a few KBUILD variables. Bug #540476
+ unset KBUILD_OUTPUT KBUILD_SRC
+
+ local myemakeargs=(
+ V=1
+ AR="${AR}"
+ CC="${CC}"
+ HOSTCC="${BUILD_CC}"
+ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)'
+ HOSTLDFLAGS="${LDFLAGS}"
+ )
+
+ emake "${myemakeargs[@]}" tools-only_defconfig
+
+ emake "${myemakeargs[@]}" \
+ NO_SDL=1 \
+ HOSTSTRIP=: \
+ STRIP=: \
+ CONFIG_ENV_OVERWRITE=y \
+ $(usex envtools envtools tools-all)
+}
+
+src_test() { :; }
+
+src_install() {
+ cd tools || die
+
+ if ! use envtools; then
+ dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+ fi
+
+ dobin env/fw_printenv
+
+ dosym fw_printenv /usr/bin/fw_setenv
+
+ insinto /etc
+ doins env/fw_env.config
+
+ doman ../doc/mkimage.1
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 67a76cfdd995..6bf13e827fd7 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index 9c7c1638e2f2..777a3412b445 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -4,6 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="aopalliance:aopalliance:1.0"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index fa844886caec..1b9aa2ba2064 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/jacl:0
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
deleted file mode 100644
index a6d049b54c10..000000000000
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 epatch java-ant-2
-
-DESCRIPTION="Bean Script Framework"
-HOMEPAGE="http://commons.apache.org/bsf/"
-SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# If you add new ones, add them to ant-apache-bsf too for use dependencies
-IUSE="javascript python tcl"
-
-CDEPEND="
- python? (
- dev-java/jython:2.7
- )
- javascript? (
- dev-java/rhino:1.6
- )
- tcl? (
- dev-java/jacl:0
- )
- dev-java/xalan:0
- dev-java/commons-logging:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- rm -v lib/*.jar || die
- rm samples/*/*.class || die
-
- java-ant_ignore-system-classes
-
- # somebody forgot to add them to source tarball... fetched from svn
- cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
-
- # Silence javadoc.
- java-ant_xml-rewrite -f build.xml -c \
- -e javadoc \
- -a failonerror \
- -v no
-
- # http://bugs.jython.org/issue1814
- # Also, bsf is an old project (2011) and hasn't officially taken the leap to
- # jython-2.7. This patch fixes the issue.
- epatch "${FILESDIR}"/${P}-PyJavaInstance.patch
-}
-
-src_compile() {
- local pkgs="commons-logging,xalan"
- local antflags="-Dxalan.present=true"
-
- if use python; then
- antflags="${antflags} -Djython.present=true"
- pkgs="${pkgs},jython-2.7"
- fi
- if use javascript; then
- antflags="${antflags} -Drhino.present=true"
- pkgs="${pkgs},rhino-1.6"
- fi
- if use tcl; then
- antflags="${antflags} -Djacl.present=true"
- pkgs="${pkgs},jacl"
- fi
-
- local cp="$(java-pkg_getjars ${pkgs})"
- eant -Dgentoo.classpath="${cp}" ${antflags} jar
-
- # stupid clean
- mv build/lib/${PN}.jar "${S}" || die
- use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
-
- dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
-
- use doc && java-pkg_dojavadoc build/javadocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/org
-
- java-pkg_register-optional-dependency bsh,groovy-1,jruby
-}
-
-pkg_postinst() {
- elog "Support for python, javascript, and tcl is controlled via USE flags."
- elog "Also, following languages can be supported just by installing"
- elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
- elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
-}
diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
index 3310d4809efd..93a6ebde1b57 100644
--- a/dev-java/bsf/bsf-2.4.0-r3.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# If you add new ones, add them to ant-apache-bsf too for use dependencies
IUSE="javascript python tcl"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
new file mode 100644
index 000000000000..6cdfcc4ae4a4
--- /dev/null
+++ b/dev-java/guava-testlib/Manifest
@@ -0,0 +1 @@
+DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
diff --git a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
new file mode 100644
index 000000000000..693aff4d94cb
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib --download-uri https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-30.1.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.guava:guava-testlib:30.1.1-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# error: package com.google.common.truth does not exist
+RESRTICT="test"
+
+# Common dependencies
+# POM: ${PN}
+# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
+# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
+# com.google.guava:guava:30.1.1-jre -> >=dev-java/guava-30.1.1:0
+# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+ dev-java/checker-framework-qual:0
+ dev-java/error-prone-annotations:0
+ ~dev-java/guava-30.1.1:0
+ dev-java/jsr305:0
+ dev-java/junit:4
+ dev-java/j2objc-annotations:0
+"
+
+# Compile dependencies
+# POM: ${PN}
+# test? com.google.truth:truth:1.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+# test? (
+# !!!groupId-not-found!!!
+# )
+#"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/guava-${PV}"
+
+JAVA_SRC_DIR=( "${PN}/src" )
+# JAVA_RESOURCE_DIRS="${PN}/src"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
+JAVA_TEST_SRC_DIR=( "${PN}/test" )
+JAVA_TEST_RESOURCE_DIRS=( "${PN}/test" )
diff --git a/dev-java/guava-testlib/metadata.xml b/dev-java/guava-testlib/metadata.xml
new file mode 100644
index 000000000000..8f8ff281cf6a
--- /dev/null
+++ b/dev-java/guava-testlib/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ Guava testlib is a set of java classes used for more convenient unit testing - particularly to assist the tests for Guava itself.
+
+
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4349f0bee98f..843d1f08107c 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1 +1,2 @@
DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
+DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
new file mode 100644
index 000000000000..d4345e50897c
--- /dev/null
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/google/guava/archive/v30.1.1.tar.gz --slot 5 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x866" --ebuild guice-5.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.inject:guice:5.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above"
+HOMEPAGE="https://github.com/google/guice"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Most of the test dependencies are missing in Gentoo.
+RESTRICT="test"
+
+# Common dependencies
+# POM: core/pom.xml
+# aopalliance:aopalliance:1.0 -> >=dev-java/aopalliance-1.0:1
+# com.google.guava:guava:30.1-jre -> >=dev-java/guava-30.1.1:0
+# javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
+# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
+
+CP_DEPEND="
+ dev-java/aopalliance:1
+ dev-java/asm:9
+ dev-java/guava:0
+ dev-java/javax-inject:0
+"
+
+# Compile dependencies
+# POM: core/pom.xml
+# test? biz.aQute:bnd:0.0.384 -> !!!groupId-not-found!!!
+# test? com.google.guava:guava-testlib:30.1-jre -> >=dev-java/guava-testlib-30.1.1:0
+# test? com.google.truth:truth:0.45 -> !!!groupId-not-found!!!
+# test? javax.inject:javax.inject-tck:1 -> !!!artifactId-not-found!!!
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:3.0.5 -> !!!groupId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+ test? (
+ dev-java/guava-testlib:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR=( "core/src" )
+JAVA_RESOURCE_DIRS=( "core/res" )
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,junit-4"
+JAVA_TEST_SRC_DIR=( "core/test" )
+JAVA_TEST_RESOURCE_DIRS=( "core/test" )
+
+src_prepare() {
+ default
+ mkdir -p "core/res/com/google/inject/" || die
+ cp core/{src,res}/com/google/inject/BUILD || die
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index 4023e0a16ff8..e8d9fbe997ec 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ MY_PN="hamcrest"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index a8ef97c4a000..27f4ffa43866 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
SRC_URI="mirror://gentoo/${MY_P}.tgz"
LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index f94f57c00f21..4de8b3f48a51 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -6,6 +6,6 @@
Java
- hamcrest/
+ hamcrest/JavaHamcrest
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
index bed740f60fbe..6aa236cef3f7 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
SRC_URI="mirror://gentoo/${MY_P}.tgz"
LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 625ad5a85cc5..4de8b3f48a51 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -6,7 +6,6 @@
Java
- hamcrest
- hamcrest/
+ hamcrest/JavaHamcrest
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index 3ab303aebbcd..116e14e5b5b7 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
SRC_URI="mirror://gentoo/${MY_P}.tgz"
LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index f94f57c00f21..4de8b3f48a51 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -6,6 +6,6 @@
Java
- hamcrest/
+ hamcrest/JavaHamcrest
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 87a68d7d06cf..aa2571e548e8 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,2 +1 @@
-DIST jackson-annotations-2.13.0.tar.gz 1819614 BLAKE2B edb0a0e7586033a61722fda22bbb13f1ed119bd6af63931572396a4ee3f19f66fb20d750742b53d68a4159d11863b612d8e802b42b0359d90700dc6c03c8793e SHA512 e24fd9dfd6b7e3a7ee37cd41c30a073ec9b2d64dacfa47f7418643615b0ed145f8b1ac3e889b0f411412b74661b36ed352d89a62edebc8f2e07aeeed5d283c2f
DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
deleted file mode 100644
index 04d11cb62cce..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-annotations/archive/refs/tags/jackson-annotations-2.13.0.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( LICENSE README.md release-notes/VERSION-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_EXCLUDES=(
- # 1) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase
- com.fasterxml.jackson.annotation.TestBase
-)
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
index 81ea0df6638c..c2835290b469 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index fee5ca00f0e3..ae2de93da1cc 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,2 +1 @@
-DIST jackson-core-2.13.0.tar.gz 11437457 BLAKE2B d4629f7a5c497bb837369050564ed91b9520290c2355a3fe20939c6211112c552b8e2db5dfc8bd9965ec17df8194191368189dcb425e3f9a5ad60a08c3a2b900 SHA512 b3d50849f0912252cbdde77de05a1c9836d044f48c50c4a4992e7b207d1f83ea9580df2bf843d9cb1c50008a808525ca82dd22d8dfa192fa394f8a923ee274a3
DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
diff --git a/dev-java/jackson-core/jackson-core-2.13.0.ebuild b/dev-java/jackson-core/jackson-core-2.13.0.ebuild
deleted file mode 100644
index 562b36a94013..000000000000
--- a/dev-java/jackson-core/jackson-core-2.13.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core Jackson processing abstractionis (Streaming API), implementation for JSON"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( LICENSE README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
- # Upstream doesn't run these tests and gets
- # »Tests run: 928, Failures: 0, Errors: 0, Skipped: 0«
- com.fasterxml.jackson.failing.async.AsyncTokenErrorTest
- com.fasterxml.jackson.failing.filter.BasicParserFilteringTest
- com.fasterxml.jackson.failing.ParserErrorHandling105Test
- com.fasterxml.jackson.failing.ParserErrorHandling679Test
- com.fasterxml.jackson.failing.ParserFilterEmpty708Test
- com.fasterxml.jackson.failing.Surrogate223Test
- perf.ConcurrencyReadTest
- perf.ManualCharAccessTest
-)
-
-src_prepare() {
- default
-
- sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-core:g' \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
- java-pkg-2_src_prepare
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
index 89cdf79b4682..e156fbe67bdc 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index f0f18ce12db7..998e1914a351 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,2 +1 @@
-DIST jackson-databind-2.13.0.tar.gz 44195827 BLAKE2B f623840b21ba149510d81722ef5aa94dcc99fadc18954427340db2c411e90db53d1507789e79048d4bc84f56786202a4ad741a30bf904863a974939e038e7bb8 SHA512 f76a0b0b940f297d65c6bcf9ba3e6f276294f5ef70fe1c5b1dddab826ef9b49ef195fa0115d422906925e32ced1002c7e02991106e8cf196f48db49b67e39067
DIST jackson-databind-2.13.2.tar.gz 48047657 BLAKE2B 9efb9004d983613b4b0f9a3242d7c0a8610eaac868beff1b5343c268b9381a86c22176d2bbe847fba121f9f928f87838fc7e05bd34955ea3f811ed02a8547e5f SHA512 d15167e1a5a19a9aea369123faca3e7dd5b27a9a3cfa2f76c871967ec7b4331f1d5a266cf6084e94dafe00971abcbf17d01c6e3b91cae0b4a298769dac05f486
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild
deleted file mode 100644
index 1d9ce42a4732..000000000000
--- a/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/refs/tags/jackson-databind-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-
-CP_DEPEND="
- >=dev-java/jackson-annotations-2.13.0:2
- dev-java/jackson-core:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS=(
-# "src/test/resources"
-# )
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e "s:@projectartifactid@:${PN}:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
index af5adb449b65..9500e3416646 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
RESTRICT="test"
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 3b5871be55c9..aa0a164cc1c4 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,2 +1 @@
-DIST jackson-dataformat-xml-2.13.0.tar.gz 3009443 BLAKE2B eaad5101f74ba5fdc0b91bc1c2b1f6174e812a63aea43d64ae9626bd22f5623fd9fb8dcd98384124e6860ea60dec4f4bb25196bd0be21daa9cf71e59a3b0252b SHA512 ad8bff16efe62cd9b8a509bc6677f771cf8e8f76bf320b8a463fe4d63d533e2cf7e3d9eda8c665c32383cf70b790f0847ea5e63a0cfcad5d4ea6918db21d6573
DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
deleted file mode 100644
index 4430aa547511..000000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/refs/tags/jackson-dataformat-xml-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# com.fasterxml.woodstox:woodstox-core:6.2.6 -> >=dev-java/woodstox-core-6.2.7:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-
-CP_DEPEND="
- >=dev-java/jackson-annotations-2.13.0:2
- >=dev-java/jackson-core-2.13.0:0
- >=dev-java/jackson-databind-2.13.0:0
- >=dev-java/stax2-api-4.2.1:0
- >=dev-java/woodstox-core-6.2.7:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.0:0
-# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
-# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/jackson-module-jakarta-xmlbind:0
- dev-java/jaxb-api:3
- dev-java/sjsxp:0
- )
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( LICENSE README.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
- # Upstream: Tests run: 316, Failures: 0, Errors: 0, Skipped: 0
- # All the following are not run by upstream (mvn test).
- com.fasterxml.jackson.dataformat.xml.failing.ConflictingGetters27Test
- com.fasterxml.jackson.dataformat.xml.failing.ElementWrapperViaCreator149Test
- com.fasterxml.jackson.dataformat.xml.failing.EnumIssue9Test
- com.fasterxml.jackson.dataformat.xml.failing.Issue37AdapterTest
- com.fasterxml.jackson.dataformat.xml.failing.Issue491NoArgCtorDeserRegressionTest
- com.fasterxml.jackson.dataformat.xml.failing.PojoAsAttributeSer128Test
- com.fasterxml.jackson.dataformat.xml.failing.PolymorphicIssue4Test
- com.fasterxml.jackson.dataformat.xml.failing.PolymorphicList426Test
- com.fasterxml.jackson.dataformat.xml.failing.UntypedListSerialization8Test
- com.fasterxml.jackson.dataformat.xml.failing.UnwrappedAndList299DeserTest
- com.fasterxml.jackson.dataformat.xml.failing.VerifyRootLocalName247Test
- com.fasterxml.jackson.dataformat.xml.failing.XmlTextViaCreator306Test
- com.fasterxml.jackson.dataformat.xml.failing.XmlTextWithEmpty449Test
-)
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
- -e "s:@projectartifactid@:${PN}:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-}
-
-src_test() {
- # The same failure occurs upstream (running 'mvn test')
-
- # 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
- # com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
- # `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
- # java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge "17" ; then
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
- fi
-
- java-pkg-simple_src_test
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
index 96988a0eca88..c5854f85e438 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index c8abd1ab2a8f..d9b6c1b68b22 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,2 +1 @@
-DIST jackson-dataformat-yaml-2.13.0.tar.gz 3125487 BLAKE2B 84ad1a6c041df324be312161b944435063c11c4e572532d3b0a50a207ad4babff59d90aad112e9d46f2c35f6be4732e3e2d8426e42f3bccb1dfcbe4c083056b4 SHA512 9dc9a683f5cc943711221ac1a4ec862681ae49c8003f08a4a29f15ff77893de3936b37e28fadc433db5a9f498fb70c78eaa4dc0fc6b0875d773999c78f74365a
DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
deleted file mode 100644
index e90213a12e8c..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
-SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# org.yaml:snakeyaml:1.28 -> >=dev-java/snakeyaml-1.28:0
-
-CP_DEPEND="
- dev-java/jackson-core:0
- dev-java/jackson-databind:0
- dev-java/snakeyaml:0
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
- # Upstream doesn't run these tests and gets
- # »Tests run: 121, Failures: 0, Errors: 0, Skipped: 0«
- com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
- com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
- com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
-)
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
- -e "s:@projectartifactid@:${PN}:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
- # dev-java/snakeyaml-1.28-r1 does not provide module-info
- sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
index c444dc69b4f7..a324875e0e97 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index f778e1c9aa28..0af50bd9fe43 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,2 +1 @@
-DIST jackson-module-jakarta-xmlbind-2.13.0.tar.gz 1841327 BLAKE2B 41b4f92979274265901fb5facd16169ee38d792f8cbd38fbadecb7cd9cdc836b0b42b3cc5a7372af92c77cb5a08ac8d33a9c9c51b6e499ad3dbb8b1dc204a406 SHA512 6c076eaaf7713ed82d60bb48492747bcdd09d8eedf73aae521b446cc5944ce3c2d01ce942f00cab85a1139b5383afc78142aab32093fc9b8e8bf5b743534d2a4
DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
deleted file mode 100644
index e93391f95948..000000000000
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-xmlbind-annotations-2.13.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
-HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
-SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have jaxb-runtime:3.0.1
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
-# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-
-CP_DEPEND="
- dev-java/jackson-annotations:2
- dev-java/jackson-core:0
- dev-java/jackson-databind:0
- dev-java/jakarta-activation-api:1
- dev-java/jaxb-api:3
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
- -e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
-
- # This is an ugly hack, but ...
- # src/moditect/module-info.java:13: error: cannot find symbol
- # com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindModule;
- # ^
- # symbol: class JakartaXmlBindModule
- # location: package com.fasterxml.jackson.module.jakarta.xmlbind
- sed -e '/JakartaXmlBindModule/d' \
- -e '/provides/d' \
- -i src/moditect/module-info.java || die
-}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
index 642e074deac8..18d572895a82 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# We don't have jaxb-runtime:3.0.1
RESTRICT="test"
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 44283325ca8a..e211c0f48a5e 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -4,6 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.inject:javax.inject:1"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/javax-mail/javax-mail-1.6.7.ebuild b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
index 985b9effbf4a..7c3810d36d90 100644
--- a/dev-java/javax-mail/javax-mail-1.6.7.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
@@ -61,7 +61,7 @@ src_test() {
pushd src/test/java || die
# Selection according to 137,138 pom.xml
# 1) com.sun.mail.util.logging.MailHandlerTest
- # java.io.IOException: Permission denied
+ # java.io.IOException: Permission denied
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*TestSuite.java" -o -name "*Test.java" \
! -name "MailHandlerTest.java" \
diff --git a/dev-java/jython/jython-2.7.0-r5.ebuild b/dev-java/jython/jython-2.7.0-r5.ebuild
deleted file mode 100644
index b0257f478623..000000000000
--- a/dev-java/jython/jython-2.7.0-r5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:70
- dev-java/jnr-constants:0
- dev-java/jnr-posix:3.0
- dev-java/jnr-netdb:1.0
- dev-java/stringtemplate:0
- dev-java/xerces:2
- java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
- "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
- "${FILESDIR}"/${PN}-2.7_beta1-ant.patch
- "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
- "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
- "${FILESDIR}"/${PN}-2.7.0-build.xml.patch
- "${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
- default
-
- find \( -name '*.jar' -o -name '*.class' \
- -o -name '*.pyc' -o -name '*.exe' \) -delete
-
- # needed for launchertest
- chmod +x tests/shell/test-jython.sh || die
-
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- # apparently this can cause problems
- append-flags -fno-stack-protector
-
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local instdir=/usr/share/${PN}-${SLOT}
-
- java-pkg_newjar dist/${PN}-dev.jar
-
- java-pkg_register-optional-dependency jdbc-mysql
- java-pkg_register-optional-dependency jdbc-postgresql
-
- insinto ${instdir}
- doins -r dist/{Lib,registry}
-
- dodoc ACKNOWLEDGMENTS NEWS README.txt
-
- use doc && java-pkg_dohtml -r dist/Doc/javadoc
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples Demo/*
-
- local java_args=(
- -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
- -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
- -Dpython.cachedir="\${HOME}/.jythoncachedir"
- )
-
- java-pkg_dolauncher jython${SLOT} \
- --main org.python.util.jython \
- --java_args "${java_args[*]}"
-
- # we need a wrapper to help python_optimize
- cat <<-EOF > "${T}"/jython
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}${instdir}" \
- -Dpython.cachedir="${T}/.jythoncachedir" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
new file mode 100644
index 000000000000..7000a802e098
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
+
+inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="https://www.jython.org"
+SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:0
+ dev-java/jffi:1.2
+ dev-java/jline:2
+ dev-java/icu4j:70
+ dev-java/jnr-constants:0
+ dev-java/jnr-posix:3.0
+ dev-java/jnr-netdb:1.0
+ dev-java/stringtemplate:0
+ dev-java/xerces:2
+ java-virtuals/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to CDEPEND if you want either of them
+#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present"
+#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+ "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+ "${FILESDIR}"/${PN}-2.7_beta1-ant.patch
+ "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
+ "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+ "${FILESDIR}"/${PN}-2.7.0-build.xml.patch
+ "${FILESDIR}"/CVE-2016-4000.patch
+)
+
+src_prepare() {
+ default
+
+ find \( -name '*.jar' -o -name '*.class' \
+ -o -name '*.pyc' -o -name '*.exe' \) -delete
+
+ # needed for launchertest
+ chmod +x tests/shell/test-jython.sh || die
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=833785
+ sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
+ -i src/org/python/core/Py{,BaseCode,Unicode}.java || die
+
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ # apparently this can cause problems
+ append-flags -fno-stack-protector
+
+ EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local instdir=/usr/share/${PN}-${SLOT}
+
+ java-pkg_newjar dist/${PN}-dev.jar
+
+ java-pkg_register-optional-dependency jdbc-mysql
+ java-pkg_register-optional-dependency jdbc-postgresql
+
+ insinto ${instdir}
+ doins -r dist/{Lib,registry}
+
+ dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+ use doc && java-pkg_dohtml -r dist/Doc/javadoc
+ use source && java-pkg_dosrc src/*
+ use examples && java-pkg_doexamples Demo/*
+
+ local java_args=(
+ -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+ -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+ -Dpython.cachedir="\${HOME}/.jythoncachedir"
+ )
+
+ java-pkg_dolauncher jython${SLOT} \
+ --main org.python.util.jython \
+ --java_args "${java_args[*]}"
+
+ # we need a wrapper to help python_optimize
+ cat <<-EOF > "${T}"/jython
+ exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+ -Dpython.home="${ED}${instdir}" \
+ -Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
+ org.python.util.jython "\${@}"
+ EOF
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
index 2338b843a46c..7654edfce259 100644
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
@@ -56,7 +56,7 @@ CP_DEPEND="
# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
-# Restricting to jdk:1.8
+# Restricting to jdk:1.8
# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
# import sun.reflect.Reflection;
# ^
@@ -64,15 +64,15 @@ CP_DEPEND="
DEPEND="
virtual/jdk:1.8
${CP_DEPEND}"
-# test? (
-# dev-java/dom4j:1
-# dev-java/assertj-core:2
-# dev-java/log4j-12-api:2
-# dev-java/logback-core:0
-# dev-java/mockito:4
-# dev-java/slf4j-api:0
-# dev-java/slf4j-ext:0
-# )
+# test? (
+# dev-java/dom4j:1
+# dev-java/assertj-core:2
+# dev-java/log4j-12-api:2
+# dev-java/logback-core:0
+# dev-java/mockito:4
+# dev-java/slf4j-api:0
+# dev-java/slf4j-ext:0
+# )
# "
RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
index fced31b2be32..5ccace8029b9 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
VERSION="Eclipse Temurin JRE ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
PATH="\${JAVA_HOME}/bin"
ROOTPATH="\${JAVA_HOME}/bin"
LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +11,4 @@ PROVIDES_TYPE="JRE"
PROVIDES_VERSION="${SLOT}"
BOOTCLASSPATH=""
GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
similarity index 100%
rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r2.ebuild
similarity index 100%
rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r2.ebuild
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index acbb09778fb2..044d1859d98a 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tag
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
index 80a8dbc84563..9a17b45ad4a3 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index a4c33c19b816..9fabc3068f10 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,2 +1 @@
-DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
deleted file mode 100644
index fe903380fd61..000000000000
--- a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-index e87f330..28c836b 100644
---- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-+++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-@@ -69,7 +69,8 @@ public class BillionLaughsAttackTest {
- map.toString();
- fail("Expected overflow");
- } catch (Throwable e) {
-- assertTrue(e.getMessage().contains("heap"));
-+ final String message = e.getMessage();
-+ assertTrue(message == null || message.contains("heap"));
- }
- }
-
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
deleted file mode 100644
index 771b05ba5ef1..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild snakeyaml-1.28-r1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.yaml:snakeyaml:1.28"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_COMMIT="b28f0b4d87c6"
-MY_P="asomov-snakeyaml-${MY_COMMIT}"
-
-DESCRIPTION="YAML 1.1 parser and emitter for Java"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1
-# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4
-# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/commons-io-2.4:1
- dev-java/commons-lang:3.6
- >=dev-java/joda-time-2.10.10:0
- >=dev-java/velocity-1.7:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-test-check.patch"
-)
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- "examples.spring.TestEntityDescription" # Invalid test class
- "org.yaml.snakeyaml.constructor.TestBean1" # Invalid test class
- "org.yaml.snakeyaml.introspector.TestAnnotation" # Invalid test class
- "org.yaml.snakeyaml.introspector.TestBean" # Invalid test class
- "org.yaml.snakeyaml.ruby.TestObject" # Invalid test class
- "org.yaml.snakeyaml.issues.issue154.TestBean" # Invalid test class
- "org.yaml.snakeyaml.issues.issue193.TestYaml" # Invalid test class
-
- # initializationError(org.yaml.snakeyaml.constructor.TestBean)
- # java.lang.IllegalArgumentException: Test class can only have one constructor
- "org.yaml.snakeyaml.constructor.TestBean"
-
- # testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest)
- # java.lang.NullPointerException
- "org.yaml.snakeyaml.emitter.template.VelocityTest"
-
- # yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
- # java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
- "org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest"
-
- "examples.spring.TestEntity" # Invalid test class
-
- "org.pyyaml.PyImportTest" # No tests found in org.pyyaml.PyImportTest
-)
-
-src_prepare() {
- default
- java-utils-2_src_prepare
-}
-
-src_test() {
- export EnvironmentKey1="EnvironmentValue1"
- export EnvironmentEmpty=""
- java-pkg-simple_src_test
-}
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
index 6ae8d5e2d63e..9ec4118119dc 100644
--- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index bd444c50c38a..f0ae34d1ef9e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,2 +1 @@
-DIST tomcat-native-1.2.31-src.tar.gz 428057 BLAKE2B 9e76c2c4c6e3721c36331f21026c00dda40e811ed34b6deb024f3511159c96ec624131aa3d9e0cc26fb97286bd9f0133d03d742fa5616d05ed18ecacb05d3d51 SHA512 2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild
deleted file mode 100644
index fd32b6403ca4..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
- dev-libs/openssl:0=
- >=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
-
- cd native || die
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- eant jar
-
- cd native || die
- default
-}
-
-src_install() {
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
- cd native || die
- default
-
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
index 1d527ab32b16..39a5c2b3e960 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs test"
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 4221e170cbc0..8d626a41d89c 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -5,4 +5,7 @@
java@gentoo.org
Java
+
+ eclipse-ee4j/beanvalidation-api
+
diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
index d7887694dca4..316ac36886b4 100644
--- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
index 25f7a00c3bf0..1f63794e937b 100644
--- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
index 6021501589e0..4dcc12913cbb 100644
--- a/dev-java/xmlgraphics-commons/metadata.xml
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -1,8 +1,11 @@
-
- java@gentoo.org
- Java
-
+
+ java@gentoo.org
+ Java
+
+
+ apache/xmlgraphics-commons
+
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
new file mode 100644
index 000000000000..2bc679b79fbe
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.7-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.11.0:1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.28.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/mockito:4
+ dev-java/xml-commons-resolver:0
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# There are test failures, bug #832058
+JAVA_TEST_EXCLUDES=(
+ "org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoderTestCase"
+ "org.apache.xmlgraphics.image.loader.impl.ImageLoaderImageIOTestCase"
+ "org.apache.xmlgraphics.io.XmlSourceUtilTestCase"
+ "org.apache.xmlgraphics.ps.dsc.ListenerTestCase"
+ "org.apache.xmlgraphics.xmp.XMPParserTestCase"
+)
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ba942dbcebc3..ef3cde5a5edb 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 318e44303475..18941e5a07b9 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,9 +1,3 @@
-DIST crystal-1.1.0-1-linux-i686.tar.gz 30747190 BLAKE2B 7fe29248ae69c81cb0c79419488c5b544bb55810894ac1d7f276ccdf2d2d98c7c2bc4f8c007214e5ffd18ee39bdf6983f33b13c08f012105fce714eeaa18fac9 SHA512 df267250971c11d1e2f4f869a14f7b2f1e5a32cf15c407a0ee9291aeb4ddc21241c3f21c7706ee2305dfbf4ac645681a06bb70a6ee9246968a30f59b7595ea8a
-DIST crystal-1.1.0-1-linux-x86_64.tar.gz 27998777 BLAKE2B 06be8a51b28266b25f1a3629b1a1ac6f3878aacdd4ca4019ac201369ca0507f3ed27bfea46ea7d8d4dfa67888268a8e027586bb32e9964d4754661f43e36ac12 SHA512 8c4542ce0623e459b61591b7bd13f416ee30c89913ce827830e570225c72ec79ad5466d414b05f520d384f04363f11964ff8bf158f0ae798da3864208655319e
-DIST crystal-1.1.0.tar.gz 2476748 BLAKE2B 2874da651a8b4454c6a34b00ac4ef93be6beaabe01ff66aaac86583a9d9c1baccde9473358d70d78490b367db3a307af3b5219af6751c1d83cb5084e74955197 SHA512 fcd14338c4c6cb9189cfb9d4d93af7feab806a49e10b9c83399f9252f0c5f3488605141f09adef82d48343eab5653b754b9196fb659590df8d4deb2c4b6499f4
-DIST crystal-1.1.1-1-linux-i686.tar.gz 30749110 BLAKE2B d79113bc616685b30a80bb8632593c1b0a24d770ee9fa50810e771996f9ca95cdb5cdab64a7c445bc461e27e77e457b8334877e3a62281a3f9cbe59975518eae SHA512 eecd485fe06642a534aee2f837ac9ad6eeb5b52fa5fb4ab0f36bcf167535b784b5e306c0bb578a3198b58552efd3f0afc356b2711b0b7dc00f25fb1a2f4fe43f
-DIST crystal-1.1.1-1-linux-x86_64.tar.gz 27999355 BLAKE2B 115d9002973d9e0e1ad2edac55a10d4275176f95352634eee00f29d6ebeef2e3538f30a26904a1c6b68fa5b42e70b4cf54bb50ed4aa1097bb2d2dc716ff83427 SHA512 f27277af810f295c8ee4f5fedc3b7f1ffb06d166970fcc25d2de43e1c41e0af01de2a508292b44aac48a1583ac9892058f54fa3a7c361fc56dd483265f8bc36c
-DIST crystal-1.1.1.tar.gz 2477825 BLAKE2B 4e1b06c831a22447a4d1f065be64b12642ee4b4a75f24b0b73b990944afe6e2a6fca95189b46ea0656b8d13bd7c6a83a23452779b494822803a0264e02b9d4ce SHA512 6e9e977792c863d17ae94aa285a65a453da581a71c3fd9c57cc606ae20813504d675faffa74f78e7c4cf863b6334c4a63ab5356c04fb11d3267dd516e060fe74
DIST crystal-1.2.1-1-linux-x86_64.tar.gz 28586682 BLAKE2B 4d7847cdc6263c369de0926055569986cece1302d2251e4b2d25308609e45c0aa3afe7cdfecba3b7909d7568b1e81aafe69f9976a90c8980684a92231cc3857c SHA512 23cfb2389c65202dc70ebadb85cf0390ba2366520fbfd4b7bb0683c5194cd2b5c87b6b4142dd251471ec4146a5c1046ec86bcafa50c66389a41c9cb394ee6f5d
DIST crystal-1.2.1.tar.gz 2618956 BLAKE2B e9ffd8b9114af419ee433093066dcf69f86e2f3293a6eeafee20f00c982dcd78774b3faf64d1e2568ba3141e24ef751cb2b5e0b2a2c57dac92d0039e6e224971 SHA512 a6acfac36a8a0d93e39947f2e35238f9cfc43485994fd6caf102f1d62ebc4d71d13d96801e998dbbff9541b76a8eb4fade7b998b179807ed49c1c338207a4720
DIST crystal-1.2.2-1-linux-x86_64.tar.gz 28611412 BLAKE2B 95593120b00b09b0a250917cbfd0841a77ead5e768ad483a900452678be5b231408017c4ac668df4de675612a008a385ed0dbf6ea216aec0343f8b5e8ede3e98 SHA512 7fdb247074723f52f8dfb9d2e18eef1ceb6fcf595bd12ec7304eb292716c4462ee34d2d87eac56302053dd4d8cd2beccde3dc5bfa3c75e6e832813afecfadcde
diff --git a/dev-lang/crystal/crystal-1.1.0.ebuild b/dev-lang/crystal/crystal-1.1.0.ebuild
deleted file mode 100644
index a435a4600025..000000000000
--- a/dev-lang/crystal/crystal-1.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
- amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
- x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-RESTRICT=test # not stable for day-to-day runs
-
-LLVM_MAX_SLOT=11
-
-DEPEND="
- sys-devel/llvm:${LLVM_MAX_SLOT}
- dev-libs/boehm-gc[static-libs,threads]
- dev-libs/libatomic_ops
- dev-libs/libevent
- dev-libs/libpcre
- sys-libs/libunwind
- dev-libs/pcl
- dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
- xml? ( dev-libs/libxml2 )
- yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.0-verbose.patch
- "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
- "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
- #"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
- "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
- "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_prepare() {
- default
-
- use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
- local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
- if [[ ! -d ${bootstrap_path} ]]; then
- eerror "Binary tarball does not contain expected directory:"
- die "'${bootstrap_path}' path does not exist."
- fi
-
- # crystal uses 'LLVM_TARGETS' to override default list of targets
- unset LLVM_TARGETS
- emake \
- $(usex debug "" release=1) \
- progress=true \
- stats=1 \
- threads=$(makeopts_jobs) \
- verbose=1 \
- \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
- \
- PATH="${bootstrap_path}:${PATH}" \
- CRYSTAL_PATH=src \
- CRYSTAL_CONFIG_VERSION=${PV} \
- CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
- use doc && emake docs
-}
-
-src_test() {
- # EXTRA_SPEC_FLAGS is useful to debug individual tests
- # as part of full build:
- # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
- emake spec \
- $(usex debug "" release=1) \
- progress=true \
- stats=1 \
- threads=$(makeopts_jobs) \
- verbose=1 \
- \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
- AR=$(tc-getAR) \
- LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
- \
- CRYSTAL_PATH=src \
- CRYSTAL_CONFIG_VERSION=${PV} \
- \
- "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/crystal
- doins -r src/.
- dobin .build/crystal
-
- insinto /usr/share/zsh/site-functions
- newins etc/completion.zsh _crystal
-
- use examples && dodoc -r samples
-
- if use doc ; then
- docinto api
- dodoc -r docs/.
- fi
-
- newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-1.1.1.ebuild b/dev-lang/crystal/crystal-1.1.1.ebuild
deleted file mode 100644
index f21d7749e7a5..000000000000
--- a/dev-lang/crystal/crystal-1.1.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
- amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
- x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug"
-
-# Upstream test suite not reliable
-RESTRICT=test
-
-# See https://github.com/crystal-lang/crystal/issues/10434
-LLVM_MAX_SLOT=11
-
-DEPEND="
- dev-libs/boehm-gc[static-libs,threads]
- dev-libs/gmp:=
- dev-libs/libatomic_ops
- dev-libs/libevent
- dev-libs/libpcre
- dev-libs/pcl:=
- sys-devel/llvm:${LLVM_MAX_SLOT}
- sys-libs/libunwind:=
-"
-RDEPEND="${DEPEND}
- dev-libs/libxml2
- dev-libs/libyaml
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.0-verbose.patch
- "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
- "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
- "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
- "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_configure() {
- local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
- if [[ ! -d ${bootstrap_path} ]]; then
- eerror "Binary tarball does not contain expected directory:"
- die "'${bootstrap_path}' path does not exist."
- fi
-
- MY_EMAKE_COMMON_ARGS=(
- $(usex debug "" release=1)
- progress=true
- stats=1
- threads=$(makeopts_jobs)
- verbose=1
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- AR="$(tc-getAR)"
- LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
- PATH="${bootstrap_path}:${PATH}"
- CRYSTAL_PATH=src
- CRYSTAL_CONFIG_VERSION=${PV}
- CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
- )
-
- # crystal uses 'LLVM_TARGETS' to override default list of targets
- unset LLVM_TARGETS
-}
-
-src_compile() {
- emake "${MY_EMAKE_COMMON_ARGS[@]}"
- use doc && emake docs
-}
-
-src_test() {
- # EXTRA_SPEC_FLAGS is useful to debug individual tests
- # as part of full build:
- # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
- emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/crystal
- doins -r src/.
- dobin .build/crystal
-
- insinto /usr/share/zsh/site-functions
- newins etc/completion.zsh _crystal
-
- dodoc -r samples
-
- if use doc ; then
- docinto api
- dodoc -r docs/.
- fi
-
- newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
deleted file mode 100644
index 07b7dba7be65..000000000000
--- a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Workaround tty corruption in crystal.
-
-Patch restores blocking mode of file desriptors
-in exchange of potential runtime deadlocks
-when dealing with stdio.
-
-Reported-by: Renich Bon Ciric
-Bug: https://github.com/crystal-lang/crystal/issues/2065
-Bug: https://bugs.gentoo.org/616256
-diff --git a/src/compiler/crystal/stdio.cr b/src/compiler/crystal/stdio.cr
-new file mode 100644
-index 000000000..e65f65089
---- /dev/null
-+++ b/src/compiler/crystal/stdio.cr
-@@ -0,0 +1,5 @@
-+module Crystal
-+ STDIN.blocking = true
-+ STDOUT.blocking=true
-+ STDERR.blocking = true
-+end
diff --git a/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch b/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch
deleted file mode 100644
index d78927ab3eef..000000000000
--- a/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/spec/std/http/cookie_spec.cr
-+++ b/spec/std/http/cookie_spec.cr
-@@ -150,7 +150,10 @@ module HTTP
- parse_set_cookie("a=1; domain=127.0.0.1; path=/; HttpOnly").domain.should eq "127.0.0.1"
- end
-
-- it "parse max-age as seconds from Time.now" do
-+ # unstable test: sometimes 'now - max-age=0' == 0.0:
-+ # Failure/Error: delta.should be > 0.seconds
-+ # Expected 00:00:00 to be > 00:00:00
-+ pending "parse max-age as seconds from Time.now" do
- cookie = parse_set_cookie("a=1; max-age=10")
- delta = cookie.expires.not_nil! - Time.now
- delta.should be > 9.seconds
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 233928bcc797..456e61401b3b 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -18,17 +18,6 @@
Build each module as a separate object file. Speeds build up.
-
- Keep STDIO file descriptors in blocking mode.
-
-
- Use the dev-libs/libyaml library to enable Crystal yaml
- module
-
-
- Use the dev-libs/libxml2 library to enable Crystal xml
- module
-
crystal-lang/crystal
diff --git a/dev-lang/duktape/duktape-2.7.0-r1.ebuild b/dev-lang/duktape/duktape-2.7.0-r1.ebuild
index 13df504195a9..5c2a21508937 100644
--- a/dev-lang/duktape/duktape-2.7.0-r1.ebuild
+++ b/dev-lang/duktape/duktape-2.7.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
# Upstream don't maintain binary compatibility
# https://github.com/svaarala/duktape/issues/1524
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
PATCHES=(
"${FILESDIR}"/${PN}-2.7.0-respect-tc-env.patch
diff --git a/dev-lang/go/go-1.17.9.ebuild b/dev-lang/go/go-1.17.9.ebuild
index 73fdd77a73dd..ba82adbb2e5d 100644
--- a/dev-lang/go/go-1.17.9.ebuild
+++ b/dev-lang/go/go-1.17.9.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
;;
esac
esac
diff --git a/dev-lang/ispc/ispc-1.17.0-r1.ebuild b/dev-lang/ispc/ispc-1.17.0-r1.ebuild
index 1856351fc963..1aa1bd3661c7 100644
--- a/dev-lang/ispc/ispc-1.17.0-r1.ebuild
+++ b/dev-lang/ispc/ispc-1.17.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ispc/ispc.git"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
LICENSE="BSD BSD-2 UoI-NCSA"
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 399954d47d5e..3f0db07ad736 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,9 +1,5 @@
-DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
-DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
-DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
-DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
diff --git a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
deleted file mode 100644
index 1d184c3dbb54..000000000000
--- a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-index a7ca666b23..b84a42f4e7 100644
---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-@@ -31,9 +31,9 @@ elseif Sys.isapple()
- const libmbedtls = "@rpath/libmbedtls.13.dylib"
- const libmbedx509 = "@rpath/libmbedx509.1.dylib"
- else
-- const libmbedcrypto = "libmbedcrypto.so.5"
-- const libmbedtls = "libmbedtls.so.13"
-- const libmbedx509 = "libmbedx509.so.1"
-+ const libmbedcrypto = "libmbedcrypto.so"
-+ const libmbedtls = "libmbedtls.so"
-+ const libmbedx509 = "libmbedx509.so"
- end
-
- function __init__()
-diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-index fa45e754e5..b51812e3a8 100644
---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libLLVM = "@rpath/libLLVM.dylib"
- else
-- const libLLVM = "libLLVM-11jl.so"
-+ const libLLVM = "libLLVM.so"
- end
-
- function __init__()
-diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-index 8b98c76ac5..77ad9e3800 100644
---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libnghttp2 = "@rpath/libnghttp2.14.dylib"
- else
-- const libnghttp2 = "libnghttp2.so.14"
-+ const libnghttp2 = "libnghttp2.so"
- end
-
- function __init__()
diff --git a/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch b/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch
deleted file mode 100644
index 3e3146529aea..000000000000
--- a/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/JuliaLang/julia/commit/09a49c6b57fbde109f0f0c2aa9aa05cef2c1dd40
-https://bugs.gentoo.org/824486
-
-From: t-bltg <13423344+t-bltg@users.noreply.github.com>
-Date: Thu, 12 Aug 2021 21:36:18 +0200
-Subject: [PATCH] MINSIGSTKSZ is no longer constant in glibc (#41860)
-
-MINSIGSTKSZ is redefined to sysconf(_SC_MINSIGSTKSZ) starting from glibc 2.34
-
-Co-authored-by: t-bltg
-(cherry picked from commit f19b9a20dde2688c642b7dd709b5d9446e4df2f6)
---- a/src/task.c
-+++ b/src/task.c
-@@ -29,6 +29,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include "julia.h"
-@@ -75,8 +76,8 @@ static inline void tsan_switch_to_ctx(jl_ucontext_t *ctx) {}
-
- // empirically, jl_finish_task needs about 64k stack space to infer/run
- // and additionally, gc-stack reserves 64k for the guard pages
--#if defined(MINSIGSTKSZ) && MINSIGSTKSZ > 131072
--#define MINSTKSZ MINSIGSTKSZ
-+#if defined(MINSIGSTKSZ)
-+#define MINSTKSZ (MINSIGSTKSZ > 131072 ? MINSIGSTKSZ : 131072)
- #else
- #define MINSTKSZ 131072
- #endif
diff --git a/dev-lang/julia/julia-1.6.3.ebuild b/dev-lang/julia/julia-1.6.3.ebuild
deleted file mode 100644
index 096876a7c5a3..000000000000
--- a/dev-lang/julia/julia-1.6.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_LLVM_V="11.0.1"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}.tar.gz
- https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
- https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
- !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=11
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- dev-libs/libutf8proc:0=[-cjk]
- dev-util/patchelf
- >=net-libs/mbedtls-2.2
- net-misc/curl[http2,ssh]
- sci-libs/amd:0=
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/fftw:3.0=[threads]
- sci-libs/openlibm:0=
- sci-libs/spqr:0=
- sci-libs/umfpack:0=
- >=sci-mathematics/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.6.0-fix-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.6.3-glibc-2.34.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- mkdir -p "${S}/deps/srccache/"
- for i in "${tounpack[@]:1}"; do
- cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
- done
-}
-
-src_prepare() {
- default
-
- # Sledgehammer:
- # - prevent fetching of bundled stuff in compile and install phase
- # - respect CFLAGS
- # - respect EPREFIX and Gentoo specific paths
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || die
-
- sed -i \
- -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
- src/Makefile || die
-
- # disable doc install starting git fetching
- sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_SUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- dodoc README.md
-
- mv "${ED}"/usr/etc/julia "${ED}"/etc || die
- rmdir "${ED}"/usr/etc || die
- mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
- rmdir "${ED}"/usr/share/doc/julia || die
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/mmix/mmix-20160804-r1.ebuild b/dev-lang/mmix/mmix-20160804-r1.ebuild
index 620b0c7c3b42..174120e453df 100644
--- a/dev-lang/mmix/mmix-20160804-r1.ebuild
+++ b/dev-lang/mmix/mmix-20160804-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ DEPEND="virtual/tex-base
RDEPEND="!!media-sound/mmix"
SLOT="0"
-LICENSE="${PN}"
+LICENSE="mmix"
KEYWORDS="amd64 x86"
IUSE="doc"
diff --git a/dev-lang/perl/perl-5.34.1-r3.ebuild b/dev-lang/perl/perl-5.34.1-r3.ebuild
index d08da268022a..7bd25bfbccab 100644
--- a/dev-lang/perl/perl-5.34.1-r3.ebuild
+++ b/dev-lang/perl/perl-5.34.1-r3.ebuild
@@ -58,7 +58,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0/${SUBSLOT}"
if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
index 24af3f9bf9b9..4ffdc9faba31 100644
--- a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
+++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
diff --git a/dev-lang/python-exec/python-exec-2.4.8.ebuild b/dev-lang/python-exec/python-exec-2.4.8.ebuild
index 39e408c14896..7cab7a668f31 100644
--- a/dev-lang/python-exec/python-exec-2.4.8.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.10.4.ebuild b/dev-lang/python/python-3.10.4.ebuild
index 18b78c7b7c5b..bbf92b40ec2a 100644
--- a/dev-lang/python/python-3.10.4.ebuild
+++ b/dev-lang/python/python-3.10.4.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.9.12.ebuild b/dev-lang/python/python-3.9.12.ebuild
index 615a54229b69..18ca64646202 100644
--- a/dev-lang/python/python-3.9.12.ebuild
+++ b/dev-lang/python/python-3.9.12.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/rust-bin/rust-bin-1.60.0.ebuild b/dev-lang/rust-bin/rust-bin-1.60.0.ebuild
index d16a36720206..2a9410605bdf 100644
--- a/dev-lang/rust-bin/rust-bin-1.60.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.60.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
DEPEND=""
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
index 7e2de60b12fb..9ea95562915c 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
LICENSE="NPL-1.1"
SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos"
IUSE="debug minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
index 57b7d6d43d40..cc7d2687a38f 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
LICENSE="NPL-1.1"
SLOT="60"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="debug +jit minimal +system-icu test"
# Disable tests:
diff --git a/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild
index 196bc4fe1f7e..a836814ad075 100644
--- a/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild
@@ -51,7 +51,7 @@ DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
# riscv support requires a patch currently only available in firefox-78 patch sets
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv sparc x86"
SLOT="68"
LICENSE="MPL-2.0"
diff --git a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
index 15522077311b..5e0feaa53795 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -61,7 +61,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv x86"
SLOT="78"
LICENSE="MPL-2.0"
diff --git a/dev-lang/spidermonkey/spidermonkey-91.8.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.8.0.ebuild
index 06804b5f0c08..2b6274d3f894 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.8.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.8.0.ebuild
@@ -61,7 +61,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
SLOT="91"
LICENSE="MPL-2.0"
diff --git a/dev-lang/tcl/tcl-8.6.12.ebuild b/dev-lang/tcl/tcl-8.6.12.ebuild
index 25b370012e74..b60370207a31 100644
--- a/dev-lang/tcl/tcl-8.6.12.ebuild
+++ b/dev-lang/tcl/tcl-8.6.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-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 ~loong ~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="debug +threads"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 085eb4e625b1..ec9af6e3d95e 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -2,3 +2,4 @@ DIST vala-0.50.10.tar.xz 3547792 BLAKE2B 80e57b0fa5fdec2e3403878db1d5c83f4fd1455
DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
DIST vala-0.54.7.tar.xz 3916868 BLAKE2B 0e9f1e20f7f2dc2e1b024baba6e64e9d192de7d9978c6f9b2ed37e5fff9e95e31718e7a44761c98e8fe2aa790e9464259df004610d4cf863ef39afe45cedd37d SHA512 7d3345984c496e9fe6324fea6c4fd8d2887102b271d825740b0f5812538dbdabe9c88ec4022d25c34121df686200cce48d4678ec6a00b2a002b9e74242475440
DIST vala-0.56.0.tar.xz 3958820 BLAKE2B dc4ac5ad65fd2650eb2ecf1cc8e7ed177a64ae7d93120793941760417b6d8d5992cef1a557a7de3f39cf1e646d00fa853ccfac7414c742d9cfcf313945cbd356 SHA512 dfaad6fc143835d601c586b270e7ee63309341fb9b7f023541bac75e96759d0eb9c563c67aa26acdcd1fb89a4a08759107f8a6c8e887f7d402fa2aa50a2e4038
+DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b19608651843c32c84ca6901a22971a2128a85a1e1e110d0b7d14cb89d4164688c289090a4299bb11540180548cf7 SHA512 83c34ab0497a9b7a627db8c1dbfea9e76c94b902e298afb2c30ba9824717f2fe3b0e26b987feb93cd4ff0ce211d0ecd9a746cc18c00e41c4c6fd01d05947902f
diff --git a/dev-lang/vala/vala-0.56.1.ebuild b/dev-lang/vala/vala-0.56.1.ebuild
new file mode 100644
index 000000000000..c0e5551a7eb6
--- /dev/null
+++ b/dev-lang/vala/vala-0.56.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.56"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.48.0:2
+ >=dev-libs/vala-common-${PV}
+ valadoc? ( >=media-gfx/graphviz-2.16 )
+ != it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2
+ dev-libs/gobject-introspection
+ )
+"
+BDEPEND="
+ dev-libs/libxslt
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+"
+
+src_configure() {
+ # weasyprint enables generation of PDF from HTML
+ gnome2_src_configure \
+ --disable-unversioned \
+ $(use_enable valadoc) \
+ VALAC=: \
+ WEASYPRINT=:
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 88e8e41671c9..0eba640fbf00 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boxfort/boxfort-0.1.4.ebuild b/dev-libs/boxfort/boxfort-0.1.4.ebuild
index c1d27a92948b..d6bd3e0ce457 100644
--- a/dev-libs/boxfort/boxfort-0.1.4.ebuild
+++ b/dev-libs/boxfort/boxfort-0.1.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/BoxFort-${PV}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 -riscv -s390 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/cJSON/cJSON-1.7.15.ebuild b/dev-libs/cJSON/cJSON-1.7.15.ebuild
index c9555ca553bf..495764e4b1bd 100644
--- a/dev-libs/cJSON/cJSON-1.7.15.ebuild
+++ b/dev-libs/cJSON/cJSON-1.7.15.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
-DESCRIPTION=" Ultralightweight JSON parser in ANSI C"
+DESCRIPTION="Ultralightweight JSON parser in ANSI C"
HOMEPAGE="https://github.com/DaveGamble/cJSON"
SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 90b32128accd..b6fb009623c3 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
diff --git a/dev-libs/capstone/capstone-5.0_rc2.ebuild b/dev-libs/capstone/capstone-5.0_rc2.ebuild
new file mode 100644
index 000000000000..f54ab3111868
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0_rc2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+ local phase=$1
+ shift
+
+ if use python; then
+ pushd bindings/python >/dev/null || die
+ echo distutils-r1_${phase} "$@"
+ pwd
+ distutils-r1_${phase} "$@"
+ popd >/dev/null
+ fi
+}
+
+src_prepare() {
+ tc-export RANLIB
+ cmake_src_prepare
+
+ wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCAPSTONE_BUILD_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+
+ wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+ cmake_src_compile
+
+ wrap_python ${FUNCNAME}
+}
+
+src_test() {
+ cmake_src_test
+
+ wrap_python ${FUNCNAME}
+}
+
+src_install() {
+ cmake_src_install
+
+ wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
index 34d3866444dc..6194c61cc422 100644
--- a/dev-libs/capstone/metadata.xml
+++ b/dev-libs/capstone/metadata.xml
@@ -1,8 +1,15 @@
-
+
+ mario.haustein@hrz.tu-chemnitz.de
+ Mario Haustein
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
- aquynh/capstone
+ capstone-engine/capstone
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 0de2b299de60..0e61d579b4c1 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,3 +1,2 @@
DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797
-DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r7.ebuild
deleted file mode 100644
index cd797a5afd90..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r7.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
-
-SASLAUTHD_CONF_VER="2.1.26"
-MY_PATCH_VER="${PN}-2.1.27-r6-patches"
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.bz2"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
-
-CDEPEND="
- net-mail/mailbase
- virtual/libcrypt:=
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
- mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
- pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
- ssl? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jdk-1.6:= )"
-
-REQUIRED_USE="ldapdb? ( openldap )"
-
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sasl )"
-
-DEPEND="${CDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/sasl/md5global.h
-)
-
-PATCHES=(
- "${WORKDIR}"/${MY_PATCH_VER}/
-)
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.ac || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- # #486740 #468556
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- configure.ac || die
-
- eautoreconf
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # getpassphrase is defined in /usr/include/stdlib.h
- append-cppflags -DHAVE_GETPASSPHRASE
- else
- # this horrendously breaks things on Solaris
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
- # replaces BSD_SOURCE (bug #579218)
- append-cppflags -D_DEFAULT_SOURCE
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Java support
- multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myeconfargs=(
- --enable-login
- --enable-ntlm
- --enable-auth-sasldb
- --disable-cmulocal
- --disable-krb4
- --disable-macos-framework
- --enable-otp
- --without-sqlite
- --with-saslauthd="${EPREFIX}"/run/saslauthd
- --with-pwcheck="${EPREFIX}"/run/saslauthd
- --with-configdir="${EPREFIX}"/etc/sasl2
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
- --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
- --with-sphinx-build=no
- $(use_with ssl openssl)
- $(use_with pam)
- $(use_with openldap ldap)
- $(use_enable ldapdb)
- $(multilib_native_use_enable sample)
- $(use_enable kerberos gssapi)
- $(multilib_native_use_enable java)
- $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
- $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
- $(use_enable srp)
- $(use_enable static-libs static)
-
- # Add authdaemond support (bug #56523).
- $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
- # Fix for bug #59634.
- $(usex ssl '' --without-des)
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- $(usex urandom --with-devrandom=/dev/urandom '')
- )
-
- if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
- myeconfargs+=( --enable-sql )
- else
- myeconfargs+=( --disable-sql )
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myeconfargs+=( --with-dblib=gdbm )
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myeconfargs+=(
- --with-dblib=berkeley
- --with-bdb-incdir="$(db_includedir)"
- )
- else
- einfo "Building without SASLdb support"
- myeconfargs+=( --with-dblib=none )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- if multilib_is_native_abi && use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- if use sample ; then
- docinto sample
- dodoc "${S}"/sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
- # hackish, don't wanna dig through makefile
- rm -rf "${ED}/usr/$(get_libdir)/java" || die
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- dosbin saslauthd/testsaslauthd
- fi
-}
-
-multilib_src_install_all() {
- doman man/*
-
- keepdir /etc/sasl2
-
- # Reset docinto to default value (#674296)
- docinto
- dodoc AUTHORS ChangeLog doc/legacy/TODO
- newdoc pwcheck/README README.pwcheck
-
- newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
- edos2unix "${ED}/usr/share/doc/${PF}/release-notes"
-
- docinto html
- dodoc doc/html/*.html
-
- if use pam; then
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
- fi
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- dotmpfiles "${FILESDIR}/${PN}.conf"
-
- # The get_modname bit is important: do not remove the .la files on
- # platforms where the lib isn't called .so for cyrus searches the .la to
- # figure out what the name is supposed to be instead
- if ! use static-libs && [[ $(get_modname) == .so ]] ; then
- find "${ED}" -name "*.la" -delete || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
index 9bfbd7ab2cb4..c1dd8766153e 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE
LICENSE="BSD-with-attribution"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~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 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
REQUIRED_USE="ldapdb? ( openldap )"
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 6af4e92e7b9e..694bc5af889e 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,3 +2,6 @@ DIST elfutils-0.185-patches.tar.gz 7625 BLAKE2B 92aff147aa7e45976863e8129e25ecad
DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
DIST elfutils-0.186-patches.tar.gz 3323 BLAKE2B 360365597d3a08d6f4fe843d04bcddd07a44ca93dae2034615abc450517e1be21c81a55aa379c409902e134ae795b38bb7461c65cdba3934ac7ef1e4e0e53091 SHA512 e2d427be505fdc416751a1fbc3bb4f39577859d94ce43990faa83c135fe36be2ddb3a2ef0f1020cfa37060e6d43dc7b8cf3db0d07d62b31bf29cb9a4a5945ce1
DIST elfutils-0.186.tar.bz2 9230491 BLAKE2B 49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9 SHA512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78
+DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4
+DIST elfutils-0.187.tar.bz2 9240221 BLAKE2B 00ba3efa689d137808f5f53ecda93fd006be0c18d690ce76616ed1dba442281098579fa4b9a9e91b8ba865a3de15968f0ae06703a7b50b15c48a4beb5c970a46 SHA512 a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874
+DIST elfutils-0.187.tar.bz2.sig 310 BLAKE2B b23f656de269030cc3dd518a008e22e22726138a3bd619ad269166d3b9fac4b1064d98c81a02fcc6250ca1a996cc3e81322b50e7692fe23cbee92e2908f0300d SHA512 2619d8d537364386491d5e54f2add7ffa5bab21cd19c94a29249f2d9c5cc5dac53e2031a5515268ddeee4799b71115a5d98bdbcafd361aa75bcc13a1d9b70b14
diff --git a/dev-libs/elfutils/elfutils-0.187.ebuild b/dev-libs/elfutils/elfutils-0.187.ebuild
new file mode 100644
index 000000000000..23c69cc95c48
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.187.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2003-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
+inherit flag-o-matic multilib-minimal verify-sig
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+ elibc_musl? (
+ dev-libs/libbsd
+ sys-libs/argp-standalone
+ sys-libs/fts-standalone
+ sys-libs/obstack-standalone
+ )
+ !dev-libs/libelf"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )"
+BDEPEND=">=sys-devel/flex-2.5.4a
+ sys-devel/m4
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-elfutils )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-0.187-patches/
+)
+
+src_unpack() {
+ if use verify-sig ; then
+ # Needed for downloaded patch (which is unsigned, which is fine)
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ if use elibc_musl; then
+ eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
+ fi
+
+ if ! use static-libs; then
+ sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+ fi
+
+ # https://sourceware.org/PR23914
+ sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+ # bug #407135
+ use test && append-flags -g
+
+ # Symbol aliases are implemented as asm statements.
+ # Will require porting: https://gcc.gnu.org/PR48200
+ filter-flags '-flto*'
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Valgrind option is just for running tests under it; dodgy under sandbox
+ # and indeed even w/ glibc with newer instructions.
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable nls) \
+ $(use_enable threads thread-safety) \
+ --disable-debuginfod \
+ --disable-libdebuginfod \
+ --disable-valgrind \
+ --program-prefix="eu-" \
+ --with-zlib \
+ $(use_with bzip2 bzlib) \
+ $(use_with lzma) \
+ $(use_with zstd)
+}
+
+multilib_src_test() {
+ env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+ LC_ALL="C" \
+ emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc NOTES
+ # These build quick, and are needed for most tests, so don't
+ # disable their building when the USE flag is disabled.
+ if ! use utils; then
+ rm -rf "${ED}"/usr/bin || die
+ fi
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 74c96cf5517d..c1ebe4102850 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,5 +1,2 @@
-DIST ell-0.46.tar.xz 531420 BLAKE2B aea36c7faf75bdc282805e4c003877cfe3fc8ff31fcb1ec85a666481b5d574091876b5021259797411d102d7ae6057a79a600e89fa34da038d44863a840db78a SHA512 20a25dbcb7c93a7c29a87cd07ab6124d0915d382f588e2a808e3f7e330d00a6769f40d91264d505408eeae3c6d07ce3917e04d843b4d04c73cc7c9f01395ecc4
-DIST ell-0.47.tar.xz 531432 BLAKE2B 74c4a9d40f42eca3b105fa2433b3c8472df24bb185dacfba8f4978edeac79b94a1c7ef3c009eed3a3303125e7f3f26e08e046ebb1d913870d4f298806dc34119 SHA512 103708ea625d8eb63e5a662fc7fdd0f59cd3610c4d6de7ac2cceef89e30f8896d14a7b756047a3b046035544bcf80992aec786f06678047895cf0e3c791b8daa
-DIST ell-0.48.tar.xz 528916 BLAKE2B 3ab2a90afdedd0ebc8ac0efd69f52189a93f408db7b35e3a1a85e72ebe5884ed0c833ff1835b390925a406147d207b99328388f09124c34b935fc84f33e93339 SHA512 481b94c0aac91f26c9e618db2590f132265c07460e86c443ecac033a78566ce0e86a7c8f0ab7b2a954073ebbe66ed0303281776b82f751fa2b4d3aaf40e55dc2
DIST ell-0.49.tar.xz 530072 BLAKE2B 76823742261b319a60fa34a086e4f328459c12fa2e53c2fc0397968a7c5914eac019598f927853697c3aa3c8afc389758bf4ca31f3b6315b09d6bdccf0244a88 SHA512 9bac4312ebe85bd6903bd9665551e9f1de4cfc6914659cea28355363502f8968ac842b3579ac8efcb0721cb5a1f3f16dca80f02235f3675a24f13eb250ed3aea
DIST ell-0.50.tar.xz 534092 BLAKE2B 0f217f2f8a438f9d7e7862b5b2c45fecab3468bad3dc5912a87473f3237bdc3c541cec518bcea9ea5f45e6584793984ae822e6650676f2d22e10d84b7c30a08b SHA512 95dcfb34ece3bb7d6dc6f808c3df785cbb6966e7ac5533b9fd939a64288e6a584542cd69a6484da0f6ef752a62a87c143892d8f461d8389e4a12a1167bfa0590
diff --git a/dev-libs/ell/ell-0.46.ebuild b/dev-libs/ell/ell-0.46.ebuild
deleted file mode 100644
index 21c528b64073..000000000000
--- a/dev-libs/ell/ell-0.46.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
- ~TIMERFD
- ~EVENTFD
- ~CRYPTO_USER_API
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_MD5
- ~CRYPTO_SHA1
- ~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.47.ebuild b/dev-libs/ell/ell-0.47.ebuild
deleted file mode 100644
index 56c48e4f83d1..000000000000
--- a/dev-libs/ell/ell-0.47.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
- ~TIMERFD
- ~EVENTFD
- ~CRYPTO_USER_API
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_MD5
- ~CRYPTO_SHA1
- ~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.48.ebuild b/dev-libs/ell/ell-0.48.ebuild
deleted file mode 100644
index e1c237f5179c..000000000000
--- a/dev-libs/ell/ell-0.48.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
- ~TIMERFD
- ~EVENTFD
- ~CRYPTO_USER_API
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_MD5
- ~CRYPTO_SHA1
- ~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.49.ebuild b/dev-libs/ell/ell-0.49.ebuild
index e1c237f5179c..1ef74d66e58c 100644
--- a/dev-libs/ell/ell-0.49.ebuild
+++ b/dev-libs/ell/ell-0.49.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
fi
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/expat/expat-2.4.8.ebuild b/dev-libs/expat/expat-2.4.8.ebuild
index f397e99485c2..f8c937050342 100644
--- a/dev-libs/expat/expat-2.4.8.ebuild
+++ b/dev-libs/expat/expat-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild
index 203f4c3040f7..9e5e111bec68 100644
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
# under GNU LGPL." -ffcall author
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
src_prepare() {
# The build system is a strange mix of autogenerated
diff --git a/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/dev-libs/gmp/gmp-6.2.1-r2.ebuild
index 9f52d12e043a..85974f6f50d9 100644
--- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-da
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +cxx pic static-libs"
BDEPEND="sys-devel/m4
diff --git a/dev-libs/gtx/Manifest b/dev-libs/gtx/Manifest
deleted file mode 100644
index e96fff0af041..000000000000
--- a/dev-libs/gtx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtx-0.2.2.tar.gz 306024 BLAKE2B 861e5e729edc376b104906dbefe7f79e018a61dac3fefa2b260a869324b9ad88f002c64bb753d06cff93d58102c8f35e052ff18129c5c97da45f0abff6d78718 SHA512 737e21c66388f520c9d6812f3478e583940e9558646b4f3281306e3a946d4fb87719a48c1ac5fb1e38e9e465dfd1f82dea90badb3b321c0ee6b1dd105a9329cb
diff --git a/dev-libs/gtx/files/gtx-0.2.2-debug.patch b/dev-libs/gtx/files/gtx-0.2.2-debug.patch
deleted file mode 100644
index 73f6dfaaad2e..000000000000
--- a/dev-libs/gtx/files/gtx-0.2.2-debug.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- Makefile.am | 3 +--
- examples/Makefile.am | 5 ++---
- src/Makefile.am | 3 +--
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index e6bba05..67274c1 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -8,8 +8,7 @@ noinst_PROGRAMS = \
- command
-
- AM_CFLAGS =\
-- -Wall \
-- -g
-+ -Wall
-
- simple_SOURCES = \
- simple.c
-@@ -30,4 +29,4 @@ command_SOURCES = \
-
- command_LDADD = \
- $(GTX_LIBS) \
-- $(top_builddir)/src/libgtx.la
-\ No newline at end of file
-+ $(top_builddir)/src/libgtx.la
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f5f873e..a40d772 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -4,8 +4,7 @@ INCLUDES = \
- $(GTX_CFLAGS)
-
- AM_CFLAGS =\
-- -Wall \
-- -g
-+ -Wall
-
- #
- # Headers to be installed
diff --git a/dev-libs/gtx/files/gtx-0.2.2-docdir.patch b/dev-libs/gtx/files/gtx-0.2.2-docdir.patch
deleted file mode 100644
index e6f9a196f9f5..000000000000
--- a/dev-libs/gtx/files/gtx-0.2.2-docdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index aa401dc..4d99442 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,7 @@ SUBDIRS = \
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gtx.pc
-
--gtxdocdir = ${prefix}/doc/gtx
-+gtxdocdir = ${docdir}
-
- gtxdoc_DATA = \
- README \
diff --git a/dev-libs/gtx/files/gtx-0.2.2-glib.h.patch b/dev-libs/gtx/files/gtx-0.2.2-glib.h.patch
deleted file mode 100644
index 0efab61e9b1f..000000000000
--- a/dev-libs/gtx/files/gtx-0.2.2-glib.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- src/gtx.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/gtx.h b/src/gtx.h
-index 57bee60..ab128b0 100644
---- a/src/gtx.h
-+++ b/src/gtx.h
-@@ -24,7 +24,6 @@
- #define __GTX_H__
-
- #include
--#include
- #include
-
- G_BEGIN_DECLS
diff --git a/dev-libs/gtx/gtx-0.2.2-r1.ebuild b/dev-libs/gtx/gtx-0.2.2-r1.ebuild
deleted file mode 100644
index 492d15006d16..000000000000
--- a/dev-libs/gtx/gtx-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Small collection of functions intended to enhance the GLib testing framework"
-HOMEPAGE="https://launchpad.net/gtx"
-SRC_URI="https://launchpad.net/gtx/trunk/${PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-docdir.patch
- "${FILESDIR}"/${P}-debug.patch
- "${FILESDIR}"/${P}-glib.h.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.a' -delete || die
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/gtx/metadata.xml b/dev-libs/gtx/metadata.xml
deleted file mode 100644
index bd668f42c8be..000000000000
--- a/dev-libs/gtx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
-GTX is a small collection of convenience functions intended to enhance the GLib
-testing framework. With specific emphasis on easing the pain of writing test
-cases for asynchronous interactions.
-
-
- gtx
-
-
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-21.31.20514-no_Werror.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-21.31.20514-no_Werror.patch
deleted file mode 100644
index bd77b7c4e9ab..000000000000
--- a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-21.31.20514-no_Werror.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -868,7 +868,6 @@
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
- endif()
- endif()
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-
- if(USE_SANITIZE_UB)
- check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER)
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 99ea09eff23f..f79489750eeb 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1 +1,2 @@
DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
+DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
diff --git a/dev-libs/json-c/json-c-0.16-r1.ebuild b/dev-libs/json-c/json-c-0.16-r1.ebuild
new file mode 100644
index 000000000000..fc5db4844302
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.16-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_rdrand doc static-libs threads"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/json-c/config.h
+)
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIBS=$(usex static-libs)
+ -DDISABLE_EXTRA_LIBS=ON
+ -DDISABLE_WERROR=ON
+ -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
+ -DENABLE_THREADING=$(usex threads)
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && cmake_src_test
+}
+
+multilib_src_install_all() {
+ use doc && HTML_DOCS=( "${S}"/doc/html/. )
+ einstalldocs
+}
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index effac5b4d6ca..db97175c5f3e 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib git-r3
@@ -27,6 +27,7 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
-DDISABLE_WERROR=ON
+ -DDISABLE_EXTRA_LIBS=ON
-DENABLE_THREADING=$(usex threads)
-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-DBUILD_STATIC_LIBS=$(usex static-libs)
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index 1b59c6bf27c2..3de8ea37f6f8 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libassuan/libassuan-2.5.5.ebuild b/dev-libs/libassuan/libassuan-2.5.5.ebuild
index 684fa24b72a5..4e2e9a7fa80d 100644
--- a/dev-libs/libassuan/libassuan-2.5.5.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Note: On each bump, update dep bounds on each version from configure.ac!
RDEPEND=">=dev-libs/libgpg-error-1.17"
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index 9518fad0b156..2e1ceac2dcf0 100644
--- a/dev-libs/libcec/libcec-6.0.2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
MY_PV=${PV/_p/-}
MY_P=${PN}-${MY_PV}
-inherit cmake linux-info python-single-r1 toolchain-funcs
+inherit cmake linux-info python-single-r1 toolchain-funcs udev
DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
HOMEPAGE="http://libcec.pulse-eight.com"
@@ -112,12 +112,13 @@ src_install() {
use tools && doman debian/cec-client.1
if use udev; then
- insinto /lib/udev/rules.d
- doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev"
+ udev_dorules "${BUILD_DIR}/65-pulse-eight-usb-cec.udev"
fi
}
pkg_postinst() {
+ use udev && udev_reload
+
elog "You will need to ensure the user running your CEC client has"
elog "read/write access to the device. You can ensure this by adding"
elog "them to the uucp group"
diff --git a/dev-libs/libclc/libclc-15.0.0.9999.ebuild b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
index 139479da9e37..7d9edc440d2b 100644
--- a/dev-libs/libclc/libclc-15.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit cmake llvm llvm.org python-any-r1
@@ -18,6 +18,7 @@ REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
LLVM_MAX_SLOT=15
BDEPEND="
+ ${PYTHON_DEPS}
|| (
sys-devel/clang:15
sys-devel/clang:14
@@ -26,7 +27,7 @@ BDEPEND="
sys-devel/clang:11
sys-devel/clang:10
)
- ${PYTHON_DEPS}"
+"
LLVM_COMPONENTS=( libclc )
llvm.org_set_globals
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 6351b7c81d9d..022b0d07614b 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,2 +1,3 @@
DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
+DIST libffi-3.4.2-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62
DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
index 492d9b34c625..9c4a5672ce13 100644
--- a/dev-libs/libffi/libffi-3.4.2-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
@@ -10,7 +10,8 @@ MY_P=${PN}-${MY_PV}
DESCRIPTION="a portable, high level programming interface to various calling conventions"
HOMEPAGE="https://sourceware.org/libffi/"
-SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz
+ experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${MY_P}-loongarch64-20220428.patch.xz )"
S="${WORKDIR}"/${MY_P}
LICENSE="MIT"
@@ -19,8 +20,8 @@ LICENSE="MIT"
# with FEATURES="-preserved-libs" or another package manager if SONAME
# changes.
SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug exec-static-trampoline pax-kernel static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug exec-static-trampoline experimental-loong pax-kernel static-libs test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( dev-util/dejagnu )"
@@ -30,6 +31,10 @@ DOCS="ChangeLog* README.md"
ECONF_SOURCE=${S}
src_prepare() {
+ if use experimental-loong; then
+ PATCHES+=( "${WORKDIR}/${MY_P}-loongarch64-20220428.patch" )
+ fi
+
default
if [[ ${CHOST} == arm64-*-darwin* ]] ; then
# ensure we use aarch64 asm, not x86 on arm64
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 53754327cd3f..9a236f87a6a5 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,6 +35,7 @@
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 261c430c14a4..91fb0b1d8692 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,9 +1,2 @@
-DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
-DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
-DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e88012e9fe9d071c11e7350e0ada8d5da54d7cdc93f46f65b38fa9a811a638210238f42de99fdd6832f97ede3808723e5d4f SHA512 f05a1ef2be7a6d32a6c5adf8e02f2b17e83deb67bf7c67b1bc1fec539a7235903d91dd3e98412aa1b90f1fcb322cb9ab54d3a1ff4ec44889b4dcdda6984300c9
-DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515c056a5f838f4348324c0f5a975d3cc45a058b4c7d37f99179efe6808464b7972c31e300ae9e05371134d7a149b5616d5 SHA512 072ae343bc44939deff435078c29954dc60e4bb5079aa705b7445bec17717919d4957858538284e4f131d734439743bd5d39085a618ea41d586be8be887cf2b8
-DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
-DIST libfilezilla-0.34.2.tar.bz2 595072 BLAKE2B b7c5db16ff74ee218eb38e69f029f6c2cad7984f7f27795ec67f9250eb544b259941cd34fc30bc8222aa0fef51e275d4ca0587754386807ecd916ab7c56b6688 SHA512 a749635f7526e307b93002c4044debdcae948bebb73c272ffc98d1997cf160001a7edc6c776656ea927254614c5a3067ebab1ffc92d7b9f97cf5d4542dec8df9
-DIST libfilezilla-0.35.0.tar.bz2 597061 BLAKE2B 3b7e54a5c999ca7a52d90bdc71a237940c7909ff2ca63c28e0ed76e743a15209cfddd66d0de54c157b42524a460079f05cc3af93a54d4b76c2d44e623bab23fe SHA512 685ed22ab8e4c197f26488751bac2b28e72e5dddce0fce4795afabe59a9c1c7775ac92958ad9c15b0717a8e9f4cf4bf44eee61179d8a2194cbc11a7e2564a5c4
DIST libfilezilla-0.36.0.tar.bz2 598327 BLAKE2B d578b7c83cbd440acbb3efe2994c7140bfb0a11271e68a8bae52ac53f10e1ccf428c50d07e8cfc79f63beb0a3bffe8fbffd962413725817ac9df14e0b3b3a1cd SHA512 c6b0240c560afb87426f7ccf01e34eb92975b043697be89f26a12dcfaf4a109d308eed200429f986b14f80111573ea5a869194375c844fa7b666d173e9629a0a
DIST libfilezilla-0.37.1.tar.bz2 608419 BLAKE2B ae76a1d9d9829061ec95ae3b94e282a32835db19b85859c39db5b089a478f93b511fce4a798ebe79bf628bcb6b30f3ea40ff34aacfe2201bfa93887d4f8ce48e SHA512 1bcf9da8ec0fbac1ffada95d8dc1e4a67fbd77fca9273fa9e67418c7e89c74139683535fb917db4fa750bd263cb45a8f230e32b6ab890f3ca5ef5af39ef8ecae
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch b/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch
deleted file mode 100644
index 68f2c7ec9f7b..000000000000
--- a/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libfilezilla/lib/buffer.cpp 2020/12/09 13:33:18 10031
-+++ libfilezilla/lib/buffer.cpp 2021/04/27 07:39:32 10225
-@@ -2,6 +2,7 @@
-
- #include
- #include
-+#include
-
- #include
-
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
deleted file mode 100644
index bdbb4d9e2d84..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libfilezilla.so version
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc11.patch )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- default
-}
-
-src_install() {
- default
- find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
deleted file mode 100644
index f0acd4e96389..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/13" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
deleted file mode 100644
index f0d6428c3e3c..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/15" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild
deleted file mode 100644
index 0f53a3a78253..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/16" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
deleted file mode 100644
index 91f14170584c..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/21" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild
deleted file mode 100644
index 54125a19723a..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/22" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
deleted file mode 100644
index 785d5e9fa7d6..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/23" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.37.1-r1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.37.1-r1.ebuild
new file mode 100644
index 000000000000..fe7ec5e83bfe
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.37.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/25" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/nettle:0=
+ >=net-libs/gnutls-3.5.7:=
+ virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if ! test-flag-CXX -std=c++14; then
+ eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+ eerror "to gcc-4.9 or an equivalent version supporting C++14."
+ die "Currently active compiler does not support -std=c++14"
+ fi
+ fi
+}
+
+src_configure() {
+ if use ppc || use arm || use hppa; then
+ # bug 727652
+ append-libs -latomic
+ fi
+
+ econf --disable-static
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
deleted file mode 100644
index cef4ff72f871..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/24" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libfilezilla/metadata.xml b/dev-libs/libfilezilla/metadata.xml
index 4c049493554c..7a207a3b0757 100644
--- a/dev-libs/libfilezilla/metadata.xml
+++ b/dev-libs/libfilezilla/metadata.xml
@@ -9,6 +9,10 @@
polynomial-c@gentoo.org
Lars Wendler
+
+ dlan@gentoo.org
+ Yixun Lan
+
libfilezilla is a small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs. Some of the highlights include:
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
index 6f87ade79161..fdd2b182d69d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-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 ~loong ~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="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs"
# Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
index 5347656622a7..f79b1022d939 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libinput/libinput-1.20.1.ebuild b/dev-libs/libinput/libinput-1.20.1.ebuild
index 4191c6828b4c..e236b8976450 100644
--- a/dev-libs/libinput/libinput-1.20.1.ebuild
+++ b/dev-libs/libinput/libinput-1.20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/10"
[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
index 35ee0c1d4777..4ac50963a7b4 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
LICENSE="LGPL-3+ GPL-2+ GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libltdl/libltdl-2.4.7.ebuild b/dev-libs/libltdl/libltdl-2.4.7.ebuild
index 04dd29883a01..c752f33fcf64 100644
--- a/dev-libs/libltdl/libltdl-2.4.7.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
# libltdl doesn't have a testsuite.
diff --git a/dev-libs/libnl/files/libnl-99999999-2to3.patch b/dev-libs/libnl/files/libnl-99999999-2to3.patch
deleted file mode 100644
index 66a16406d780..000000000000
--- a/dev-libs/libnl/files/libnl-99999999-2to3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/python/netlink/route/links/bridge.py
-+++ b/python/netlink/route/links/bridge.py
-@@ -6,7 +6,7 @@
-
- """
-
--from __future__ import absolute_import
-+
-
- from ... import core as netlink
- from .. import capi as capi
-@@ -19,10 +19,10 @@
-
- def bridge_assert_ext_info(self):
- if self._has_ext_info == False:
-- print """
-+ print("""
- Please update your kernel to be able to call this method.
- Your current kernel bridge version is too old to support this extention.
-- """
-+ """)
- raise RuntimeWarning()
-
- def port_state2str(self, state):
---- a/doc/resolve-asciidoc-refs.py
-+++ b/doc/resolve-asciidoc-refs.py
-@@ -22,4 +22,4 @@
-
- rc = re.compile('|'.join(map(re.escape, sorted(refs, reverse=True))))
- for line in open(sys.argv[1], 'r'):
-- print rc.sub(translate, line),
-+ print(rc.sub(translate, line), end=' ')
---- a/doc/doxygen-link.py
-+++ b/doc/doxygen-link.py
-@@ -1,6 +1,6 @@
- #!/usr/bin/env python
-
--from __future__ import print_function
-+
- import fileinput
- import re
- import sys
diff --git a/dev-libs/libnl/libnl-3.6.0-r1.ebuild b/dev-libs/libnl/libnl-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..57e88da16908
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.6.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1 multilib-minimal
+
+LIBNL_P=${P/_/-}
+LIBNL_DIR=${PV/_/}
+LIBNL_DIR=${LIBNL_DIR//./_}
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
+S="${WORKDIR}/${LIBNL_P}"
+
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+debug python test utils"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ python? ( dev-lang/swig )
+ test? ( dev-libs/check )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # we do not install CLI stuff for non-native
+ /usr/include/libnl3/netlink/cli/addr.h
+ /usr/include/libnl3/netlink/cli/class.h
+ /usr/include/libnl3/netlink/cli/cls.h
+ /usr/include/libnl3/netlink/cli/ct.h
+ /usr/include/libnl3/netlink/cli/exp.h
+ /usr/include/libnl3/netlink/cli/link.h
+ /usr/include/libnl3/netlink/cli/mdb.h
+ /usr/include/libnl3/netlink/cli/neigh.h
+ /usr/include/libnl3/netlink/cli/qdisc.h
+ /usr/include/libnl3/netlink/cli/route.h
+ /usr/include/libnl3/netlink/cli/rule.h
+ /usr/include/libnl3/netlink/cli/tc.h
+ /usr/include/libnl3/netlink/cli/utils.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-static-tests.patch
+ "${FILESDIR}"/${P}-test-fixes-sandbox.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ if use python; then
+ pushd "${S}"/python > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ fi
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(multilib_native_use_enable utils cli) \
+ $(use_enable debug)
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use python ; then
+ pushd python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use python ; then
+ # Unset DOCS= since distutils-r1.eclass interferes
+ local DOCS=()
+
+ pushd python > /dev/null || die
+
+ distutils-r1_src_install
+
+ # For no obvious reason this is not done automatically
+ python_foreach_impl python_optimize
+
+ popd > /dev/null || die
+ fi
+}
+
+multilib_src_install_all() {
+ DOCS=( ChangeLog )
+
+ einstalldocs
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libnl/libnl-3.6.0.ebuild b/dev-libs/libnl/libnl-3.6.0.ebuild
deleted file mode 100644
index ab759e51347b..000000000000
--- a/dev-libs/libnl/libnl-3.6.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1 multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-S="${WORKDIR}/${LIBNL_P}"
-
-LICENSE="LGPL-2.1 utils? ( GPL-2 )"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+debug python test utils"
-RESTRICT="!test? ( test )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- python? ( dev-lang/swig )
- test? ( dev-libs/check )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # we do not install CLI stuff for non-native
- /usr/include/libnl3/netlink/cli/addr.h
- /usr/include/libnl3/netlink/cli/class.h
- /usr/include/libnl3/netlink/cli/cls.h
- /usr/include/libnl3/netlink/cli/ct.h
- /usr/include/libnl3/netlink/cli/exp.h
- /usr/include/libnl3/netlink/cli/link.h
- /usr/include/libnl3/netlink/cli/neigh.h
- /usr/include/libnl3/netlink/cli/qdisc.h
- /usr/include/libnl3/netlink/cli/route.h
- /usr/include/libnl3/netlink/cli/rule.h
- /usr/include/libnl3/netlink/cli/tc.h
- /usr/include/libnl3/netlink/cli/utils.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-static-tests.patch
- "${FILESDIR}"/${P}-test-fixes-sandbox.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-
- if use python; then
- pushd "${S}"/python > /dev/null || die
- distutils-r1_src_prepare
- popd > /dev/null || die
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(multilib_native_use_enable utils cli) \
- $(use_enable debug)
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use python ; then
- pushd python > /dev/null || die
- distutils-r1_src_compile
- popd > /dev/null || die
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi && use python ; then
- # Unset DOCS= since distutils-r1.eclass interferes
- local DOCS=()
-
- pushd python > /dev/null || die
-
- distutils-r1_src_install
-
- # For no obvious reason this is not done automatically
- python_foreach_impl python_optimize
-
- popd > /dev/null || die
- fi
-}
-
-multilib_src_install_all() {
- DOCS=( ChangeLog )
-
- einstalldocs
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 0afdbd9d360f..0cfee098abde 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/libnl3/netlink/cli/ct.h
/usr/include/libnl3/netlink/cli/exp.h
/usr/include/libnl3/netlink/cli/link.h
+ /usr/include/libnl3/netlink/cli/mdb.h
/usr/include/libnl3/netlink/cli/neigh.h
/usr/include/libnl3/netlink/cli/qdisc.h
/usr/include/libnl3/netlink/cli/route.h
@@ -46,10 +47,6 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/libnl3/netlink/cli/utils.h
)
-PATCHES=(
- "${FILESDIR}"/${PN}-99999999-2to3.patch
-)
-
src_prepare() {
default
diff --git a/dev-libs/libpcre/libpcre-8.45-r1.ebuild b/dev-libs/libpcre/libpcre-8.45-r1.ebuild
index a28f218327e9..18522d5343a3 100644
--- a/dev-libs/libpcre/libpcre-8.45-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.40.ebuild b/dev-libs/libpcre2/libpcre2-10.40.ebuild
index fc85567f8d74..fcebdba2e861 100644
--- a/dev-libs/libpcre2/libpcre2-10.40.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.40.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.6.ebuild b/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
index 760fe72bfd35..ae38dd130a5a 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
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 ~loong ~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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 24158f93fafe..20254e6da4ea 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,2 +1 @@
-DIST libretls-3.5.0.tar.gz 438466 BLAKE2B dac7442bb2bd924ff516e24f82905ddb69f20f697e7ceee04477f4a15560db358bf81e5a2ff68d088f13a99c2d8cdda93bb71c5a05a5a77111d691f9a9183265 SHA512 21f60dfc3147862df8499f81b5dd3d11fa9c6e481b06e9494797cfd78313982465fdd3ef0c4ec0373a708029df0acba7919620fb13142d5afec0bbe136760249
DIST libretls-3.5.1.tar.gz 425343 BLAKE2B e303ce141a218c58655f01aacb11e61fdb96d9b3a5943b211a35f02d869fa99efe7bfbf719ad14a1983c7f418d8c1daf3013c01ffa3e0bdd58cfce84ed41ec63 SHA512 ea566f0eda3f5ecb413f070db0ff9633b0c9403919eb2724712eac1c47fd32745b6da8e974a0226c8f95b7e24e5824780b377ae63651fbd0fa34ff0e6df4792a
diff --git a/dev-libs/libretls/libretls-3.5.0.ebuild b/dev-libs/libretls/libretls-3.5.0.ebuild
deleted file mode 100644
index 3e22f6e7659a..000000000000
--- a/dev-libs/libretls/libretls-3.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
-HOMEPAGE="https://git.causal.agency/libretls/about/"
-SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/22"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
- local myconf=(
- --disable-static
- )
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libretls/libretls-3.5.1.ebuild b/dev-libs/libretls/libretls-3.5.1.ebuild
index 777d4586d76b..3e22f6e7659a 100644
--- a/dev-libs/libretls/libretls-3.5.1.ebuild
+++ b/dev-libs/libretls/libretls-3.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
DEPEND="dev-libs/openssl:="
RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
index 60774a24abb5..968d58d3850b 100644
--- a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs test valgrind"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 90ac3d3e08ab..a74cf7c93759 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1 +1 @@
-DIST libtpms-0.9.3.tar.gz 1263192 BLAKE2B a58cc2f76775f0a0a266cf6da898d6c8e310998c201dc47a802d67fc07dbe1632a68e81b78da68a6350e1d64727c7b47154479b4d9bc19a55324a2d881cad94f SHA512 8616c712f958c28a415b0a97a3a24f439f757682c4b60642584eb13e4ab2d7895838e8e6e57936ff583259506f9b379ec47c76d5780c1b257f25513a5911c3cb
+DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505
diff --git a/dev-libs/libtpms/libtpms-0.9.3.ebuild b/dev-libs/libtpms/libtpms-0.9.4.ebuild
similarity index 100%
rename from dev-libs/libtpms/libtpms-0.9.3.ebuild
rename to dev-libs/libtpms/libtpms-0.9.4.ebuild
diff --git a/dev-libs/libunistring/libunistring-1.0.ebuild b/dev-libs/libunistring/libunistring-1.0.ebuild
index 36bcd1dba9a1..c3c32aa3bdc4 100644
--- a/dev-libs/libunistring/libunistring-1.0.ebuild
+++ b/dev-libs/libunistring/libunistring-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
PATCHES=(
diff --git a/dev-libs/libuv/libuv-1.44.1.ebuild b/dev-libs/libuv/libuv-1.44.1.ebuild
index f3ce927fd5dd..451dfcea2c2f 100644
--- a/dev-libs/libuv/libuv-1.44.1.ebuild
+++ b/dev-libs/libuv/libuv-1.44.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
index 82dfa95b7b2f..5102622cfb0d 100644
--- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
inherit gnome.org
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-1.1.35.ebuild
index a00cec50a10c..3848a6609fa0 100644
--- a/dev-libs/libxslt/libxslt-1.1.35.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.35.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
else
inherit gnome.org
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/dev-libs/light/light-1.2.2-r2.ebuild b/dev-libs/light/light-1.2.2-r2.ebuild
index 64dd04c8b3f4..9d2a121969e2 100644
--- a/dev-libs/light/light-1.2.2-r2.ebuild
+++ b/dev-libs/light/light-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,25 +12,27 @@ SRC_URI="https://github.com/haikarainen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-
IUSE="udev"
RDEPEND="
acct-group/video
!sys-power/acpilight
+ udev? ( virtual/libudev:= )
"
-DEPEND="udev? ( virtual/libudev:= )
- ${RDEPEND}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fcommon.patch"
+)
src_prepare() {
- eapply "${FILESDIR}/${P}-fcommon.patch"
- eapply_user
+ default
eautoreconf
}
src_configure() {
local myeconfargs=(
- $(usex udev --with-udev="/lib/udev/rules.d" "")
+ $(usex udev --with-udev="$(get_udevdir)/rules.d" "")
)
econf "${myeconfargs[@]}"
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
index d81423af7651..0f8eff88589a 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv ~s390 x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
IUSE="debug examples icu sasl ssl static-libs test"
REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index 2057137f920c..4198499ae66c 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
index 14f2319304bc..bb3723e9910e 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -36,7 +36,7 @@ LICENSE="LGPL-2.1"
# This is a critical package; if SONAME changes, bump subslot but also add
# preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/nettle-3.7.3.ebuild b/dev-libs/nettle/nettle-3.7.3.ebuild
index 88f5f2c3fec8..aefc0ce29b94 100644
--- a/dev-libs/nettle/nettle-3.7.3.ebuild
+++ b/dev-libs/nettle/nettle-3.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 003688741725..81b168a55477 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_prepare() {
default
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c69ba2f48264..44e3cc3329bc 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,4 @@
DIST nss-3.68.3.tar.gz 82406947 BLAKE2B 92461f20294a9dce8c8a7eead9d06a4159e66afeb2d42a3313983fc5606a5f97321e038b9c25a7c7a361506910aee027ec91efd3096efdbf62096556d40896de SHA512 70fa8ab48d45249c04424979640583e8bc867432b7e3f26c1602db49a13861dd070f081ed82660bb7451f835dc859b5788ae12a67f9ddab1f6bd1a7afb1174d2
-DIST nss-3.76.1.tar.gz 84626067 BLAKE2B 5112b208f3b9528a34b1d8e3e669db067ecb79719ad16793b8cd556a02910cc29f899f2a57e959c50048c5d2b94eb3b9855208dd3c20646a719c971561f6ea4c SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54
DIST nss-3.77.tar.gz 84592839 BLAKE2B a63770f550b062549901afdcc5dc2a11c4648cef6875b023895da01ef53d6afc8c618291de96ac0af3a2c2cd7aa7986f93b4f10102a3c5aca1aa1447c148c393 SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e
+DIST nss-3.78.tar.gz 84815720 BLAKE2B f140fb49e5edff98abdaae5d90adc5fac080cedfd2fcc2cc86968ac8f51116af648802655986a95dba8f1ca4257dca3c01d850bfd2b064abadea215cb9fd8c5e SHA512 ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c
DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
diff --git a/dev-libs/nss/nss-3.76.1.ebuild b/dev-libs/nss/nss-3.76.1.ebuild
deleted file mode 100644
index f927277815f9..000000000000
--- a/dev-libs/nss/nss-3.76.1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-PATCHES=(
- # Custom changes for gentoo
- "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
- "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
- "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
- "${FILESDIR}/nss-3.68-ld-fix.patch"
-)
-
-src_prepare() {
- default
-
- if use cacert ; then
- eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
- fi
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- *86*-pc-solaris2*) echo "i86pc" ;;
- aarch64*) echo "aarch64" ;;
- hppa*) echo "parisc" ;;
- i?86*) echo "i686" ;;
- x86_64*) echo "x86_64" ;;
- *) tc-arch ${t} ;;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- CCC="$(tc-getCXX)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- LD="$(tc-getLD)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_DIR
-
- export NSS_ALLOW_SSLKEYLOGFILE=1
- export NSS_ENABLE_WERROR=0 #567158
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export FREEBL_NO_DEPEND=1
- export FREEBL_LOWHASH=1
- export NSS_SEED_ONLY_DEV_URANDOM=1
- export USE_SYSTEM_ZLIB=1
- export ZLIB_LIBS=-lz
- export ASFLAGS=""
- # Fix build failure on arm64
- export NS_USE_GCC=1
- # Detect compiler type and set proper environment value
- if tc-is-gcc; then
- export CC_IS_GCC=1
- elif tc-is-clang; then
- export CC_IS_CLANG=1
- fi
-
- # explicitly disable altivec/vsx if not requested
- # https://bugs.gentoo.org/789114
- case ${ARCH} in
- ppc*)
- use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
- use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
- ;;
- esac
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
- local i
- for i in crmf freebl nssb nssckfw ; do
- cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
- done
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.{h,api}
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac,cmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils=( shlibsign )
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- # checkcert utils has been removed in nss-3.22:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
- # https://hg.mozilla.org/projects/nss/rev/df1729d37870
- # certcgi has been removed in nss-3.36:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
- nssutils+=(
- addbuiltin
- atob
- baddbdir
- btoa
- certutil
- cmsutil
- conflict
- crlutil
- derdump
- digest
- makepqg
- mangle
- modutil
- multinit
- nonspr10
- ocspclnt
- oidcalc
- p7content
- p7env
- p7sign
- p7verify
- pk11mode
- pk12util
- pp
- rsaperf
- selfserv
- signtool
- signver
- ssltap
- strsclnt
- symkeyutil
- tstclnt
- vfychain
- vfyserv
- )
- # install man-pages for utils (bug #516810)
- doman doc/nroff/*.1
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils[@]}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.78.ebuild b/dev-libs/nss/nss-3.78.ebuild
new file mode 100644
index 000000000000..225e7a316b86
--- /dev/null
+++ b/dev-libs/nss/nss-3.78.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+ cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+ >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/nss-config
+)
+
+PATCHES=(
+ # Custom changes for gentoo
+ "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+ "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+ "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+ default
+
+ if use cacert ; then
+ eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+ fi
+
+ pushd coreconf >/dev/null || die
+ # hack nspr paths
+ echo 'INCLUDES += -I$(DIST)/include/dbm' \
+ >> headers.mk || die "failed to append include"
+
+ # modify install path
+ sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+ -i source.mk || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+ popd >/dev/null || die
+
+ # Fix pkgconfig file for Prefix
+ sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+ config/Makefile || die
+
+ # use host shlibsign if need be #436216
+ if tc-is-cross-compiler ; then
+ sed -i \
+ -e 's:"${2}"/shlibsign:shlibsign:' \
+ cmd/shlibsign/sign.sh || die
+ fi
+
+ # dirty hack
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+ lib/ssl/config.mk || die
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+ cmd/platlibs.mk || die
+
+ multilib_copy_sources
+
+ strip-flags
+}
+
+multilib_src_configure() {
+ # Ensure we stay multilib aware
+ sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+ # Most of the arches are the same as $ARCH
+ local t=${1:-${CHOST}}
+ case ${t} in
+ *86*-pc-solaris2*) echo "i86pc" ;;
+ aarch64*) echo "aarch64" ;;
+ hppa*) echo "parisc" ;;
+ i?86*) echo "i686" ;;
+ x86_64*) echo "x86_64" ;;
+ *) tc-arch ${t} ;;
+ esac
+}
+
+nssbits() {
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ if [[ ${1} == BUILD_ ]]; then
+ cc=$(tc-getBUILD_CC)
+ else
+ cc=$(tc-getCC)
+ fi
+ echo > "${T}"/test.c || die
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+ case $(file "${T}/${1}test.o") in
+ *32-bit*x86-64*) echo USE_X32=1;;
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+ esac
+}
+
+multilib_src_compile() {
+ # use ABI to determine bit'ness, or fallback if unset
+ local buildbits mybits
+ case "${ABI}" in
+ n32) mybits="USE_N32=1";;
+ x32) mybits="USE_X32=1";;
+ s390x|*64) mybits="USE_64=1";;
+ ${DEFAULT_ABI})
+ einfo "Running compilation test to determine bit'ness"
+ mybits=$(nssbits)
+ ;;
+ esac
+ # bitness of host may differ from target
+ if tc-is-cross-compiler; then
+ buildbits=$(nssbits BUILD_)
+ fi
+
+ local makeargs=(
+ CC="$(tc-getCC)"
+ CCC="$(tc-getCXX)"
+ AR="$(tc-getAR) rc \$@"
+ RANLIB="$(tc-getRANLIB)"
+ OPTIMIZER=
+ ${mybits}
+ )
+
+ # Take care of nspr settings #436216
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+ unset NSPR_INCLUDE_DIR
+
+ export NSS_ALLOW_SSLKEYLOGFILE=1
+ export NSS_ENABLE_WERROR=0 #567158
+ export BUILD_OPT=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSDISTMODE=copy
+ export FREEBL_NO_DEPEND=1
+ export FREEBL_LOWHASH=1
+ export NSS_SEED_ONLY_DEV_URANDOM=1
+ export USE_SYSTEM_ZLIB=1
+ export ZLIB_LIBS=-lz
+ export ASFLAGS=""
+ # Fix build failure on arm64
+ export NS_USE_GCC=1
+ # Detect compiler type and set proper environment value
+ if tc-is-gcc; then
+ export CC_IS_GCC=1
+ elif tc-is-clang; then
+ export CC_IS_CLANG=1
+ fi
+
+ # explicitly disable altivec/vsx if not requested
+ # https://bugs.gentoo.org/789114
+ case ${ARCH} in
+ ppc*)
+ use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+ use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+ ;;
+ esac
+
+ local d
+
+ # Build the host tools first.
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ XCFLAGS="${BUILD_CFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 -C coreconf \
+ CC="$(tc-getBUILD_CC)" \
+ ${buildbits-${mybits}}
+ makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+ # Then build the target tools.
+ for d in . lib/dbm ; do
+ CPPFLAGS="${myCPPFLAGS}" \
+ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+ done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+# */${local_libdir}/libfreebl3.so*
+# */${local_libdir}/libnssdbm3.so*
+# */${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+ local shlibsign="$1"
+ local libdir="$2"
+ einfo "Resigning core NSS libraries for FIPS validation"
+ shift 2
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libname=lib${i}.so
+ local chkname=lib${i}.chk
+ "${shlibsign}" \
+ -i "${libdir}"/${libname} \
+ -o "${libdir}"/${chkname}.tmp \
+ && mv -f \
+ "${libdir}"/${chkname}.tmp \
+ "${libdir}"/${chkname} \
+ || die "Failed to sign ${libname}"
+ done
+}
+
+cleanup_chk() {
+ local libdir="$1"
+ shift 1
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libfname="${libdir}/lib${i}.so"
+ # If the major version has changed, then we have old chk files.
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+ && rm -f "${libfname}.chk"
+ done
+}
+
+multilib_src_install() {
+ pushd dist >/dev/null || die
+
+ dodir /usr/$(get_libdir)
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+ local i
+ for i in crmf freebl nssb nssckfw ; do
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+ done
+
+ # Install nss-config and pkgconfig file
+ dodir /usr/bin
+ cp -L */bin/nss-config "${ED}"/usr/bin || die
+ dodir /usr/$(get_libdir)/pkgconfig
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+ # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+ # bug 517266
+ sed -e 's#Libs:#Libs: -lfreebl#' \
+ -e 's#Cflags:#Cflags: -I${includedir}/private#' \
+ */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+ || die "could not create nss-softokn.pc"
+
+ # all the include files
+ insinto /usr/include/nss
+ doins public/nss/*.{h,api}
+ insinto /usr/include/nss/private
+ doins private/nss/{blapi,alghmac,cmac}.h
+
+ popd >/dev/null || die
+
+ local f nssutils
+ # Always enabled because we need it for chk generation.
+ nssutils=( shlibsign )
+
+ if multilib_is_native_abi ; then
+ if use utils; then
+ # The tests we do not need to install.
+ #nssutils_test="bltest crmftest dbtest dertimetest
+ #fipstest remtest sdrtest"
+ # checkcert utils has been removed in nss-3.22:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+ # https://hg.mozilla.org/projects/nss/rev/df1729d37870
+ # certcgi has been removed in nss-3.36:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+ nssutils+=(
+ addbuiltin
+ atob
+ baddbdir
+ btoa
+ certutil
+ cmsutil
+ conflict
+ crlutil
+ derdump
+ digest
+ makepqg
+ mangle
+ modutil
+ multinit
+ nonspr10
+ ocspclnt
+ oidcalc
+ p7content
+ p7env
+ p7sign
+ p7verify
+ pk11mode
+ pk12util
+ pp
+ rsaperf
+ selfserv
+ signtool
+ signver
+ ssltap
+ strsclnt
+ symkeyutil
+ tstclnt
+ vfychain
+ vfyserv
+ )
+ # install man-pages for utils (bug #516810)
+ doman doc/nroff/*.1
+ fi
+ pushd dist/*/bin >/dev/null || die
+ for f in ${nssutils[@]}; do
+ dobin ${f}
+ done
+ popd >/dev/null || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_pkg_postinst() {
+ # We must re-sign the libraries AFTER they are stripped.
+ local shlibsign="${EROOT}/usr/bin/shlibsign"
+ # See if we can execute it (cross-compiling & such). #436216
+ "${shlibsign}" -h >&/dev/null
+ if [[ $? -gt 1 ]] ; then
+ shlibsign="shlibsign"
+ fi
+ generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_pkg_postrm() {
+ cleanup_chk "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index d66790347665..ea3c06ec0152 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,3 +1,2 @@
-DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
-DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de9d8ab78b4456217d655239081f8547e87730f54f05511e1a3ca6c54836fad5cb0cf69f26ac5ffd86ff6ae930f5e2dc SHA512 d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7
+DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
diff --git a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
deleted file mode 100644
index 6df90f21a059..000000000000
--- a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@
- add_definitions(-DUSE_PREBUILT_LLVM)
-
- if(NOT PREFERRED_LLVM_VERSION)
-- set(PREFERRED_LLVM_VERSION "11.0.0")
-+ set(PREFERRED_LLVM_VERSION "11.1.0")
- endif(NOT PREFERRED_LLVM_VERSION)
- message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
- find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
index 93d25671c3c2..8d57fc8b99de 100644
--- a/dev-libs/opencl-clang/metadata.xml
+++ b/dev-libs/opencl-clang/metadata.xml
@@ -1,7 +1,18 @@
-
+
+ gentoo@taujhe.de
+ Jan Henke
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ conikost@gentoo.org
+ Conrad Kostecki
+
intel/opencl-clang
diff --git a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
deleted file mode 100644
index 80403ddf333c..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.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
-
-EGIT_COMMIT="c67648d41df00ea8ee9d701d17299b86f86f0321"
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="amd64"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="
- >=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]
- ~sys-devel/clang-11.1.0:11=[static-analyzer,${MULTILIB_USEDEP}]
- sys-devel/llvm:11=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
- "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
- "${FILESDIR}"/${PN}-11.1.0_version.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
- )
- cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
deleted file mode 100644
index a676d51782e7..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="12"
-KEYWORDS="amd64"
-
-DEPEND="
- >=dev-util/spirv-llvm-translator-12.0.0:12=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-12.0.0:12=[static-analyzer,${MULTILIB_USEDEP}]
- sys-devel/llvm:12=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=12
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
- "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
- )
- cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild
new file mode 100644
index 000000000000..a46a92527df9
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="13"
+
+inherit cmake llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="13"
+KEYWORDS="amd64"
+
+RDEPEND="
+ dev-util/spirv-llvm-translator:${SLOT}=
+ sys-devel/clang:${SLOT}=[static-analyzer]
+ sys-devel/llvm:${SLOT}=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+ "${FILESDIR}"/${PN}-13.0.0_version.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
deleted file mode 100644
index ae4242b3e576..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="13"
-KEYWORDS="amd64"
-
-DEPEND="
- >=dev-util/spirv-llvm-translator-13.0.0:13=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-13.0.0:13=[static-analyzer,${MULTILIB_USEDEP}]
- sys-devel/llvm:13=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=13
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
- "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
- "${FILESDIR}"/${PN}-13.0.0_version.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
- )
- cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
new file mode 100644
index 000000000000..860b6ca30db9
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="14"
+
+inherit cmake llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="14"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-util/spirv-llvm-translator:${SLOT}=
+ sys-devel/clang:${SLOT}=[static-analyzer]
+ sys-devel/llvm:${SLOT}=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2
index 68d7d0ac1fc1..caa569588f3c 100644
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@@ -97,6 +97,7 @@ linux)
i[0-9]86*|\
x86_64*:x86) machine=elf;;
ia64*) machine=ia64;;
+ loongarch64*) machine="generic64 -DL_ENDIAN";;
m68*) machine="generic32 -DB_ENDIAN";;
mips*el*) machine="generic32 -DL_ENDIAN";;
mips*) machine="generic32 -DB_ENDIAN";;
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
index 5a7d16cfa51b..5cfa2b82bf24 100644
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -16,7 +16,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
LICENSE="openssl"
SLOT="0/1.1" # .so version of libssl/libcrypto
[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 296a95e62b02..435dcfdc5e35 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 35674fb99b24..731c705df93b 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,2 +1 @@
-DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
DIST protobuf-c-1.4.0.tar.gz 505251 BLAKE2B 5f53238c064f82de87012eb739bf6a44c202d0dbf2fc5af394accdc52a9934d1fb9cea2bb4a4d529fdf98959546aaa672c1c991a9a7016803d16f65accc907cd SHA512 6a2e5031b85b5986e863661437dea002eba217257a50a27db88d29fa1a3db1014ed6ec7c21d89df700d181b18e169d1037146cb6475c10cd5a068a91e522e3c3
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3-r1.ebuild
deleted file mode 100644
index efdf8fa4897e..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-# Subslot == SONAME version
-SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-libs/protobuf-3:0
- virtual/pkgconfig"
-DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- if ! use test; then
- eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -type f -delete || die
- einstalldocs
-}
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
deleted file mode 100644
index c7e6688a6e9a..000000000000
--- a/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="bindist gost migration-tool test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- migration-tool? ( dev-db/sqlite:3= )
- dev-libs/openssl:0=[bindist(-)=]
- !~dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gcc:=[cxx]
- virtual/pkgconfig
- test? ( dev-util/cppunit )
-"
-
-DOCS=( NEWS README.md )
-
-src_configure() {
- econf \
- --disable-static \
- --with-crypto-backend=openssl \
- --disable-p11-kit \
- --localstatedir="${EPREFIX}/var" \
- $(use_enable !bindist ecc) \
- $(use_enable gost) \
- $(use_with migration-tool migrate)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- keepdir /var/lib/softhsm/tokens
-}
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild
index 866010b95ab7..20ce2239befb 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.kryoflux.com/"
SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
LICENSE="Kryoflux-MAME"
SLOT="0"
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 37423faf9818..eb520f1b53e7 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,2 @@
DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
diff --git a/dev-libs/starpu/starpu-1.3.8.ebuild b/dev-libs/starpu/starpu-1.3.8.ebuild
deleted file mode 100644
index 33fa716eb10b..000000000000
--- a/dev-libs/starpu/starpu-1.3.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="fortran"
-FORTRAN_STANDARD=90
-
-inherit autotools cuda fortran-2 toolchain-funcs
-
-DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
-HOMEPAGE="https://starpu.gitlabpages.inria.fr/"
-SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="
- blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
- openmp spinlock-check static-libs test valgrind
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sci-mathematics/glpk:0=
- >=sys-apps/hwloc-2.3.0:0=
- blas? ( virtual/blas )
- cuda? ( dev-util/nvidia-cuda-toolkit
- x11-drivers/nvidia-drivers )
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( sci-libs/hdf5:0= )
- mpi? ( virtual/mpi )
- opencl? ( virtual/opencl )
- opengl? ( media-libs/freeglut:0= )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen virtual/latex-base )
-"
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
-
- sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
- sed -i -e 's/-O3//g;s/-D_FORTIFY_SOURCE=1//g' configure.ac || die
- eautoreconf
-
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-
- econf \
- $(use mpi && use_enable test mpi-check) \
- $(use_enable cuda) \
- $(use_enable doc build-doc) \
- $(use_enable doc build-doc-pdf) \
- $(use_enable fftw starpufft) \
- $(use_enable fortran) \
- $(use_enable hdf5) \
- $(use_enable mpi) \
- $(use_enable opencl) \
- $(use_enable opengl opengl-render) \
- $(use_enable openmp) \
- $(use_enable spinlock-check) \
- $(use_enable static-libs static) \
- $(use_enable valgrind) \
- $(use_with mpi mpicc "$(type -P mpicc)") \
- --disable-build-examples \
- --disable-debug \
- --disable-fstack-protector-all \
- --disable-full-gdb-information
-}
-
-src_test() {
- # Avoids timeouts in e.g. starpu_task_wait_for_all, starpu_task_wait
- # See bug #803158
- # https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh
- export STARPU_TIMEOUT_ENV=3600
- export MPIEXEC_TIMEOUT=3600
-
- # Could switch(?) to quick check if timeouts end up being a real problem, but let's not
- # do it for now. https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh#L85
- MAKEOPTS='-j1' default
-}
-
-src_install() {
- default
- use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
- use examples && dodoc -r examples
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
new file mode 100644
index 000000000000..4e5bde988056
--- /dev/null
+++ b/dev-libs/thrift/Manifest
@@ -0,0 +1 @@
+DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
diff --git a/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch b/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch
new file mode 100644
index 000000000000..cc1f1cf2c621
--- /dev/null
+++ b/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch
@@ -0,0 +1,36 @@
+diff --git a/lib/cpp/test/ToStringTest.cpp b/lib/cpp/test/ToStringTest.cpp
+index 736b33c0a..f66909873 100644
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -41,31 +41,6 @@ BOOST_AUTO_TEST_CASE(base_types_to_string) {
+ BOOST_CHECK_EQUAL(to_string("abc"), "abc");
+ }
+
+-// NOTE: Currently (as of 2021.08.12) the locale-based tests do not work on
+-// Windows in the AppVeyor Thrift CI build correctly. Therefore disabled on
+-// Windows:
+-#ifndef _WIN32
+-BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+-#ifdef _WIN32
+- std::locale::global(std::locale("en-US.UTF-8"));
+-#else
+- std::locale::global(std::locale("en_US.UTF-8"));
+-#endif
+- BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+-}
+-
+-BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+-#ifdef _WIN32
+- std::locale::global(std::locale("de-DE.UTF-8"));
+-#else
+- std::locale::global(std::locale("de_DE.UTF-8"));
+-#endif
+- BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+- BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+- BOOST_CHECK_EQUAL(to_string(1.5L), "1.5");
+-}
+-#endif
+-
+ BOOST_AUTO_TEST_CASE(empty_vector_to_string) {
+ std::vector l;
+ BOOST_CHECK_EQUAL(to_string(l), "[]");
diff --git a/dev-libs/thrift/metadata.xml b/dev-libs/thrift/metadata.xml
new file mode 100644
index 000000000000..e27373e1c1b8
--- /dev/null
+++ b/dev-libs/thrift/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+
+ apache/thrift/
+ https://issues.apache.org/jira/projects/THRIFT
+
+
diff --git a/dev-libs/thrift/thrift-0.16.0.ebuild b/dev-libs/thrift/thrift-0.16.0.ebuild
new file mode 100644
index 000000000000..8ef3ac6644fb
--- /dev/null
+++ b/dev-libs/thrift/thrift-0.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ bindings for Apache Thrift"
+HOMEPAGE="https://thrift.apache.org/lib/cpp.html"
+SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE="libevent lua +ssl test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/openssl:=
+ libevent? ( dev-libs/libevent )
+ test? (
+ dev-libs/boost
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+REQUIRED_USE="
+ test? ( ssl )
+"
+
+PATCHES=(
+ "${FILESDIR}/thrift-0.16.0-network-tests.patch"
+)
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DBUILD_CPP=ON
+ -DBUILD_C_GLIB=OFF
+ -DBUILD_JAVA=OFF
+ -DBUILD_JAVASCRIPT=OFF
+ -DBUILD_NODEJS=OFF
+ -DBUILD_PYTHON=OFF
+ -DBUILD_TESTING=$(usex test 'ON' 'OFF')
+ -DWITH_LIBEVENT=$(usex libevent 'ON' 'OFF')
+ -DWITH_OPENSSL=$(usex ssl 'ON' 'OFF')
+ -DWITH_ZLIB=ON
+ -Wno-dev
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index f07c6214647d..1d3d1fa36d68 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
# Helpful site:
# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="sys-devel/libtool"
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
index 8000f1473810..f2f646d68e0d 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
new file mode 100644
index 000000000000..22daddedb61c
--- /dev/null
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
@@ -0,0 +1,178 @@
+This is https://github.com/loongarch64/userspace-rcu/pull/2, yet to be
+upstreamed but already reviewed and accepted by the LoongArch porting
+community.
+From 213197eea1a711da2f7cc0c04cdf33acb1b3c50e Mon Sep 17 00:00:00 2001
+From: Wang Jing
+Date: Tue, 8 Jun 2021 19:44:49 +0800
+Subject: [PATCH] Add LoongArch support
+
+--- a/LICENSE
++++ b/LICENSE
+@@ -44,6 +44,7 @@ MIT/X11 (BSD like) license apply to:
+ compiler.h
+ arch/s390.h
+ uatomic/alpha.h
++uatomic/loongarch.h
+ uatomic/mips.h
+ uatomic/nios2.h
+ uatomic/s390.h
+--- a/README.md
++++ b/README.md
+@@ -51,6 +51,7 @@ Currently, the following architectures are supported:
+ - hppa/PA-RISC
+ - m68k
+ - RISC-V
++ - LoongArch
+
+ Tested on:
+
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -7,6 +7,7 @@ nobase_include_HEADERS = \
+ urcu/arch.h \
+ urcu/arch/hppa.h \
+ urcu/arch/ia64.h \
++ urcu/arch/loongarch.h \
+ urcu/arch/m68k.h \
+ urcu/arch/mips.h \
+ urcu/arch/nios2.h \
+@@ -67,6 +68,7 @@ nobase_include_HEADERS = \
+ urcu/uatomic.h \
+ urcu/uatomic/hppa.h \
+ urcu/uatomic/ia64.h \
++ urcu/uatomic/loongarch.h \
+ urcu/uatomic/m68k.h \
+ urcu/uatomic/mips.h \
+ urcu/uatomic/nios2.h \
+--- a/include/urcu/arch.h
++++ b/include/urcu/arch.h
+@@ -49,6 +49,7 @@
+ * URCU_ARCH_HPPA : All HP PA-RISC variants
+ * URCU_ARCH_M68K : All Motorola 68000 variants
+ * URCU_ARCH_RISCV : All RISC-V variants
++ * URCU_ARCH_LOONGARCH : All LoongArch variants
+ */
+
+ #if (defined(__INTEL_OFFLOAD) || defined(__TARGET_ARCH_MIC) || defined(__MIC__))
+@@ -157,6 +158,11 @@
+ #define URCU_ARCH_RISCV 1
+ #include
+
++#elif defined(__loongarch__)
++
++#define URCU_ARCH_LOONGARCH 1
++#include
++
+ #else
+ #error "Cannot build: unrecognized architecture, see ."
+ #endif
+--- /dev/null
++++ b/include/urcu/arch/loongarch.h
+@@ -0,0 +1,49 @@
++#ifndef _URCU_ARCH_LOONGARCH_H
++#define _URCU_ARCH_LOONGARCH_H
++
++/*
++ * arch/loongarch.h: trivial definitions for the LoongArch architecture.
++ *
++ * Copyright (c) 2021 Wang Jing
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include
++#include
++#include
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include
++#include
++
++/*
++ * On Linux, define the membarrier system call number if not yet available in
++ * the system headers.
++ */
++#if (defined(__linux__) && !defined(__NR_membarrier))
++#define __NR_membarrier 283
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#include
++
++#endif /* _URCU_ARCH_LOONGARCH_H */
+--- a/include/urcu/uatomic.h
++++ b/include/urcu/uatomic.h
+@@ -51,6 +51,8 @@
+ #include
+ #elif defined(URCU_ARCH_RISCV)
+ #include
++#elif defined(URCU_ARCH_LOONGARCH)
++#include
+ #else
+ #error "Cannot build: unrecognized architecture, see ."
+ #endif
+--- /dev/null
++++ b/include/urcu/uatomic/loongarch.h
+@@ -0,0 +1,44 @@
++#ifndef _URCU_UATOMIC_ARCH_LOONGARCH_H
++#define _URCU_UATOMIC_ARCH_LOONGARCH_H
++
++/*
++ * Atomic exchange operations for the LoongArch architecture. Let GCC do it.
++ *
++ * Copyright (c) 2021 Wang Jing
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to
++ * deal in the Software without restriction, including without limitation the
++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
++ * IN THE SOFTWARE.
++ */
++
++#include
++#include
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define UATOMIC_HAS_ATOMIC_BYTE
++#define UATOMIC_HAS_ATOMIC_SHORT
++
++#ifdef __cplusplus
++}
++#endif
++
++#include
++
++#endif /* _URCU_UATOMIC_ARCH_LOONGARCH_H */
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
index 392cecbc2209..ab5f96219bd5 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
@@ -19,6 +19,7 @@ BDEPEND="test? ( sys-process/time )"
PATCHES=(
"${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch
+ "${FILESDIR}"/${PN}-0.13.1-loong.patch
)
src_prepare() {
@@ -26,6 +27,7 @@ src_prepare() {
# Needed for tests patch
# ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
+ # ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189)
eautoreconf
}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index f1b11852286e..425623997d80 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,4 @@
DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
DIST vala-0.54.7.tar.xz 3916868 BLAKE2B 0e9f1e20f7f2dc2e1b024baba6e64e9d192de7d9978c6f9b2ed37e5fff9e95e31718e7a44761c98e8fe2aa790e9464259df004610d4cf863ef39afe45cedd37d SHA512 7d3345984c496e9fe6324fea6c4fd8d2887102b271d825740b0f5812538dbdabe9c88ec4022d25c34121df686200cce48d4678ec6a00b2a002b9e74242475440
DIST vala-0.56.0.tar.xz 3958820 BLAKE2B dc4ac5ad65fd2650eb2ecf1cc8e7ed177a64ae7d93120793941760417b6d8d5992cef1a557a7de3f39cf1e646d00fa853ccfac7414c742d9cfcf313945cbd356 SHA512 dfaad6fc143835d601c586b270e7ee63309341fb9b7f023541bac75e96759d0eb9c563c67aa26acdcd1fb89a4a08759107f8a6c8e887f7d402fa2aa50a2e4038
+DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b19608651843c32c84ca6901a22971a2128a85a1e1e110d0b7d14cb89d4164688c289090a4299bb11540180548cf7 SHA512 83c34ab0497a9b7a627db8c1dbfea9e76c94b902e298afb2c30ba9824717f2fe3b0e26b987feb93cd4ff0ce211d0ecd9a746cc18c00e41c4c6fd01d05947902f
diff --git a/dev-libs/vala-common/vala-common-0.56.1.ebuild b/dev-libs/vala-common/vala-common-0.56.1.ebuild
new file mode 100644
index 000000000000..40415607535f
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.56.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/aclocal
+ doins vala.m4 vapigen/vapigen.m4
+ insinto /usr/share/vala
+ doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
index c2f0aa30e665..dc85454c9e42 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit subversion
else
SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
LICENSE="Apache-2.0"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
index d6b2720a168b..a59fac938410 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0/4.54"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
diff --git a/dev-libs/yajl/yajl-2.1.0-r3.ebuild b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
index 8115000253c8..c8156fd381c0 100644
--- a/dev-libs/yajl/yajl-2.1.0-r3.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/lloyd-yajl-66cb08c"
LICENSE="ISC"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PATCHES=(
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 8ed7d638f59e..b0e5119e6d23 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,2 +1 @@
-DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44 SHA512 88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4
diff --git a/dev-libs/zlog/zlog-1.2.14-r1.ebuild b/dev-libs/zlog/zlog-1.2.14-r1.ebuild
deleted file mode 100644
index 221a11e0e522..000000000000
--- a/dev-libs/zlog/zlog-1.2.14-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library"
-HOMEPAGE="http://hardysimpson.github.io/zlog/"
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}/zlog_no_static_lib.patch"
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_test() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
-}
-
-src_install() {
- emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
-}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 488b0b0838b4..decb85add924 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/asdf/asdf-3.3.5.ebuild b/dev-lisp/asdf/asdf-3.3.5.ebuild
index b1153ce7066e..6307fc5a133c 100644
--- a/dev-lisp/asdf/asdf-3.3.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PVR}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
@@ -22,6 +22,11 @@ DEPEND="!dev-lisp/cl-${PN}
PDEPEND="virtual/commonlisp
~dev-lisp/uiop-${PV}"
+PATCHES=(
+ # bug 841335, drop on next version bump
+ "${FILESDIR}"/${PN}-3.3.5-test-utilities.patch
+)
+
install_docs() {
(
cd doc || die
diff --git a/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch
new file mode 100644
index 000000000000..d8529d16823d
--- /dev/null
+++ b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/841335
+Taken from https://github.com/roswell/asdf/commit/fd289d99d1c76601fb310f8ca26a48f807337c8d
+
+From fd289d99d1c76601fb310f8ca26a48f807337c8d Mon Sep 17 00:00:00 2001
+From: "Robert P. Goldman"
+Date: Fri, 2 Jul 2021 15:57:34 -0500
+Subject: [PATCH] Fix garbled test.
+
+By accident a bad test slipped into a commit: this was due to my not
+understanding how `with-expected-failure` works.
+---
+ test/test-utilities.script | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-utilities.script b/test/test-utilities.script
+index 09a03347..b1e00fa5 100644
+--- a/test/test-utilities.script
++++ b/test/test-utilities.script
+@@ -342,7 +342,7 @@
+ ;; (assert (directory-exists-p oddball-pathname))
+ ;; (pathname oddball-namestring)
+ ;; (assert-equal nil (uiop:subdirectories oddball-namestring))
+-(with-expected-failure ("UIOP:SUBDIRECTORIES does not handle non-standard pathnames.")
++(with-expected-failure (#+(or sbcl cmucl) t)
+ (assert-equal nil (uiop:subdirectories "/[foo")))
+
+ (DBG "check to make sure WITH-CURRENT-DIRECTORY checks its parameter for directory pathname")
diff --git a/dev-lisp/clisp/clisp-2.49.92-r1.ebuild b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
index 7c6874ec2809..d6d762816742 100644
--- a/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2/8"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm threads +unicode +zlib"
# "jit" disabled ATM
diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
index 4d5567170d93..b2899cfbb426 100644
--- a/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
+++ b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
LICENSE="HyperSpec"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
src_install() {
docinto html
diff --git a/dev-lisp/uiop/uiop-3.3.5.ebuild b/dev-lisp/uiop/uiop-3.3.5.ebuild
index d591555987e7..2eace956027c 100644
--- a/dev-lisp/uiop/uiop-3.3.5.ebuild
+++ b/dev-lisp/uiop/uiop-3.3.5.ebuild
@@ -11,6 +11,6 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
RDEPEND="~dev-lisp/asdf-${PV}"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a4bbb70b9075..88abb26fce27 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
index 17d2eb22e3d1..657ea78413b5 100644
--- a/dev-ml/async/Manifest
+++ b/dev-ml/async/Manifest
@@ -1 +1,2 @@
DIST async-0.14.0.tar.gz 65025 BLAKE2B 39e2bef8df12a9733b9ff11ce1bba22b095f79532ff27999e617db5c145e57ab2e1f7f9435a5952312a84dd75b24d76fd4279c524be933e8ded5be7b00d6729a SHA512 3e57ea742ab28d008e1c0b39a6fc6d0ac3ca78b644f678f79b9ceb8d9acb23fcd45fed52f744906ab6d9b87955a27a8e4512043db45a7c836323d96433124b5c
+DIST async-0.15.0.tar.gz 73958 BLAKE2B 696e175c9f67760da7723ec93670a7360ffb59bd192eb2632172c76018b9964cfa005878af9a00a6adc09db99ca7d1cfda2eb286a2e4337e3d4986cdabec5d78 SHA512 61d83e23394f819f02df0e4702a7cd6f82418da3a8ef62513d99fb7c9c1052fcf80f90f95ab41977aebf3b54e09a0595768131a9b61a5d28f47a920492bca0bb
diff --git a/dev-ml/async/async-0.15.0.ebuild b/dev-ml/async/async-0.15.0.ebuild
new file mode 100644
index 000000000000..d9ef59997431
--- /dev/null
+++ b/dev-ml/async/async-0.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library"
+HOMEPAGE="https://github.com/janestreet/async"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+# Need qtest_lib, netkit_sockets
+# Unpackaged test deps
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/async_rpc_kernel:${SLOT}
+ dev-ml/async_unix:${SLOT}
+ dev-ml/textutils:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_extra/Manifest b/dev-ml/async_extra/Manifest
index 1b92167684c1..67871c5a2a3a 100644
--- a/dev-ml/async_extra/Manifest
+++ b/dev-ml/async_extra/Manifest
@@ -1 +1,2 @@
DIST async_extra-0.14.0.tar.gz 17746 BLAKE2B 46367dfb909ea02100be7718edbee8deac1c9019232723af6d80cf2567b2d17b316ae2355ffd9c9cd7897c3409c50cd4a7105a44a153eac02fa6326c195f237d SHA512 c646d9f69dac06aba973a837e295502b45bcda3ffbf3971f283035f2f60b5f92777fa105a08827971e8eae563b12b019341b29f30703b6490fec38d276a74199
+DIST async_extra-0.15.0.tar.gz 18236 BLAKE2B d780885e26fe49499f616d70acfafeff5022c9f6a6bcb0a6f89149162e10c5f921edf250bf31556fa5d845a1d1e95a91f650a00f8d8c23931742d70f183f7dc8 SHA512 d54c324b615dd6575024a1694790e247f1982949399aaab4b75a8918d819798c64c6d3a5fafd17274d3a3b0b45b7e3b022b4e263aad9701c2eecce3c25d032b7
diff --git a/dev-ml/async_extra/async_extra-0.15.0.ebuild b/dev-ml/async_extra/async_extra-0.15.0.ebuild
new file mode 100644
index 000000000000..eeeca95a16e6
--- /dev/null
+++ b/dev-ml/async_extra/async_extra-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)"
+HOMEPAGE="https://github.com/janestreet/async_extra"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/async_kernel:${SLOT}"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 9139e31de62e..86cbc5e94c3e 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1 +1,2 @@
DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
+DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81ec785bb29404b278ba93e093452354b045aacde98b0f2e6598bcd5fe29a86ee476f2f48f018c69acb7d217d4ba9a60b SHA512 35bf6561b0dfcfd1bfd786de9f47a78deee5718fb449de648f9b1cfd2568c00cd7044b33dce12ce48d1ed704e61fefe3f2d2b1681c9f73c6fced0aefb0423b63
diff --git a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
new file mode 100644
index 000000000000..133ca6500abd
--- /dev/null
+++ b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (core)"
+HOMEPAGE="https://github.com/janestreet/async_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/core_kernel:${SLOT}"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
index b4d3cb633eb5..9d5e2fd89761 100644
--- a/dev-ml/async_rpc_kernel/Manifest
+++ b/dev-ml/async_rpc_kernel/Manifest
@@ -1 +1,2 @@
DIST async_rpc_kernel-0.14.0.tar.gz 61643 BLAKE2B d80159c598470718196fe33893a3346d4ac3f7a781ef453e9eaa90cbeede83c97b9333625cd3d0552ea5b14ae039f98c204c4f658dd7810ea4ae449b967f755f SHA512 991b7cdb71b0363355a93fca009cd5d982de4d749c356b208987d1ae9c9b48fce5c59c4b4697042034135ad4c1a9467eb1a5d1f43237c5b081ab3aba2d72bb10
+DIST async_rpc_kernel-0.15.0.tar.gz 65182 BLAKE2B bd809bcdb17de6fe2765bc536b26c6c6daa9125c64a9dccdc80417136000624c3eeff36fc404d1e3f04535fb6f256af8ac7eec5e5547147f2f343104095e50ce SHA512 29ddd5cffd53acd02de1dfac2291d74e69673c6fab6586e8ed2d0edff98b176dbe05b80da0839d394e7601e1a33aec5bafb9678a46665c847878567378e2e648
diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
new file mode 100644
index 000000000000..7e000a1b3ae6
--- /dev/null
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Platform-independent core of Async RPC library"
+HOMEPAGE="https://github.com/janestreet/async_rpc_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/async_kernel:${SLOT}
+ dev-ml/protocol_version_header:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index 4d67af5d41f6..994715b9ceec 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1 +1,2 @@
DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
+DIST async_unix-0.15.0.tar.gz 178320 BLAKE2B 825efe071ecfb39ff0d5586cd8981c31a4692ee5b44727fdb22d68bfc08f9f1e296a363b87c308bef7cdd557dc9124da21bd1e772fe47dcde917b6bc5024500d SHA512 d6bb561ca06b3232c11c10bfe9dbd689020d52dc90f13f01751abf31f968649c7c8664f5f58de95c89f012de00c789efa9c0ca230ba32b9105c609d1afca2a51
diff --git a/dev-ml/async_unix/async_unix-0.15.0.ebuild b/dev-ml/async_unix/async_unix-0.15.0.ebuild
new file mode 100644
index 000000000000..16e04b7a7169
--- /dev/null
+++ b/dev-ml/async_unix/async_unix-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)"
+HOMEPAGE="https://github.com/janestreet/async_unix"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/async_kernel:${SLOT}
+ dev-ml/core_unix:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index b74bbf22c424..032b2d2e7f96 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1 +1,2 @@
DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
+DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
diff --git a/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild
new file mode 100644
index 000000000000..60c915d00330
--- /dev/null
+++ b/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="String type based on Bigarray, for use in I/O and C-bindings"
+HOMEPAGE="https://github.com/janestreet/base_bigstring"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/int_repr:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 7e2546e715c7..1eded4aea16b 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,2 +1,3 @@
DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
+DIST base_quickcheck-0.15.0.tar.gz 73702 BLAKE2B 0f671b6e48d38ac92b8e5150c1b6f7c4a1326cf12fcf3c14edf7ef376ca1769f8d708755a3b6cfc69a4d74de8d84affbc14838fc9385f487f2053936f1f116fa SHA512 e5362d70469c085239efaabbca6ca2558cb1609dfd2c3715d5c31047c8ae34b8304b9d28636806305f226929b0f9e3518b409de08f42f389963378f2aee6b351
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.15.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.15.0.ebuild
new file mode 100644
index 000000000000..916057e1d07d
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppx_base:${SLOT}
+ dev-ml/ppx_fields_conv:${SLOT}
+ dev-ml/ppx_let:${SLOT}
+ dev-ml/ppx_sexp_value:${SLOT}
+ dev-ml/splittable_random:${SLOT}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/bin_prot/bin_prot-0.15.0-r1.ebuild b/dev-ml/bin_prot/bin_prot-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..12137c5c8cf7
--- /dev/null
+++ b/dev-ml/bin_prot/bin_prot-0.15.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-ml/base-0.14.0:=
+ dev-ml/findlib:=
+ >=dev-ml/ppx_compare-0.14.0:=
+ >=dev-ml/ppx_custom_printf-0.14.0:=
+ >=dev-ml/ppx_fields_conv-0.14.0:=
+ >=dev-ml/ppx_optcomp-0.14.0:=
+ >=dev-ml/ppx_sexp_conv-0.14.0:=
+ >=dev-ml/ppx_variants_conv-0.14.0:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/bin_prot/bin_prot-0.15.0.ebuild b/dev-ml/bin_prot/bin_prot-0.15.0.ebuild
deleted file mode 100644
index ea2143f093dd..000000000000
--- a/dev-ml/bin_prot/bin_prot-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Binary protocol generator"
-HOMEPAGE="https://github.com/janestreet/bin_prot"
-SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
- >=dev-ml/base-0.14.0:=
- dev-ml/findlib:=
- >=dev-ml/ppx_compare-0.14.0:=
- >=dev-ml/ppx_custom_printf-0.14.0:=
- >=dev-ml/ppx_fields_conv-0.14.0:=
- >=dev-ml/ppx_optcomp-0.14.0:=
- >=dev-ml/ppx_sexp_conv-0.14.0:=
- >=dev-ml/ppx_variants_conv-0.14.0:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index f0084c0cd37c..da05b1c54114 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,2 +1,3 @@
DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42fd9a60d6c4c894187671526ae07e0b93d29bee961b3460e1b0ec5cb346cc711d583c71fde94a9bf9992bf7e SHA512 29482b1f611f2f15f11562bfed7f8a47d2926333601ed57867c8c134d4b10dbf2ba0309ceb6ae602fe8bca1e1f9324603dba37a5df3183cd0cb690104817ed3f
+DIST core-0.15.0.tar.gz 522984 BLAKE2B b6fdc9d7fe133c504f89ba492e63d090e2ca4e413e96eb8c216213ea358d84ae89ef1d372525b53f701e8076e4e0670ea3535f399f3f735b3b7da383901def09 SHA512 a73a3c1c6f0ade9a9e49917bb896e62afc4fda44dd90ffa99ef9ba24debe7166b4fe1b374500a044cad8318d12f250de7fe2dd935015efde379cf91a2241f51b
diff --git a/dev-ml/core/core-0.15.0.ebuild b/dev-ml/core/core-0.15.0.ebuild
new file mode 100644
index 000000000000..c3dd438a91e0
--- /dev/null
+++ b/dev-ml/core/core-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+# TODO: Wants quickcheck_deprecated?
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/base_bigstring:${SLOT}
+ dev-ml/ppx_jane:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index a603f701b021..06ce7f87f073 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1 +1,2 @@
DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
+DIST core_bench-0.15.0.tar.gz 46920 BLAKE2B 44ca0845abc8a593c5685305e2175b04dff32219488945f5ca7c00a6b139d9cf99bcdb865259b17625decb865916ef04eef4feff2d4ae8299986097ad7ec9d27 SHA512 eb8574d3f1444f4aad0ce73da372d6283a7d03aa636dc47fb6e918c1a2c47241fcffe52a6015e93b7ebd98f59e00a3d61f97fb7222400f4ca59f60a7ba430ec2
diff --git a/dev-ml/core_bench/core_bench-0.15.0.ebuild b/dev-ml/core_bench/core_bench-0.15.0.ebuild
new file mode 100644
index 000000000000..9aa2ce3d12cc
--- /dev/null
+++ b/dev-ml/core_bench/core_bench-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Micro-benchmarking library for OCaml"
+HOMEPAGE="https://github.com/janestreet/core_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/textutils:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 2571279db940..eae239b4c356 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,2 +1,3 @@
DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33
DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de
+DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
diff --git a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
new file mode 100644
index 000000000000..ca705633bcf6
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+# Wants quickcheck_deprecated for now
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/core:${SLOT}
+ dev-ml/int_repr:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/core_unix/Manifest b/dev-ml/core_unix/Manifest
new file mode 100644
index 000000000000..182d7d23c228
--- /dev/null
+++ b/dev-ml/core_unix/Manifest
@@ -0,0 +1 @@
+DIST core_unix-0.15.0.tar.gz 377928 BLAKE2B 49b58471a28c356bdf39f15e22bd21ec4363182cf744c0455847ffc15015fdad2928a428986c2a9edff647ebef9f2ad2059b184b393e979119c8f007f67ec140 SHA512 eeb53bd0c06a7d1facfb133f0a45a232d57941eff644d4ed6c2d5002acd4e6b323376ec9c05838f760ebd9da3fbc39332989ed50b3921191c175811c947fcbfe
diff --git a/dev-ml/core_unix/core_unix-0.15.0.ebuild b/dev-ml/core_unix/core_unix-0.15.0.ebuild
new file mode 100644
index 000000000000..8ab4e487041f
--- /dev/null
+++ b/dev-ml/core_unix/core_unix-0.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit dune
+
+DESCRIPTION="Unix-specific portions of Core"
+HOMEPAGE="https://github.com/janestreet/core_unix"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/core_kernel:${SLOT}
+ dev-ml/expect_test_helpers_core:${SLOT}
+ dev-ml/ocaml_intrinsics:${SLOT}
+ dev-ml/timezone:${SLOT}
+ dev-ml/spawn:${SLOT}
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/core_unix/metadata.xml b/dev-ml/core_unix/metadata.xml
new file mode 100644
index 000000000000..75a95cdd0266
--- /dev/null
+++ b/dev-ml/core_unix/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/core_unix
+
+
diff --git a/dev-ml/expect_test_helpers_core/Manifest b/dev-ml/expect_test_helpers_core/Manifest
new file mode 100644
index 000000000000..f8e57605ef9e
--- /dev/null
+++ b/dev-ml/expect_test_helpers_core/Manifest
@@ -0,0 +1 @@
+DIST expect_test_helpers_core-0.15.0.tar.gz 19807 BLAKE2B aca6103a7a50d7cf666ff6acb7b5430a5b0667efe039d200bc9ed2e430b91c4ed9a75378ceb0142e5d8d419ca6b3be508dc75c8e7fb5ff23101ebc012c70a9c0 SHA512 c08bda03c3bbc5c7ee1e970b5ba03e319826b7dd550d073f69b373bfa429c489ae1fcd388a2629f3d81729a96aac5614b4b1bcadd4040a290ffaab55b26bb9d6
diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0.ebuild
new file mode 100644
index 000000000000..d31c5f3d9df4
--- /dev/null
+++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit dune
+
+DESCRIPTION="Helpers for writing expectation tests"
+HOMEPAGE="https://github.com/janestreet/expect_test_helpers_core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppx_jane:${SLOT}
+ dev-ml/sexp_pretty:${SLOT}
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/expect_test_helpers_core/metadata.xml b/dev-ml/expect_test_helpers_core/metadata.xml
new file mode 100644
index 000000000000..75c2f2cf0a19
--- /dev/null
+++ b/dev-ml/expect_test_helpers_core/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/expect_test_helpers_core
+
+
diff --git a/dev-ml/int_repr/Manifest b/dev-ml/int_repr/Manifest
new file mode 100644
index 000000000000..9cae55d8d193
--- /dev/null
+++ b/dev-ml/int_repr/Manifest
@@ -0,0 +1 @@
+DIST int_repr-0.15.0.tar.gz 9105 BLAKE2B a2a8197cdba7c4805c9eb9402e1c853619fc142bd057c4b42a578bcfdc97b417751634a31bab1ccd5c2e75cfbef46d33b6daf76da5ed4e3c9ec26d5c81fd3b73 SHA512 96537591fc597264347f967757df979344224f84594949bca96b40298e4ae1d7b28b40f3705ad4f85e3801724c6388fc048271216703b81fda0e56a314f3e88f
diff --git a/dev-ml/int_repr/int_repr-0.15.0.ebuild b/dev-ml/int_repr/int_repr-0.15.0.ebuild
new file mode 100644
index 000000000000..8bdf0e71886b
--- /dev/null
+++ b/dev-ml/int_repr/int_repr-0.15.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Integers of various widths"
+HOMEPAGE="https://github.com/janestreet/int_repr"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/ppx_jane:${SLOT}"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/int_repr/metadata.xml b/dev-ml/int_repr/metadata.xml
new file mode 100644
index 000000000000..762c50d1612f
--- /dev/null
+++ b/dev-ml/int_repr/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/int_repr
+
+
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..a4c44d1b6a3f
--- /dev/null
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Jane Street header files"
+HOMEPAGE="https://github.com/janestreet/jane-street-headers"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.15.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.15.0.ebuild
deleted file mode 100644
index 216133ae7a2f..000000000000
--- a/dev-ml/jane-street-headers/jane-street-headers-0.15.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Jane Street header files"
-HOMEPAGE="https://github.com/janestreet/jane-street-headers"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild b/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..02eeef8ef889
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Compile-time configuration for Jane Street libraries"
+HOMEPAGE="https://github.com/janestreet/jst-config"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:=
+ dev-ml/ppx_assert:=
+ dev-ml/stdio:=
+ dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jst-config/jst-config-0.15.0.ebuild b/dev-ml/jst-config/jst-config-0.15.0.ebuild
deleted file mode 100644
index 8bdab1badbf5..000000000000
--- a/dev-ml/jst-config/jst-config-0.15.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Compile-time configuration for Jane Street libraries"
-HOMEPAGE="https://github.com/janestreet/jst-config"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
- dev-ml/base:=
- dev-ml/ppx_assert:=
- dev-ml/stdio:=
- dev-ml/dune-configurator:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index a785ef33c460..4dfb61c584a9 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,3 @@
-DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
deleted file mode 100644
index eadb980e8aa5..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-lang/ocaml-4.00.0:0=
- dev-ml/ocaml-ctypes:=
- ~sys-devel/llvm-${PV}:=[debug?]
- !sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
- RDEPEND+="
- ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/perl
- dev-ml/findlib
- >=dev-util/cmake-3.16
- test? ( dev-ml/ounit2 )
- ${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
- -DBUILD_SHARED_LIBS=OFF
- -DLLVM_BUILD_LLVM_DYLIB=ON
- -DLLVM_LINK_LLVM_DYLIB=ON
- -DLLVM_OCAML_OUT_OF_TREE=ON
-
- # cheap hack: LLVM combines both anyway, and the only difference
- # is that the former list is explicitly verified at cmake time
- -DLLVM_TARGETS_TO_BUILD=""
- -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
- -DLLVM_BUILD_TESTS=$(usex test)
-
- # disable various irrelevant deps and settings
- -DLLVM_ENABLE_FFI=OFF
- -DLLVM_ENABLE_TERMINFO=OFF
- -DHAVE_HISTEDIT_H=NO
- -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
- -DLLVM_ENABLE_EH=ON
- -DLLVM_ENABLE_RTTI=ON
-
- -DLLVM_HOST_TRIPLE="${CHOST}"
-
- -DPython3_EXECUTABLE="${PYTHON}"
-
- # disable go bindings
- -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
- # TODO: ocamldoc
- )
-
- use test && mycmakeargs+=(
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- )
-
- # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
- # also: custom rules for OCaml do not work for CPPFLAGS
- use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
- cmake_src_configure
-
- local llvm_libdir=$(llvm-config --libdir)
- # an ugly hack; TODO: figure out a way to pass -L to ocaml...
- cd "${BUILD_DIR}/${libdir}" || die
- ln -s "${llvm_libdir}"/*.so . || die
-
- if use test; then
- local llvm_bindir=$(llvm-config --bindir)
- # Force using system-installed tools.
- sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
- "${BUILD_DIR}"/test/lit.site.cfg.py || die
- fi
-}
-
-src_compile() {
- cmake_build ocaml_all
-}
-
-src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
- DESTDIR="${D}" \
- cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
- dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
index 9263abe8c53e..204608ff33a4 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit cmake llvm llvm.org python-any-r1
@@ -19,14 +19,18 @@ RDEPEND="
>=dev-lang/ocaml-4.00.0:0=
dev-ml/ocaml-ctypes:=
~sys-devel/llvm-${PV}:=[debug?]
- !sys-devel/llvm[ocaml(-)]"
+ !sys-devel/llvm[ocaml(-)]
+"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+"
BDEPEND="
+ ${PYTHON_DEPS}
dev-lang/perl
dev-ml/findlib
>=dev-util/cmake-3.16
- ${PYTHON_DEPS}"
+"
LLVM_COMPONENTS=( llvm cmake third-party )
LLVM_USE_TARGETS=llvm
diff --git a/dev-ml/ocaml_intrinsics/Manifest b/dev-ml/ocaml_intrinsics/Manifest
new file mode 100644
index 000000000000..e222c3b6f123
--- /dev/null
+++ b/dev-ml/ocaml_intrinsics/Manifest
@@ -0,0 +1 @@
+DIST ocaml_intrinsics-0.15.1.tar.gz 24925 BLAKE2B 15d74ee891aced288aa734ef4d70a4816f2d2725d0d445620154bec7d1667d3ac06c5ddd778777d15858cbf198ecd978b22959fe68e159ddd9dbbd32304c3077 SHA512 cb0ac26bc34c97eb0429e6833342dbd9fca6f1f4a40b8121f9e6364bd2cdc40676a164d7405454727ced9a4455adb0e3cac5118beb7ab70206adbd3e7f7937e2
diff --git a/dev-ml/ocaml_intrinsics/metadata.xml b/dev-ml/ocaml_intrinsics/metadata.xml
new file mode 100644
index 000000000000..fec13523d489
--- /dev/null
+++ b/dev-ml/ocaml_intrinsics/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/ocaml_instrinsics
+
+
diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild
new file mode 100644
index 000000000000..e4b6ad5d30b8
--- /dev/null
+++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="invoke amd64 instructions (such as clz,popcnt,rdtsc,rdpmc)"
+HOMEPAGE="https://github.com/janestreet/ocaml_intrinsics"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-4.08
+ dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index 5648b021c4a7..746fe5ac6ac4 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1 +1,2 @@
DIST patience_diff-0.14.0.tar.gz 20060 BLAKE2B d47d9a93ef0a7eeada7f050aec0427f8352343609da1332de59d6b3ced41e9942556e1d61e12ab2075bc15cf29afc60191f48da43c1a4358d414352eb6efd044 SHA512 d253488402e515d56ed9d83ef45edfce378d6ad5148d80f8d81341cff28d19115350d72cc057ecd6c14b907888eca8e6bce1b8e71c7a978149979a16a5512fd2
+DIST patience_diff-0.15.0.tar.gz 20434 BLAKE2B 52e0f1d3437f97d384224cd06035802376fe2af97c085e183f99934f6f8238270723505cda7c617b7847fa4d5f51abbfaa58cd25aac5f0eeb56b42559e91421a SHA512 d3cbf2b2fb8618cd3342abcb7beea110a93b0e8f6984f3becdf9066c717f6f7832f86a8fb72ac56c587cbd6e5abecf07c0b98d9ec1cb7a40bfb9d4a5b1de12ba
diff --git a/dev-ml/patience_diff/patience_diff-0.15.0.ebuild b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild
new file mode 100644
index 000000000000..00760fb0e14f
--- /dev/null
+++ b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Tool and library implementing patience diff"
+HOMEPAGE="https://github.com/janestreet/patience_diff"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~riscv"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index b53d101aa080..459c2987ddab 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1 +1,2 @@
DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63
+DIST ppx_bench-0.15.0.tar.gz 9530 BLAKE2B d001817a4e912f7a9345e94a1f5104d0f1b6c35420892cb5cbf7eb7d9e7130de3406a9c9803b6dce9bd17e300d34a3df3dc5fd87d240637c3e3a8667b3191c87 SHA512 f3ab84c7c820735c429ae2250462226efc61d7099071a91dd9471d2052b807dca57c07661336d7f908e2104c1bc0095512429865b2528749cbc407e314e845df
diff --git a/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild
new file mode 100644
index 000000000000..a286901987c3
--- /dev/null
+++ b/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/ppx_inline_test:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index 8a9a08861fb4..2438fb8a4604 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1 +1,2 @@
DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
+DIST ppx_bin_prot-0.15.0.tar.gz 37045 BLAKE2B 6ec039c1b18c759a676c1da30f02d70799e93d77dcd530844b2a448e4f2a58fbdf9c88f0d4a802a34070959586e7b9c7b1be1b51de9d29d34ea57fba9c7938cf SHA512 3fdc7e9431458b752d553f093762e3ed3c96af3a789eceeb94895284de961a887e358d137c21da372cadf6c0e6329628f6c698499581f672e0e1913b3274cc14
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0.ebuild
new file mode 100644
index 000000000000..b58e50d24335
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Generation of bin_prot readers and writers from types"
+HOMEPAGE="https://github.com/janestreet/ppx_bin_prot"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/bin_prot:${SLOT}
+ dev-ml/ppx_here:${SLOT}
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-ml/ppx_jane
+ )"
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index 62a69ebf3d15..c2d0ede4ff2f 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1,2 +1,3 @@
DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c
DIST ppx_custom_printf-0.14.1.tar.gz 9606 BLAKE2B 81999f3534fcf8daa965274f93812442b170c8bb7bd05d6b4ba2cb7f506e6bba44dadec355733adec790262be25ad62016356cdf7e0ddcebf2080a3238314543 SHA512 0acb5a2964c996a34d1759c1db73219d4db813ab6b96f80feffae34cbcd73fc8c8ab40ccad7ad378d730acb45eff26906533b29716398fc1c10a7bb4ff949443
+DIST ppx_custom_printf-0.15.0.tar.gz 9609 BLAKE2B f9a855559bea50d2aec44cc5ed78010afa66bfafe12906a0f115ba484709a759383b41e7bc4fb8557e9869c0c67a6035451a7f1184be0658371c4300e593de39 SHA512 f8776e9037f491b120b0d43ac9b76231c422b9e5f0d7c3f75efdadf9d4ec401266d61f441a2c7c831c99fac10ac98d84e4e62eda44e6fc86f2fa60ead5ecbc86
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0.ebuild
new file mode 100644
index 000000000000..14862e262843
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Printf-style format-strings for user-defined string conversion"
+HOMEPAGE="https://github.com/janestreet/ppx_custom_printf"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/ppx_sexp_conv:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_disable_unused_warnings/Manifest b/dev-ml/ppx_disable_unused_warnings/Manifest
new file mode 100644
index 000000000000..d7a0c0115099
--- /dev/null
+++ b/dev-ml/ppx_disable_unused_warnings/Manifest
@@ -0,0 +1 @@
+DIST ppx_disable_unused_warnings-0.15.0.tar.gz 3966 BLAKE2B b087baa50ae3e0dd926221a69d0c3121ebeea431c08d0dbcc9cf5edee28e69c076e2f77c3b992757e56d03a6487ecd6257fec6a0373294cca6cdef7f71412216 SHA512 837bb96b5cc2623205ce778e6100d97a0a029e8c20a945509c06ee44784e67b8e9033b5387681c0f86c07f48ca4541e356ca62e19c1baa8d1b52c813400bb024
diff --git a/dev-ml/ppx_disable_unused_warnings/metadata.xml b/dev-ml/ppx_disable_unused_warnings/metadata.xml
new file mode 100644
index 000000000000..f3fb81043b2d
--- /dev/null
+++ b/dev-ml/ppx_disable_unused_warnings/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/ppx_disable_unused_warnings
+
+
diff --git a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0.ebuild b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0.ebuild
new file mode 100644
index 000000000000..d5441c2a180b
--- /dev/null
+++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Expands [@disable_unused_warnings]"
+HOMEPAGE="https://github.com/janestreet/ppx_disable_unused_warnings"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ >=dev-ml/ppxlib-0.23.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..c3a60268154f
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT="test"
+
+RDEPEND="
+ dev-ml/ppx_inline_test:${SLOT}
+ dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_expect/ppx_expect-0.15.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.15.0.ebuild
deleted file mode 100644
index bfb2a190211d..000000000000
--- a/dev-ml/ppx_expect/ppx_expect-0.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Cram like framework for OCaml"
-HOMEPAGE="https://github.com/janestreet/ppx_expect"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-# https://bugs.gentoo.org/749291#c2
-RESTRICT="test"
-
-RDEPEND="
- =dev-ml/base-0.15*:=
- >=dev-ml/ppx_here-0.14.0:=
- =dev-ml/ppx_inline_test-0.15*:=
- =dev-ml/stdio-0.15*:=
- >=dev-ml/ppxlib-0.23.0:=
- >=dev-ml/ocaml-compiler-libs-0.11.0:=
- >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
- dev-ml/cinaps:=
- dev-ml/re:=
- =dev-ml/ppx_sexp_conv-0.15*:=
- >=dev-lang/ocaml-4.09
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
index c228adbc79c9..a25f68df469d 100644
--- a/dev-ml/ppx_fixed_literal/Manifest
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -1 +1,2 @@
DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2
+DIST ppx_fixed_literal-0.15.0.tar.gz 3655 BLAKE2B 3599a5eea1cc691dd16feda7bb95867ad32976df511d6618e6e655deda4ebb6a6a44f30856e9dca26f7ac878b1beaa8086a5dfc241ed6a354a8d064c7d9bd09a SHA512 3842162928f6a87b39abaea15cbed8c8f59349b20711d6f8af011cd0dec48a75f59e422db6907425203fc98f438dd758a3e8973900844b60cbf47f27bc9ac394
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild
new file mode 100644
index 000000000000..432f8629b312
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Simpler notation for fixed point literals"
+HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal"
+SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ dev-ml/findlib:=
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_ignore_instrumentation/Manifest b/dev-ml/ppx_ignore_instrumentation/Manifest
new file mode 100644
index 000000000000..48731f202853
--- /dev/null
+++ b/dev-ml/ppx_ignore_instrumentation/Manifest
@@ -0,0 +1 @@
+DIST ppx_ignore_instrumentation-0.15.0.tar.gz 3679 BLAKE2B 3537d4336a2299e277fcf1e58690233a9e1ecd94c80d144376bef90b45b3c2c94a8eaf5e5ba2b90b12d8f4e3afc257461c4732a2fadba8aa91c7f35ff036fb0f SHA512 ec411cb7a191fcb36f9a29f8ff3839db6f4031e30fa3444896a07235950ca04562a701b3bc7bc5df95e3ff82cfe8996be75bd5dce4bcce8a491898df1bffc50d
diff --git a/dev-ml/ppx_ignore_instrumentation/metadata.xml b/dev-ml/ppx_ignore_instrumentation/metadata.xml
new file mode 100644
index 000000000000..eac78c11ed14
--- /dev/null
+++ b/dev-ml/ppx_ignore_instrumentation/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/ppx_ignore_instrumentation
+
+
diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0.ebuild
new file mode 100644
index 000000000000..ee7845db3535
--- /dev/null
+++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit dune
+
+DESCRIPTION="Ignore Jane Street specific instrumentation extensions"
+HOMEPAGE="https://github.com/janestreet/ppx_ignore_instrumentation"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-ml/ppxlib-0.23.0"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..4e2d2816dc0f
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/time_now:${SLOT}"
+RDEPEND="${DEPEND}"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT=test
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0.ebuild
deleted file mode 100644
index e2081d10dd3e..000000000000
--- a/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
-HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
- =dev-ml/base-0.15*:=
- >=dev-ml/ppxlib-0.23.0:=
- >=dev-ml/ocaml-compiler-libs-0.11.0:=
- >=dev-ml/ocaml-migrate-parsetree-2.0.0:=
- dev-ml/cinaps:=
- >=dev-ml/time_now-0.14.0:=
-"
-RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/749291#c2
-RESTRICT=test
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index 7c62b94aff8a..ebce4217d319 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1 +1,2 @@
DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
+DIST ppx_jane-0.15.0.tar.gz 4647 BLAKE2B c8916e7327301a2dc54b36cc29ad61f3ef016aac2f07dd8c1421a84b144b406e9b189e229680f700efaf2138c508f30e0d132dcf726165ac60ad3120f67549d7 SHA512 e594a0caea66e0f976615b2a1db50aad89389888678d9ec7c023b2adb3211817a841a5065de9a65956bde0cb6088ce1b0b3afed6b57b618b9b50e5c07684e3fa
diff --git a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
new file mode 100644
index 000000000000..c20798f7d4e8
--- /dev/null
+++ b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Standard Jane Street ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_jane"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base_quickcheck:${SLOT}
+ dev-ml/ppx_bin_prot:${SLOT}
+ dev-ml/ppx_disable_unused_warnings:${SLOT}
+ dev-ml/ppx_expect:${SLOT}
+ dev-ml/ppx_fixed_literal:${SLOT}
+ dev-ml/ppx_ignore_instrumentation:${SLOT}
+ dev-ml/ppx_log:${SLOT}
+ dev-ml/ppx_module_timer:${SLOT}
+ dev-ml/ppx_optional:${SLOT}
+ dev-ml/ppx_pipebang:${SLOT}
+ dev-ml/ppx_stable:${SLOT}
+ dev-ml/ppx_string:${SLOT}
+ dev-ml/ppx_typerep_conv:${SLOT}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index 4ca1d811d6ed..833d13258669 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1,2 +1,3 @@
DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c451c556853aa54d8dbbd7040a76df37ac8942ae05cdcbbe6d839a64d5b471f53a2fce276e547a17e68490c1ec1ab19 SHA512 3561b7668bafc421fa82c3c80e019185924bfc8cafab6ef81299395061db78261005bdd34be5bed8a80bec84306b9294e6398a3a1ee0a269f7b8f3942953a6a4
DIST ppx_js_style-0.14.1.tar.gz 10587 BLAKE2B a77868e692180a386622fc19f696a24a9cd33863289a673d142c63003e5345a9cbe8921a7c1cf163db97f21da45c4940978f4e5d6960abc1fbc44b4283f09b42 SHA512 7c96d0e21c68956f3c94d6b6f02d70451d7e041104975171c8fb1c0f5dbcdf5b2111c5d05b247a47523abc7cf30b9d20cac267e542db459154edfe77516d2c46
+DIST ppx_js_style-0.15.0.tar.gz 10647 BLAKE2B d7cf2efa261383084a8f4bfc2508d8c345415b50e6ea83128bd40cffbcbe7eabc8fbb3037176ba73c303de199ca3cc96925e077c123a7f3a68e0a5c7470d56eb SHA512 10e4e9d737551538cdd89466acf76df04e87669f00236bc89fcad318b862efcee94f59a687d07fe5a559c00a59954b07185dd39e034d4a15869c281eea2bec4e
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.15.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.15.0.ebuild
new file mode 100644
index 000000000000..a35563b5c809
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Code style checker for Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/ppx_js_style"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ dev-ml/findlib:=
+ dev-ml/octavius:=
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_log/Manifest b/dev-ml/ppx_log/Manifest
new file mode 100644
index 000000000000..31481663845b
--- /dev/null
+++ b/dev-ml/ppx_log/Manifest
@@ -0,0 +1 @@
+DIST ppx_log-0.15.0.tar.gz 6672 BLAKE2B 3b45e705dfe6256d95e52b3fb1b1f98599d48fba6d4c565df95319566d5ab62965182d265db68a9b2f0b7e32103861639ff9ca46e1980e93e63abdeae83e79cd SHA512 1585f82615def2fc1c94853e9a1b9e3ebd2ef8193067f229f24580ea124c06736a2b361377801b9a44b7347e1938da051ed652764142e2270de3d3e8f375bf46
diff --git a/dev-ml/ppx_log/metadata.xml b/dev-ml/ppx_log/metadata.xml
new file mode 100644
index 000000000000..0a492ea7ad77
--- /dev/null
+++ b/dev-ml/ppx_log/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/ppx_log
+
+
diff --git a/dev-ml/ppx_log/ppx_log-0.15.0.ebuild b/dev-ml/ppx_log/ppx_log-0.15.0.ebuild
new file mode 100644
index 000000000000..3f2040cb7317
--- /dev/null
+++ b/dev-ml/ppx_log/ppx_log-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit dune
+
+DESCRIPTION="Lazily rendering log messages"
+HOMEPAGE="https://github.com/janestreet/ppx_log"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppx_sexp_message:${SLOT}
+ dev-ml/sexplib:${SLOT}
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
index e07961242984..9b24e549140f 100644
--- a/dev-ml/ppx_module_timer/Manifest
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -1 +1,2 @@
DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7
+DIST ppx_module_timer-0.15.0.tar.gz 7242 BLAKE2B 66c2bfbfcfc594ab568dd30cf874fea213fe8d72f23dbd9b56957ba95a8a01bcb8cb8f98ea42b399bad3afdba1c14edb5087a95720c87e22c865538166af4cf6 SHA512 4cd55dce6872cbed1d34c34043500651e605c406747914173584cee1d8f3ff298a75efeb8a4beb7840df76b5d7c7db98d15399d3c4a3a5dca2a11d57339df6de
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0.ebuild
new file mode 100644
index 000000000000..5f458264d918
--- /dev/null
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Ppx rewriter that records top-level module startup times"
+HOMEPAGE="https://github.com/janestreet/ppx_module_timer"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/time_now:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index ba84a1b65683..111954f46720 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,2 +1,3 @@
DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157
+DIST ppx_optcomp-0.15.0.tar.gz 16699 BLAKE2B b13f9aa50bd46a9ea552677b0c9bc611b6657e6ba7cff1e06d6489d2ffaa646bc3643eee08dbe07f52130ea27b3e607bbf620b0a94f8acdaf7bd045ab1a1c536 SHA512 302c2ab79c46a16b8a256167958ad9a87b34a2e7ddc70c7a5476cfb0feffc7de7bebc79c272526698e87804859555176facfb04bc72f3b4373c1cb138b1264c7
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.15.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.15.0.ebuild
new file mode 100644
index 000000000000..5eb0ec647f61
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Optional compilation for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_optcomp"
+SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ dev-ml/findlib:=
+ dev-ml/stdio:${SLOT}
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index 570af5344c3b..4008ef2eeb4c 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -1 +1,2 @@
DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40
+DIST ppx_optional-0.15.0.tar.gz 6090 BLAKE2B 89752ec6175f0334b922689b2f1b47ee078be0eb5f0432b9de18ac966a6e75e4bb36e4f5f4ab4e7be669de5805f2db8e35cf723cbc22e724451d748bf5437553 SHA512 a2cd8390877c9ec256523c796995a5ade2f97f396afe86493ac46ca1bd1fe15264423986f5a27d5b88908b92673305405e508e744335205ff17f6c2b7d7d0809
diff --git a/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild
new file mode 100644
index 000000000000..92e8050422a0
--- /dev/null
+++ b/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Pattern matching on flat options"
+HOMEPAGE="https://github.com/janestreet/ppx_optional"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ >=dev-ml/ppxlib-0.23.0:=
+ dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index 1e8201baf3a4..8705c60c84a2 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -1 +1,2 @@
DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a
+DIST ppx_pipebang-0.15.0.tar.gz 3759 BLAKE2B 6d2a45a4b803a777dcf055acccbea3e54a86458d01032efd01d204cf3426b496b9d91047216c11a424ef5e7ff92fc729d1ef8fb616f807c21f512be52013665a SHA512 778dae2cd6176f9ce18f20486e16f6f76e9137095759b29ddc10fee15d8a21f51fff94245c4a750ae68cd75edbd06b9cad6ff1b56aacb38ac9e6d7d71c0bf701
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0.ebuild
new file mode 100644
index 000000000000..40b93c106d46
--- /dev/null
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!"
+HOMEPAGE="https://github.com/janestreet/ppx_pipebang"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-4.08
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
index 4c65859c1972..7273ec1eb8d0 100644
--- a/dev-ml/ppx_stable/Manifest
+++ b/dev-ml/ppx_stable/Manifest
@@ -1 +1,2 @@
DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74
+DIST ppx_stable-0.15.0.tar.gz 18143 BLAKE2B cfd317f98c7683bd2faf29eb386939f07b30798f16e43abdfe9361f9f3d373d4b64ed13aa87f300e5f14052ad1bc636d402af84c9f15d9e26d7b2dc976c812af SHA512 1be50f061d55ea0fcb8bd846955da3ceb07b97986d74a06b41c0f6b5c0dfb3a55f9e39e47f64ae227ecce89dd31dc3b03082031748982419d4ce9a14b5cdb436
diff --git a/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild b/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild
new file mode 100644
index 000000000000..009a245f7bbf
--- /dev/null
+++ b/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Stable types conversions generator"
+HOMEPAGE="https://github.com/janestreet/ppx_stable"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/base:${SLOT}
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
index fb237031a530..47c7f3ae3629 100644
--- a/dev-ml/ppx_string/Manifest
+++ b/dev-ml/ppx_string/Manifest
@@ -1 +1,2 @@
DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee
+DIST ppx_string-0.15.0.tar.gz 6071 BLAKE2B 06e4761732db5aa5ee0214c68ac8ff95a85a38e6d62abaa45cc630d19036b0ed38ec0198a45871068d8bcc4f40176ac072da67e8f339cef3be3d64ace7a22e69 SHA512 bb1819017a6c25d581854e8487a0e5535fe282ec421c91e662c310c0d0aa7704be65484b3f2e721b29409e0eb68f72528e60380e036af066b3b1f1f11ea6cd5e
diff --git a/dev-ml/ppx_string/ppx_string-0.15.0.ebuild b/dev-ml/ppx_string/ppx_string-0.15.0.ebuild
new file mode 100644
index 000000000000..35d16f26cc7e
--- /dev/null
+++ b/dev-ml/ppx_string/ppx_string-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Ppx extension for string interpolation"
+HOMEPAGE="https://github.com/janestreet/ppx_string"
+SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppx_base:${SLOT}
+ dev-ml/stdio:${SLOT}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index ffb57b7d29e3..9e6e7d1d1068 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,2 +1,3 @@
DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
+DIST ppx_typerep_conv-0.15.0.tar.gz 9392 BLAKE2B 3f7d9ac373048434ea55deab18b25bd74da77116b20db841c412c3304f318a1b820708c3f9cb6eab1f92fda399d3e6168fc8b3cc0546501f4fc6b57da5f74414 SHA512 3f5bb2c70674e5f6219daa883fe948023a60558c9560c5d8e6b187e0420adf8767ce4f5cca06fe7edccd52e531b2e79d962f7fdc7502cb63280c364627621c73
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.15.0.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.15.0.ebuild
new file mode 100644
index 000000000000..b39d0f7e2ef7
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Generation of runtime types from type declarations"
+HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/typerep:${SLOT}
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 9fe3de27037e..c8e65fc848ca 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1,2 +1,3 @@
DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
DIST ppx_variants_conv-0.14.2.tar.gz 9626 BLAKE2B 1effb717e72237ec5522034d5885e6f2919eb80d16266b14cb4c2b9bf6b2d6e8792f3a8232130de7a1b6c51233add4984add36f8da74dd526d9e3cbbe0f14cd7 SHA512 1ae714bea76ba4856c5ab1a7266b28f0ca4462dea26afefe6953eae1ac683f98748cb6281155cc89380d25c81311f78afa6f44e39413fafa63bf043623538a48
+DIST ppx_variants_conv-0.15.0.tar.gz 10530 BLAKE2B 5947ce3056639ae54f7fb7aea16f1657997ef631f4544baae849023b3d9cc29c8711cc3913e3583b58db99afea793d4cfe13c189e3f0ca44e5ddb0e9515a0507 SHA512 549b8d7af75cb98bc6cfe3bc53d43a9bee5c767de149905faf76c0a97c5be86d14d784377805c3932423d4dc698375edbd52f1cf508a4d0f3ea8e79f7e284224
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.15.0.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.15.0.ebuild
new file mode 100644
index 000000000000..ac538464a02d
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types"
+HOMEPAGE="https://github.com/janestreet/ppx_variants_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/variantslib:${SLOT}
+ >=dev-ml/ppxlib-0.23.0:=
+ >=dev-ml/ocaml-compiler-libs-0.11.0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest
index 81392e6fc3b9..f72a8fd1f0d8 100644
--- a/dev-ml/protocol_version_header/Manifest
+++ b/dev-ml/protocol_version_header/Manifest
@@ -1 +1,2 @@
DIST protocol_version_header-0.14.0.tar.gz 6524 BLAKE2B 3463cfbfa2faf0573dec57e8d1eae5ed47f2210c7eb3872fcb5a9206bf65cc22f184944f4c624a17e44e267f3b0443f8e4fe33e8d40157e9f5afb68f0b7b5e4e SHA512 50f58d79a2c92a2f7b9f1cd54b548ae53649bd876f77a017b1483fda53cd1b398dbef7e992dcb283796d035fa361424c9529244b73d33d9ff2699dae70b6410a
+DIST protocol_version_header-0.15.0.tar.gz 7704 BLAKE2B 208254706a2d8ae9f77a9c9c40bfd8af34585a7e1f201338d888b12f804139868987532db9b4f862c659e3101c5ed493bb782f64ed251030e235937beb419d65 SHA512 1c28fbe26155dc5d780ce111725b21b95773d0a0bc3219a37e94b7c920c18e55fa33b31156f3ab3c02ae403c7f667f009f3ef7a965cadf7177c857bd71bd4956
diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
new file mode 100644
index 000000000000..59e0747530ac
--- /dev/null
+++ b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Protocol aware version negotiation for OCaml"
+HOMEPAGE="https://github.com/janestreet/protocol_version_header"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/core:${SLOT}"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexp_pretty/Manifest b/dev-ml/sexp_pretty/Manifest
new file mode 100644
index 000000000000..0b56b3b8d0ac
--- /dev/null
+++ b/dev-ml/sexp_pretty/Manifest
@@ -0,0 +1 @@
+DIST sexp_pretty-0.15.0.tar.gz 22407 BLAKE2B df8d246ebe1164f0d2d3ae78074c8249d2aa255a089e02eb9fcc0c21b808dc172da2da264d3b21b92dcc7bf9e51a2921ea8631eb45b45a46035447ead7abe02d SHA512 bc2a7aecfc3ae379a56e8940b9cc80ece686009c9f67233e7993e25ebbe251d62559601923db718a0f967cf42fc84024597c069659842760bb2ac5ce0eab8df2
diff --git a/dev-ml/sexp_pretty/metadata.xml b/dev-ml/sexp_pretty/metadata.xml
new file mode 100644
index 000000000000..7b8d25489544
--- /dev/null
+++ b/dev-ml/sexp_pretty/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/sexp_pretty
+
+
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.0.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.0.ebuild
new file mode 100644
index 000000000000..a7320a57b1d9
--- /dev/null
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="S-expression pretty-printer"
+HOMEPAGE="https://github.com/janestreet/sexp_pretty"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/ppx_base:${SLOT}
+ dev-ml/sexplib:${SLOT}
+ dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/sexplib/sexplib-0.15.0-r1.ebuild b/dev-ml/sexplib/sexplib-0.15.0-r1.ebuild
deleted file mode 100644
index 6fecbe6ed739..000000000000
--- a/dev-ml/sexplib/sexplib-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
-HOMEPAGE="https://github.com/janestreet/sexplib"
-SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
- dev-ml/parsexp:=
- dev-ml/base:=
- dev-ml/sexplib0:=
- dev-ml/num:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild b/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild
new file mode 100644
index 000000000000..bd2b1329a0db
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.15.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/parsexp:=
+ dev-ml/base:=
+ dev-ml/sexplib0:=
+ dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/spawn/spawn-0.15.0-r1.ebuild b/dev-ml/spawn/spawn-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..14f286a60e35
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.15.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/spawn/spawn-0.15.0.ebuild b/dev-ml/spawn/spawn-0.15.0.ebuild
deleted file mode 100644
index 9370f55a8646..000000000000
--- a/dev-ml/spawn/spawn-0.15.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Spawning sub-processes"
-HOMEPAGE="https://github.com/janestreet/spawn"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
index 4b4e05848579..433aeb3603c7 100644
--- a/dev-ml/splittable_random/Manifest
+++ b/dev-ml/splittable_random/Manifest
@@ -1 +1,2 @@
DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94
+DIST splittable_random-0.15.0.tar.gz 9945 BLAKE2B 66083ed6dba1acad98570431497074a551c107c2b0c0d812f1771ee94e4c52b34373fd152f4afef73383dcca378d2cb623718406c55038d879fa3b3ead329166 SHA512 10adeedcda260301f8866a8f128d2f6a59ebbb70898fd82bf2c9db9b40cb1bc24bdb9706d0d0983e8abd8c4a4a920b06d16a3196dc6ba522b13af5c4b9302811
diff --git a/dev-ml/splittable_random/splittable_random-0.15.0.ebuild b/dev-ml/splittable_random/splittable_random-0.15.0.ebuild
new file mode 100644
index 000000000000..03813b3431ca
--- /dev/null
+++ b/dev-ml/splittable_random/splittable_random-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="PRNG that can be split into independent streams"
+HOMEPAGE="https://github.com/janestreet/splittable_random"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/ppx_bench:${SLOT}
+ dev-ml/ppx_sexp_message:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index f44fad191286..560bc53028d5 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1 +1,2 @@
DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3
+DIST textutils-0.15.0.tar.gz 15477 BLAKE2B ceb8482f8c76323bdd08c9c065220868dcc5405e4461d2b787e78e458ac0f7872519955a3c8247217517b12ec4450dd4452d7ae4d5a851151aa4e47f655f009b SHA512 d45dd57a3490330ab800cd06903bba760e89fc46b1209d3ad91395a729f999fec1af62f3c74c08d0270fb7a89de115f1cc08bdaf77d74a043183e629fc367e1b
diff --git a/dev-ml/textutils/textutils-0.15.0.ebuild b/dev-ml/textutils/textutils-0.15.0.ebuild
new file mode 100644
index 000000000000..18d2948c2b90
--- /dev/null
+++ b/dev-ml/textutils/textutils-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Text output utilities"
+HOMEPAGE="https://github.com/janestreet/textutils"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ dev-ml/core_unix:${SLOT}
+ dev-ml/textutils_kernel:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/textutils_kernel/Manifest b/dev-ml/textutils_kernel/Manifest
new file mode 100644
index 000000000000..7b267dfa01ec
--- /dev/null
+++ b/dev-ml/textutils_kernel/Manifest
@@ -0,0 +1 @@
+DIST textutils_kernel-0.15.0.tar.gz 17691 BLAKE2B 564a2bfd6d6a1248e9c004dd6740be1552219a11960872e67eae2c2485f01e662fbd108345992f4a924dc9b125516ac39c1c5b211a35aa296f64ca473a9bef3b SHA512 6295f0285e16829ba2282ca23225e783a422edfc2ea1a1e7b02df519430efd05b7e8e21a61078a1a523ddfb3668dba04f44836341efa260ffe3e9738603afdaf
diff --git a/dev-ml/textutils_kernel/metadata.xml b/dev-ml/textutils_kernel/metadata.xml
new file mode 100644
index 000000000000..25f8e9b0d645
--- /dev/null
+++ b/dev-ml/textutils_kernel/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ ML
+
+
+ janestreet/textutils_kernel
+
+
diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
new file mode 100644
index 000000000000..1b750503de5c
--- /dev/null
+++ b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Text output utilities"
+HOMEPAGE="https://github.com/janestreet/textutils_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/core:${SLOT}
+ >=dev-ml/uutf-1.0.2:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest
index ac58278f0442..22463d56e42f 100644
--- a/dev-ml/time_now/Manifest
+++ b/dev-ml/time_now/Manifest
@@ -1 +1,2 @@
DIST time_now-0.14.0.tar.gz 3666 BLAKE2B 131d4b585ac981fe306ea93f17e332cfabe86a3f8f4564a76e4dc694f9c624e91fe0f0ce26a4ada9fdf0239033fcd29065d76a37e6fb4b79927d116531c04909 SHA512 1b6d1a754e46f1756aa2aad3590e5052999f567630297491d62228ad733b189fbbfc0589b7bafd74e9f77ca0c0421093054e9062d2d5a7d7ed05930be67e9a5f
+DIST time_now-0.15.0.tar.gz 3697 BLAKE2B 142e848aa17f3cd14ef9d90a758f21b2ae3881e7e70c1b25fac0980a1d925d41953ded6632423b24e9f124887e71dc07ce1f7c838e45d18724a036bb5cb29473 SHA512 b24bf9fda05cc84c568cc8637771e8774661df738719b4ad30f86ae4a9a984e9f1d344dc58ab6014d37275e99e92bf3b2d34a8c4dfc474faf00c6096f679e371
diff --git a/dev-ml/time_now/time_now-0.15.0.ebuild b/dev-ml/time_now/time_now-0.15.0.ebuild
new file mode 100644
index 000000000000..b4f45fd13b0e
--- /dev/null
+++ b/dev-ml/time_now/time_now-0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Reports the current time"
+HOMEPAGE="https://github.com/janestreet/time_now"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ dev-ml/jane-street-headers:${SLOT}
+ dev-ml/jst-config:${SLOT}
+ dev-ml/ppx_base:${SLOT}
+ dev-ml/ppx_optcomp:${SLOT}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
index 54b4e92b9065..b97c015d45d1 100644
--- a/dev-ml/timezone/Manifest
+++ b/dev-ml/timezone/Manifest
@@ -1 +1,2 @@
DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5
+DIST timezone-0.15.0.tar.gz 9480 BLAKE2B a47fd0efcd659e2bd3adcb07776a4ca25ef65fc5ba4af87ef361cd4aa2c45e3641e9f240b033f50c0e6108868deca7bf57eba6e8a753947ef7b14f03c74b911c SHA512 d50cd1e8f116f9121383b2d20d5dcbf99b5388a2fed915302f0566c6f2d93bdf1480c2f998fac6b81a636be52b601b38981b3083adaaf405a1154b63c0b0d6da
diff --git a/dev-ml/timezone/timezone-0.15.0.ebuild b/dev-ml/timezone/timezone-0.15.0.ebuild
new file mode 100644
index 000000000000..33f265cc1758
--- /dev/null
+++ b/dev-ml/timezone/timezone-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Time-zone handling for OCaml"
+HOMEPAGE="https://github.com/janestreet/timezone"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/core:${SLOT}"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index 5e93e4ba8e05..fc0e1012bdea 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -1 +1,2 @@
DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1fcf805c30d03e95990ccd6d5fe2f5604931dc213fa921683de639717d288b2eac620cc2a4981cb792a65736e8d SHA512 53b719ee06d06d7833cbe57811fe54d57a36055fa8e4255909273a267000e20628b8b8f6d27c22385753ea461d461f87a1eb1fc9711c52405a89d1493f54f37f
+DIST typerep-0.15.0.tar.gz 22737 BLAKE2B f94587cd3b4bb9efb117c1ce228663fe91ad1156cc287654f5a1dc684fea35b7b3d25f69643e7c5418dff70cf56d4afbba75165833a11817d75abfdd398f9277 SHA512 d86821dbf4dd808a6310986cebed50029fa5388e0dba8fdc165e50f5346214a9e110c14070fcbbaf2ba3f4261595f9370b0acd723b6445729f562600500b795b
diff --git a/dev-ml/typerep/typerep-0.15.0.ebuild b/dev-ml/typerep/typerep-0.15.0.ebuild
new file mode 100644
index 000000000000..c9650a9aceaf
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/base:${SLOT}"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index 9480edd8c07e..b2d81ea3886b 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -1 +1,2 @@
DIST variantslib-0.14.0.tar.gz 2951 BLAKE2B a3197f7e06d4340ae73d76d477fd1e0ce038b4829aa3a9d0e0ea3e5251f9ca7c43798005138993a16c860ebf4d08a7e54621359c2a030f3866b62a02de4c326f SHA512 0cb18475668eb8e6091f8a779587f0d643dd0325b0f8518e53469dd12769a3ed6fa4f9c2651a21f8b07992d7b29f6664c4d3bf49f46ed6d7002de07b5014e4f3
+DIST variantslib-0.15.0.tar.gz 2948 BLAKE2B a85fea8d994a8488b1aa6a64826bacc4b2d38987664f33d78e27e46a308376092d9af2b931782dba222d12a8f17edd99287faa903a1e0865acf5093613c175bf SHA512 cf52e19fb16f2021e06ce92799275717401f4959f89f0219c62df1386c036cbaaa1213eed1b80f9e4147681e613bffc5ca8d50987ca45aac791fe3c723e3d692
diff --git a/dev-ml/variantslib/variantslib-0.15.0.ebuild b/dev-ml/variantslib/variantslib-0.15.0.ebuild
new file mode 100644
index 000000000000..99ee8df87720
--- /dev/null
+++ b/dev-ml/variantslib/variantslib-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="OCaml variants as first class values"
+HOMEPAGE="https://github.com/janestreet/variantslib"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/base:${SLOT}"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index cfbf244e716c..ddd812dc5685 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="additional B helpers to check COW status"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/BackupPC-XS/BackupPC-XS-0.620.0.ebuild b/dev-perl/BackupPC-XS/BackupPC-XS-0.620.0.ebuild
new file mode 100644
index 000000000000..b35ac568b515
--- /dev/null
+++ b/dev-perl/BackupPC-XS/BackupPC-XS-0.620.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=0.62
+DIST_AUTHOR="CBARRATT"
+inherit perl-module
+
+DESCRIPTION="Perl extension for BackupPC libraries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/BackupPC-XS/Manifest b/dev-perl/BackupPC-XS/Manifest
new file mode 100644
index 000000000000..e9f5412c90a8
--- /dev/null
+++ b/dev-perl/BackupPC-XS/Manifest
@@ -0,0 +1 @@
+DIST BackupPC-XS-0.62.tar.gz 289549 BLAKE2B 925729b7d9d5f099768ab8c46acfb4dfe5753c2e14b90a8fb471e86659913f9c9e807577a056b1b0419e43a9d915b8e44dad16d24f4897ee85b9b12bceee4b72 SHA512 64a87c5660cf8674e5f9a9974e5be6a6d57201b38a94923e9de9b090fa4ce09fac28d1634c8991dea81cae05ffbbc848ede0f5b5c40b7d1f6d728b3466980f17
diff --git a/dev-perl/BackupPC-XS/metadata.xml b/dev-perl/BackupPC-XS/metadata.xml
new file mode 100644
index 000000000000..b0aacbe29650
--- /dev/null
+++ b/dev-perl/BackupPC-XS/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ kernlpanic@dennis-eisele.de
+ Dennis Eisele
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ BackupPC-XS
+ BackupPC::XS
+
+
diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
index 01786966b18b..a2aedee2baa6 100644
--- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
+++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="provides Moose-like method modifiers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index 6308ba243f87..077ef827cf16 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Date-Range/Date-Range-1.410.0.ebuild b/dev-perl/Date-Range/Date-Range-1.410.0.ebuild
index b56500c49df6..45a4dfef97c4 100644
--- a/dev-perl/Date-Range/Date-Range-1.410.0.ebuild
+++ b/dev-perl/Date-Range/Date-Range-1.410.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="work with a range of dates"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
>=dev-perl/Date-Simple-0.30.0
diff --git a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
index 4fdbe2ce2e0a..c76cd7100505 100644
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION='Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-perl/Sub-Exporter-Progressive-0.1.11
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
index 4f2a68277edb..f6803c94393c 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Get home directory for self or other user"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+xdg test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.510.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.510.0.ebuild
index 586bdb17f170..5671233345d9 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.510.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.510.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
dev-perl/CGI
diff --git a/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild
deleted file mode 100644
index 1348da599cae..000000000000
--- a/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DIST_AUTHOR=GBROWN
-DIST_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="a Gtk2 widget for displaying Plain old Documentation (POD)"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/gtk+:2
- dev-perl/Gtk2
- dev-perl/IO-stringy
- dev-perl/Pod-Parser
- virtual/perl-Pod-Simple
- dev-perl/Gtk2-Ex-Simple-List
- dev-perl/Locale-gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-src_test() {
- local MODULES=(
- "Gtk2::Ex::PodViewer ${DIST_VERSION}"
- "Gtk2::Ex::PodViewer::Parser"
- )
- local failed=()
- for dep in "${MODULES[@]}"; do
- ebegin "Compile testing ${dep}"
- perl -Mblib="${S}" -M"${dep} ()" -e1
- eend $? || failed+=( "$dep" )
- done
- if [[ ${failed[@]} ]]; then
- echo
- eerror "One or more modules failed compile:";
- for dep in "${failed[@]}"; do
- eerror " ${dep}"
- done
- die "Failing due to module compilation errors";
- fi
- perl-module_src_test
-}
diff --git a/dev-perl/Gtk2-Ex-PodViewer/Manifest b/dev-perl/Gtk2-Ex-PodViewer/Manifest
deleted file mode 100644
index d5d3336f56a1..000000000000
--- a/dev-perl/Gtk2-Ex-PodViewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gtk2-Ex-PodViewer-0.18.tar.gz 15417 BLAKE2B 4c74a58dd023c2be098d0c752d9d34baa7eee9db7910be01eb9a979aa940a618a9eabc6e52a7720858d6ca680fb34381fa77d1651025f014934d0f9c48873483 SHA512 488c83a95776f0d54d92bc45abc7b1727d76930a16d16c203865ecd9e9274340f59fe2916ceb16fed0babc8b531cad625cfd549ff9914321440e14ea81c49893
diff --git a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml b/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
deleted file mode 100644
index 32f185bd94cc..000000000000
--- a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- Gtk2-Ex-PodViewer
- Gtk2::Ex::PodViewer
- Gtk2::Ex::PodViewer::Parser
-
-
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild b/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild
deleted file mode 100644
index 176289a452eb..000000000000
--- a/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=GBROWN
-DIST_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="a simple, pure Perl dialog for printing PostScript data in GTK+ applications"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cups"
-
-RDEPEND="
- cups? ( dev-perl/Net-CUPS )
- dev-perl/Gtk2
- >=dev-perl/Locale-gettext-1.40.0
-"
-BDEPEND="${RDEPEND}
-"
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Manifest b/dev-perl/Gtk2-Ex-PrintDialog/Manifest
deleted file mode 100644
index 9e6315ef7204..000000000000
--- a/dev-perl/Gtk2-Ex-PrintDialog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gtk2-Ex-PrintDialog-0.03.tar.gz 6150 BLAKE2B 7518e86959041b62c6622f9bc787caa488490d2c6f9babe703c808fe5d9a247232bb602e300c4e87e02269e25a210617c26473e502aa0ab37228dee827f8bbba SHA512 b63d0f062e1556c4a5402850725ece4e727f7e9eb168bf3be1403a9b4db425cee762a1b1ca3bdff55d554b343deadd35f27f908d198979b64012f5d59c2a5d88
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml b/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
deleted file mode 100644
index 8b16f5a8a0cc..000000000000
--- a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- Gtk2-Ex-PrintDialog
- Gtk2::Ex::PrintDialog
- Gtk2::Ex::PrintDialog::Darwin
- Gtk2::Ex::PrintDialog::Linux
- Gtk2::Ex::PrintDialog::MSWin32
- Gtk2::Ex::PrintDialog::Unix
-
-
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r3.ebuild b/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r3.ebuild
deleted file mode 100644
index e2c539d50239..000000000000
--- a/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=RMCFARLA
-DIST_VERSION=0.50
-DIST_SECTION=Gtk2-Perl-Ex
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module virtualx
-
-DESCRIPTION="A simple interface to Gtk2's complex MVC list widget"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )" # LGPL-2.1+
-SLOT="0"
-KEYWORDS="amd64 ~ia64 sparc x86"
-
-RDEPEND="
- >=dev-perl/Gtk2-1.60.0
- >=dev-perl/glib-perl-1.62.0
-"
-BDEPEND="${RDEPEND}
-"
-
-src_test() {
- virtx perl-module_src_test
-}
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Manifest b/dev-perl/Gtk2-Ex-Simple-List/Manifest
deleted file mode 100644
index 5add20e2aec2..000000000000
--- a/dev-perl/Gtk2-Ex-Simple-List/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gtk2-Ex-Simple-List-0.50.tar.gz 13769 BLAKE2B 0d435acaf034ce2653d3e797178852f1af95f29890ce9e65022b7b354371e868b52f4318fffb9edaa03abf3c95726bc5b991ad35fb1732c6d67288d368caed6d SHA512 df57509eb386aff41630b7da2d9b810b1e9308dec407dbe792a4282f2d7331cb3639755af8232bf6312e0537784dab5f1d035c919909a53e584173ce24aa6a09
diff --git a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml b/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
deleted file mode 100644
index 6c4a39ab17ed..000000000000
--- a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- Gtk2-Ex-Simple-List
- Gtk2::Ex::Simple::List
- Gtk2::Ex::Simple::TiedCommon
- Gtk2::Ex::Simple::TiedList
- Gtk2::Ex::Simple::TiedRow
-
-
diff --git a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r3.ebuild b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r3.ebuild
deleted file mode 100644
index b8c71d4b7b85..000000000000
--- a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=RATCLIFFE
-DIST_VERSION=0.05
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module virtualx
-
-DESCRIPTION="Perl binding for the GtkImageView image viewer widget"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-perl/Gtk2
- >=media-gfx/gtkimageview-1.6.3
-"
-BDEPEND="${RDEPEND}
- dev-perl/glib-perl
- >=dev-perl/ExtUtils-Depends-0.300.0
- >=dev-perl/ExtUtils-PkgConfig-1.30.0
-"
-
-src_test() {
- perl_rm_files t/pod.t
- virtx perl-module_src_test
-}
diff --git a/dev-perl/Gtk2-ImageView/Manifest b/dev-perl/Gtk2-ImageView/Manifest
deleted file mode 100644
index 46d66e0bd4f7..000000000000
--- a/dev-perl/Gtk2-ImageView/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gtk2-ImageView-0.05.tar.gz 43632 BLAKE2B 73bce06c090b6d6338526190bc30c0ef6123f533fe4bc884ec0802afc58f59451cf505ecd13501f4cc6d5aef6470d2965de81dc2b55bdf193517c93e15c330e8 SHA512 ff8804e73655e9b3fad9e26860698726669063b5103732e589b5c93398a3a76ba79a55f41ce129fe59761a44cf3b317a15207f888432ec603cbdfbdd4ee5cd88
diff --git a/dev-perl/Gtk2-ImageView/metadata.xml b/dev-perl/Gtk2-ImageView/metadata.xml
deleted file mode 100644
index ec4786dee651..000000000000
--- a/dev-perl/Gtk2-ImageView/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- Gtk2-ImageView
- Gtk2::ImageView
-
-
diff --git a/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.250.0.ebuild b/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.250.0.ebuild
index bd115b4c9ddf..adcf1d2c9eab 100644
--- a/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.250.0.ebuild
+++ b/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.250.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="CSS Selector to XPath compiler"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
virtual/perl-Carp
diff --git a/dev-perl/HTML-TreeBuilder-XPath/HTML-TreeBuilder-XPath-0.140.0.ebuild b/dev-perl/HTML-TreeBuilder-XPath/HTML-TreeBuilder-XPath-0.140.0.ebuild
index d8d7f41b7358..0994c55207ea 100644
--- a/dev-perl/HTML-TreeBuilder-XPath/HTML-TreeBuilder-XPath-0.140.0.ebuild
+++ b/dev-perl/HTML-TreeBuilder-XPath/HTML-TreeBuilder-XPath-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="add XPath support to HTML::TreeBuilder"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
dev-perl/HTML-Tree
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild
index 4376eed68261..5a3ba03380bd 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="idn"
RDEPEND="
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
index f3e5ac2dc6c2..7b91afacd4e1 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module for accessing the GNU locale utilities"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
sys-devel/gettext
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
index ee303b1b0dd4..c3ab3c550477 100644
--- a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Dispatches messages to one or more outputs"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
PERL_RM_FILES=( "t/email-exit.t" )
diff --git a/dev-perl/MIME-Charset/MIME-Charset-1.12.2-r1.ebuild b/dev-perl/MIME-Charset/MIME-Charset-1.12.2-r1.ebuild
index 224fc194ab68..0988231ca70a 100644
--- a/dev-perl/MIME-Charset/MIME-Charset-1.12.2-r1.ebuild
+++ b/dev-perl/MIME-Charset/MIME-Charset-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Charset Informations for MIME"
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 ~loong ~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="l10n_ja l10n_zh"
# Put JISX0213 here one day
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 968dac535423..09ddc1543aa5 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Module-Build/Module-Build-0.423.100.ebuild b/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
index 6ac9731e4b88..46a32546834d 100644
--- a/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
+++ b/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build and install Perl modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=virtual/perl-CPAN-Meta-2.142.60
diff --git a/dev-perl/Moo/Moo-2.5.4.ebuild b/dev-perl/Moo/Moo-2.5.4.ebuild
index 6a4284a72e77..86c71fd04a05 100644
--- a/dev-perl/Moo/Moo-2.5.4.ebuild
+++ b/dev-perl/Moo/Moo-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x86-solaris"
RDEPEND="
virtual/perl-Carp
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
index 332e02dda4dd..f389c523f6a6 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format (Gentoo stub)"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-misc/ca-certificates"
BDEPEND="${RDEPEND}
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
index 3c9d3c32ef22..21b2d12a448e 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal examples"
RDEPEND="
diff --git a/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild b/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
index 4e625cf2863d..b7b05accf859 100644
--- a/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
+++ b/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="POD filters and translators"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
index b9121b572b3c..a28f44938ec7 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl library for parsing the output of nsgmls"
LICENSE="GPL-2+"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild b/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
index 32367f453087..f607ea68595c 100644
--- a/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
+++ b/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension for reading MS Excel 2007 files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
>=dev-perl/Archive-Zip-1.180.0
diff --git a/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
index c28d027e7577..667ae933ef4b 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Change terminal modes, and perform non-blocking reads"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
>=virtual/perl-ExtUtils-MakeMaker-6.580.0
diff --git a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
index 33b967936ed9..db1aca1a4fb9 100644
--- a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
+++ b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,4 +10,4 @@ inherit perl-module
DESCRIPTION="Get number of occupied columns of a string on terminal"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
index 0fce69042914..19a965828ee5 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Internationalized substitute of Text::Wrap"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-perl/Text-CharWidth"
BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
index 60ab51b72600..175b74b30b3b 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
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 ~loong ~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-perl/MIME-Charset
diff --git a/dev-perl/Web-Scraper/Web-Scraper-0.380.0.ebuild b/dev-perl/Web-Scraper/Web-Scraper-0.380.0.ebuild
index ead038a6ecdd..aee3346518a0 100644
--- a/dev-perl/Web-Scraper/Web-Scraper-0.380.0.ebuild
+++ b/dev-perl/Web-Scraper/Web-Scraper-0.380.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='Web Scraping Toolkit using HTML and CSS Selectors or XPath expressions'
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
RDEPEND="
dev-perl/HTML-Parser
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0-r1.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0-r1.ebuild
index 2a2766b9eea9..a4c71fe9d2d9 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0-r1.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Read/Write YAML files with as little code as possible"
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 ~loong ~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="minimal"
RDEPEND="
diff --git a/dev-perl/gnome2-canvas/Manifest b/dev-perl/gnome2-canvas/Manifest
deleted file mode 100644
index 0e1a1a2606d5..000000000000
--- a/dev-perl/gnome2-canvas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gnome2-Canvas-1.006.tar.gz 63156 BLAKE2B da080e18b75ae275f32dc61421a1d069456ea79c362616d47f4a89e5efe64a9a196f6a7ae5e547d2fc2c40d358adf2ddf8385a4f57ba6264754f5d5e7b95439e SHA512 1de13983f6e64880ebf202ecc6017414882e5f30da2f4de64534bbc9b06c846e60b07a8f61157c547093edc748a5b0d1cd44562401e8cec0d7f429fb5c5e754b
diff --git a/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild b/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild
deleted file mode 100644
index 681834f65372..000000000000
--- a/dev-perl/gnome2-canvas/gnome2-canvas-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Gnome2-Canvas
-DIST_AUTHOR=XAOC
-DIST_VERSION=1.006
-DIST_EXAMPLES=( "canvas_demo/*" )
-inherit perl-module virtualx
-
-DESCRIPTION="Perl interface to the Gnome Canvas"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
-
-RDEPEND="x11-libs/gtk+:2
- >=gnome-base/libgnomecanvas-2
- >=dev-perl/glib-perl-1.120.0
- >=dev-perl/Gtk2-1.100.0"
-DEPEND="${RDEPEND}
-"
-BDEPEND="${RDEPEND}
- >=dev-perl/ExtUtils-PkgConfig-1.30.0
- >=dev-perl/ExtUtils-Depends-0.200.0
- virtual/pkgconfig"
-
-src_test() {
- virtx perl-module_src_test
-}
diff --git a/dev-perl/gnome2-canvas/metadata.xml b/dev-perl/gnome2-canvas/metadata.xml
deleted file mode 100644
index 73a5620e355b..000000000000
--- a/dev-perl/gnome2-canvas/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- Gnome2-Canvas
- Gnome2::Canvas
-
-
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 69b6ff58d021..9d4bb11997be 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild
index 7aec6369c373..e16650d74abd 100644
--- a/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild
+++ b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/composer/composer-2.1.12.ebuild b/dev-php/composer/composer-2.1.12.ebuild
index 1eb058b7a474..d8a511f21018 100644
--- a/dev-php/composer/composer-2.1.12.ebuild
+++ b/dev-php/composer/composer-2.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/json-schema/json-schema-5.2.11.ebuild b/dev-php/json-schema/json-schema-5.2.11.ebuild
index 88ece98fe120..ebc719f456ab 100644
--- a/dev-php/json-schema/json-schema-5.2.11.ebuild
+++ b/dev-php/json-schema/json-schema-5.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
# Tests are not in the release tarball
RESTRICT="test"
diff --git a/dev-php/psr-log/psr-log-1.1.4.ebuild b/dev-php/psr-log/psr-log-1.1.4.ebuild
index db272717331e..8f88b46dfd69 100644
--- a/dev-php/psr-log/psr-log-1.1.4.ebuild
+++ b/dev-php/psr-log/psr-log-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/semver/semver-3.2.6.ebuild b/dev-php/semver/semver-3.2.6.ebuild
index ba48da91ec5f..bbee567c21ef 100644
--- a/dev-php/semver/semver-3.2.6.ebuild
+++ b/dev-php/semver/semver-3.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 6619337fad39..10c660f698a7 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -1,10 +1,6 @@
-
- djc@gentoo.org
- Dirkjan Ochtman
-
php-bugs@gentoo.org
PHP
diff --git a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild
index ad9f7604ad52..10d6a07ffb26 100644
--- a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild
+++ b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-python/Arpeggio/Arpeggio-1.10.2.ebuild b/dev-python/Arpeggio/Arpeggio-1.10.2.ebuild
deleted file mode 100644
index 1d8d5c5f4698..000000000000
--- a/dev-python/Arpeggio/Arpeggio-1.10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio"
-SRC_URI="https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
- test? (
- dev-python/memory_profiler[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -e '/^setup_requires/,/^[^[:space:]]/d' \
- -e '/^exclude/a\
- examples.*' \
- -i setup.cfg || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
index e25d2baeb0cc..e6ef77af4e11 100644
--- a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
+++ b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
DEPEND="
test? (
diff --git a/dev-python/Arpeggio/Manifest b/dev-python/Arpeggio/Manifest
index 2089f493bee8..4ae24bc19088 100644
--- a/dev-python/Arpeggio/Manifest
+++ b/dev-python/Arpeggio/Manifest
@@ -1,2 +1 @@
-DIST Arpeggio-1.10.2.tar.gz 766747 BLAKE2B 91e828731757b6ca1e16900edca3f45378c5bb05469e1d32571f9185dbb887f5cf6ae54afecf77f352f882d9056a0814c65aabf51424b482ae3a8cb90f11740a SHA512 c6a162f9ab854bac7e2bc9e5d5553c2dbcc068fcf61607149727cd4c8a7c87c63cab765b423c8ea76e09fa81ccc42157d724388a81e22864580ccf734998142a
DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
diff --git a/dev-python/Faker/Faker-13.6.0.ebuild b/dev-python/Faker/Faker-13.6.0.ebuild
new file mode 100644
index 000000000000..2b9827ae45ea
--- /dev/null
+++ b/dev-python/Faker/Faker-13.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+ https://github.com/joke2k/faker/
+ https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+ !dev-ruby/faker
+"
+BDEPEND="
+ test? (
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},tiff]
+ dev-python/random2[${PYTHON_USEDEP}]
+ dev-python/validators[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index c9d6ce8514ba..50166cb66ee7 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
DIST Faker-13.3.3.tar.gz 1483842 BLAKE2B bf74f1e4d38b7ec5bd81610a462d88a86fec92886e42ad42a6827524d259697fd263a4e357f28abeee3ffe73ebc17fc4ea12082837773cc326ad0a89e117b32e SHA512 ac2dddf662fd8053bacd81fa52560bdf90f7055741648ea25d2cab92066be6efa1ddc29646ece416a408038fda695ff6602c5a655de3734c208864812f9d67cf
DIST Faker-13.3.5.tar.gz 1484180 BLAKE2B 137c3faad4ccee4a673a45a8f1245a9e0681b64bfa43c5f7caa91ea1e1d797be0b0973aef8b32a4c44a790218509c77cdf9a8ead5dcf87c19a5165b2b2e9b599 SHA512 8cce3b1488ae34a292bbf9cc0373ffd9c47fe29b484bddb51396a1fe63eef0953022d638ea9b4a49148a48a72d56a9d38d342ebd228265ccb34320406ab45453
DIST Faker-13.4.0.tar.gz 1484289 BLAKE2B 6d3ab8f958a1d51550bec29c28799753db91330cf98a47ba556b41d61459c42e34bb7dda24c71efab4820fc8843b1f0b4e2b41fa59f185a0acb0989b5f8c947c SHA512 29a0da1cd8275b90e3c65bf74874661e9ac1f2029aee1d317ae139e758aff946d0fccc48ace9043d78ba9a9242c431dd79d025f4203816ce3d8c56b394355672
+DIST Faker-13.6.0.tar.gz 1488090 BLAKE2B 9b4485fc97b0c22f9cce298a55e9dd91c05ea9a56514618c1355c420f3ce6beaa599caa51d909803e968ab918c4c841f459da3d06dd78fbfe984d22b323e2cbe SHA512 bcfb49777640f9b605e164b91380aee77206614f055a321b905ead1649219c081254e57ea80045dd692d061e53e69201ad356daaf6727655c87d65b16752c4cc
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b1f7c639369a..23ecdf188f4c 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index e78e7c3b61ef..f234094cb699 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -2,3 +2,4 @@ DIST PyPDF2-1.27.5.gh.tar.gz 2053469 BLAKE2B 1a01289145574a4551f1fa237e4c790dd86
DIST PyPDF2-1.27.6.gh.tar.gz 2092950 BLAKE2B 786d5102275d6c04628d76fd0225d453aa8f74cb0a6e135f3d56ed1143c114144aa9daef17e5971ce9e4c14cc01016125107717296d76cf7eb34c1cadbdd42cd SHA512 bf1c60453e6a98a50c382cf967fc7aa1fb8dffc14d426f97bc0e41c34a6534930849fe053c8debe585b3877eadca9f8b43f803b1f01586f6c693a1eefe43e3dd
DIST PyPDF2-1.27.7.gh.tar.gz 2093013 BLAKE2B 5637094972228ad1a5790f36f71e3fd8a694c9fd99bad7874a03f299ca0bb6198064f6756552cac41127fd67a827ca191e6de56281b25c13629a99edcdac7685 SHA512 dbcb944f3bafb0c0e81842e92e8a72609c85c271eba83841ee5bc901119178a6a4ff503a4796014854a75137b9f8f25a245d55a550e770b9f78daf8e1e92dcba
DIST PyPDF2-1.27.8.gh.tar.gz 2104282 BLAKE2B 849a801783b0e3990c3d8c68449b8f9717c2b2155fc78b9c4d07f99cf84ebc453e388192a361f06c8e6405fc5057e25fcd4158475266e6739fb1e91f35f9b1c1 SHA512 42406303f293962a43ac462d9cc7e5ce2fecf999bb7b37913970104f88298ff393f801c187b879b0bebd055a87c70d79a726be3c37c2a53fc872825112fdc98d
+DIST PyPDF2-1.27.9.gh.tar.gz 2124754 BLAKE2B 5b1279d84b949a33571950d7256c4ee7b319ff551b5d1c5fc78193048bf54ec3a835cf73a4def7c8fc4ff77f8edd8738062a9e76dc858e1708a21fafee0633cc SHA512 9cae31bb9410dd65746da955a4fc25f8e741fca5dd76181229e5af22d069641a7e8d92c23b117f16fb5a6ee635cd83dccb910fe4ff94a85222bbc856c2109127
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild
new file mode 100644
index 000000000000..b644bee3ad2f
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+ https://pypi.org/project/PyPDF2/
+ https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+ https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+ dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+ if use examples; then
+ docinto examples
+ dodoc -r Sample_Code/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_src_install
+}
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index b037c1562359..b00817eb5729 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
#BDEPEND="
# test? (
diff --git a/dev-python/adblock/adblock-0.5.2-r1.ebuild b/dev-python/adblock/adblock-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..2e432744ce79
--- /dev/null
+++ b/dev-python/adblock/adblock-0.5.2-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adblock-0.4.3
+ addr-0.14.0
+ adler-1.0.2
+ aho-corasick-0.7.18
+ autocfg-1.1.0
+ base64-0.13.0
+ bitflags-1.3.2
+ byteorder-1.4.3
+ cfg-if-1.0.0
+ crc32fast-1.3.2
+ either-1.6.1
+ flate2-1.0.22
+ form_urlencoded-1.0.1
+ idna-0.2.3
+ indoc-0.3.6
+ indoc-impl-0.3.6
+ instant-0.1.12
+ itertools-0.10.3
+ libc-0.2.118
+ lock_api-0.4.6
+ matches-0.1.9
+ memchr-2.4.1
+ miniz_oxide-0.4.4
+ num-traits-0.2.14
+ once_cell-1.9.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ paste-0.1.18
+ paste-impl-0.1.18
+ percent-encoding-2.1.0
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.36
+ psl-2.0.71
+ psl-types-2.0.10
+ pyo3-0.15.1
+ pyo3-build-config-0.15.1
+ pyo3-macros-0.15.1
+ pyo3-macros-backend-0.15.1
+ quote-1.0.15
+ redox_syscall-0.2.10
+ regex-1.5.4
+ regex-syntax-0.6.25
+ rmp-0.8.10
+ rmp-serde-0.13.7
+ rmp-serde-0.15.5
+ scopeguard-1.1.0
+ seahash-3.0.7
+ serde-1.0.136
+ serde_derive-1.0.136
+ smallvec-1.8.0
+ syn-1.0.86
+ tinyvec-1.5.1
+ tinyvec_macros-0.1.0
+ twoway-0.2.2
+ unchecked-index-0.2.2
+ unicode-bidi-0.3.7
+ unicode-normalization-0.1.19
+ unicode-xid-0.2.2
+ unindent-0.1.7
+ url-2.2.2
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0"
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cargo distutils-r1
+
+DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
+HOMEPAGE="https://github.com/ArniDagur/python-adblock"
+SRC_URI="
+ https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED=".*/adblock.*.so"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+ distutils-r1_src_compile
+
+ # tests try to find Cargo.toml + adblock/adblock.pyi in current
+ # directory but will fail if pytest finds init in ./adblock
+ rm adblock/__init__.py || die
+}
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index c35e82cfb67c..349d20be4ae7 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,4 +1,3 @@
DIST aesara-rel-2.5.3.tar.gz 8191431 BLAKE2B 698bc3b6f7e84288be3318796989d13d7de92f72c66abfa83b14c08f6310f974f7381d729e712c2bd5e76f398d74a3c5dc03d7515a22254261312e586e3fd461 SHA512 5c1ad9d6ad1fb58be1477713d863f2b1371544ea8293d8e9e1a690860a0483b83c9558827856a2546498bab26360f141a5ee97d4c7f3f2aad773e84f9766a59b
-DIST aesara-rel-2.6.0.tar.gz 7846131 BLAKE2B 23e1f115eb2e8794a00d29fa2b9705ba6bf0d17c9bb290675f9406e4008b24b45dfd9b2732cb6fc3c6ce18154a3d75b6b0fc750a99f76588cab91387dbc4728d SHA512 8acff0f3fbb8969970b988f363cb3e2107fd3ee5450f238e426f0959d6bf42909c6eb2951b1803629148a57a9a27c47b4364756942a42692b44abf151cf736d2
-DIST aesara-rel-2.6.2.tar.gz 7846413 BLAKE2B bd25da68fc0bc138eedda1c7203ef1cf0e3f0cde84e9eb2be0aed9baeedf292f7270e0117cbcb72aeb2542727b24d4a5374e2c2f930945240b911916942b10fe SHA512 e1da313d5f2a8498565bb0cc1442b1c3eae0206caf09976903c54314b4002a68dae53d7289ad1fb06e5e8ed015613d989c4c5db85d57f6c072d2e2414019acd5
DIST aesara-rel-2.6.3.tar.gz 7845423 BLAKE2B 66b84a10337efc01e37d82793da56b61b1825829d982e24e0f93ebb67cd3c22e5bb2e37c71ab8bd9648b039efaf4c667dc53df2a9613ba9370c2138eb74ca400 SHA512 e0a804c0c3c1cd24753a237c386df9600d2b01cf4991aeca3d794df4068f584a9ab5341b72fa5695ccb9d06f1e4954f450436e3a7ebe4c2efc1354a5c2e5979d
+DIST aesara-rel-2.6.4.tar.gz 7845688 BLAKE2B bfd0222c2a8d8e22abb56b785b73a121032832417562046445b8e0b2f6461326ba760d1839fd1acac2215a1547ed48d613998cb4915a07521f4d976a32a811b9 SHA512 a9f47bb4718fab974a35d7eab1b2a5ab8ea7d911dd9d92a791763a659f96b52b9832532e5e13aad10ac8e2f0927d2cc3e97c09e84046fee125925b3ac2898893
diff --git a/dev-python/aesara/aesara-2.5.3.ebuild b/dev-python/aesara/aesara-2.5.3.ebuild
index 75ba979cb47c..22962f0d5f3e 100644
--- a/dev-python/aesara/aesara-2.5.3.ebuild
+++ b/dev-python/aesara/aesara-2.5.3.ebuild
@@ -63,6 +63,7 @@ python_test() {
}
python_compile() {
+ esetup.py build_py
distutils-r1_python_compile
rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
}
diff --git a/dev-python/aesara/aesara-2.6.2.ebuild b/dev-python/aesara/aesara-2.6.2.ebuild
deleted file mode 100644
index 5bcb330fb0af..000000000000
--- a/dev-python/aesara/aesara-2.6.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
- https://github.com/aesara-devs/aesara/
- https://pypi.org/project/aesara/
-"
-SRC_URI="
- https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
- -> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
- dev-python/cons[${PYTHON_USEDEP}]
- dev-python/etuples[${PYTHON_USEDEP}]
- dev-python/logical-unification[${PYTHON_USEDEP}]
- dev-python/minikanren[${PYTHON_USEDEP}]
- dev-python/filelock[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # speed tests are unreliable
- tests/scan/test_basic.py::test_speed
- tests/scan/test_basic.py::test_speed_rnn
- tests/scan/test_basic.py::test_speed_batchrnn
- tests/link/test_vm.py::test_speed
- tests/link/test_vm.py::test_speed_lazy
- tests/tensor/test_gc.py::test_merge_opt_runtime
-
- # rounding problem?
- # https://github.com/aesara-devs/aesara/issues/477
- tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
- tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
- )
- local EPYTEST_IGNORE=(
- # we do not package numba
- tests/link/test_numba.py
- tests/link/test_numba_performance.py
- )
-
- epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
- esetup.py build_py
- distutils-r1_python_compile
- rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
- optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
- optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.0.ebuild b/dev-python/aesara/aesara-2.6.4.ebuild
similarity index 100%
rename from dev-python/aesara/aesara-2.6.0.ebuild
rename to dev-python/aesara/aesara-2.6.4.ebuild
diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
index 622a6671b886..c693ea13d3be 100644
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE=""
# Tests fail with network-sandbox, since they try to resolve google.com
PROPERTIES="test_network"
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
index 6686f7fb4a2a..5d37d7b07d00 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
@@ -14,7 +14,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 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.8.1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
index a6ee3ec7ee73..70b4c31710e1 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
index 0822fa602377..539b3528cf5c 100644
--- a/dev-python/aiosignal/aiosignal-1.2.0.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansi/ansi-0.3.6.ebuild b/dev-python/ansi/ansi-0.3.6.ebuild
index 838f9f8f9f2e..7d07c07986a1 100644
--- a/dev-python/ansi/ansi-0.3.6.ebuild
+++ b/dev-python/ansi/ansi-0.3.6.ebuild
@@ -15,6 +15,6 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
index 1add4b2268cf..58b40556ec17 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_configure() {
[[ -e pyproject.toml ]] &&
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index c47a63dd74fa..1a87533fa152 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1 +1,2 @@
DIST apsw-3.35.4_p1.zip 685034 BLAKE2B 5845e5fcb286c587367955c33fbee9aa4b0687af666f1d50f35f5dec8e756a0fbcf0fdbd120dd3c7a78df1f05d8eae5a973a8a71fc8a6f4271fff7d83b399013 SHA512 f420560e5821bd6305705ee6c14174f1770f4811edcfe152cb1f2ceae4295f13c82552386a7ef42c5ce88165e88bd2080b4dc2809484598522914d99f2469135
+DIST apsw-3.38.1-r1.gh.tar.gz 338985 BLAKE2B aa0ef335bd3abc708b41a92959f98b4fd3961168feacb9ca6d382e0279c46d4227a8e09373721ae1361fcc38181376664130b3623b2f36e1596467b99959ecb8 SHA512 4d161641d7bf7f933507e7d7e71d437d9db95f7327e29cf34848d9b741e2711dafbefbf19cb34d78d83b4e69115acad855f924fdf80de1cea4c9d61fe0f2b670
diff --git a/dev-python/apsw/apsw-3.38.1_p1.ebuild b/dev-python/apsw/apsw-3.38.1_p1.ebuild
new file mode 100644
index 000000000000..64f34312b92b
--- /dev/null
+++ b/dev-python/apsw/apsw-3.38.1_p1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+ https://github.com/rogerbinns/apsw/
+ https://pypi.org/project/apsw/
+"
+SRC_URI="
+ https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ >=dev-db/sqlite-${PV%_p*}:3
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch"
+)
+
+python_compile() {
+ distutils-r1_python_compile --enable=load_extension
+ mv "${BUILD_DIR}/install${EPREFIX}/usr/apsw.pyi" \
+ "${BUILD_DIR}/install$(python_get_sitedir)" || die
+}
+
+python_test() {
+ esetup.py build_test_extension
+ "${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 6a7cf556053e..97807aa8377b 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,4 +1,2 @@
-DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
-DIST argparse-manpage-2.1.tar.gz 39889 BLAKE2B 9c534b775e59064062d91587e275acf0af343cef864009e290c9a5224e481cd2f7cde87e85b2b0135483d6119e711cd6668d8455315eeb2a28d335c8ef37e3ae SHA512 aed2908bec8f6bee0f8619c6d5cff742fdac0f44ab7f65b8d0c1aa3409ec0335ce763cd2177b2606111b9ba5fe43698b04ace43f9017034cf99a7142eccd9ea0
DIST argparse-manpage-2.2.tar.gz 39963 BLAKE2B 3ba427653c51265be944309dbd94368b9e62f46ec9fa3315a9b7da2de1fc6ae3399408488b74fb1c62ed39f70034d6429f3825c0857b07b71c277922870fbc13 SHA512 1708d33633405f1c4b9c96acd78cdbc5e3465089c7de0c5d0654f9f70ac1b7176f3798fd8bd8e7c0f2163b28dcc6d41ea2b68f2e2b03652677af3ba945d14588
-DIST argparse-manpage-2.tar.gz 38279 BLAKE2B 24edcb71aed7731178d24e99a36baf8be2270f6d4da0d884610da294d44313d913f8aa2db381eae77409ec504b18346688d5f7f27257285b7aa92d453b1a58f1 SHA512 24854cd5209635e8938716f97cb4eb283152a2a109c554385a78a5145c6e0f38c76a9172d607fb3ffdf610e8d3f7270ed94f6b4612ce731ea9dafe0a1bebebe6
+DIST argparse-manpage-3.tar.gz 45091 BLAKE2B b2ab9d4863227eacaf566865cd47763b9a52f4fd445ae78cf8212b3762a14c1ceb7f9008d25b8828f5e5da23e120a7be6d48239bb300670e559000de1e75fd68 SHA512 96225cf71dc60c638bd312331622e5b60589d7e6baf59fdfca0d90d24cff2bb232696c754c440c4e239949ea1a6280699c4f0f7816c50ec62bf77474d0c48cf4
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
deleted file mode 100644
index d081471fcbc5..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-PATCHES=(
- "${FILESDIR}/${P}-remove-six-dep.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
deleted file mode 100644
index 5e779edcda9c..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-BDEPEND="
- test? (
- dev-python/pip[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x COLUMNS=80
- epytest
-}
diff --git a/dev-python/argparse-manpage/argparse-manpage-2.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.ebuild
deleted file mode 100644
index 5199ae12a243..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-BDEPEND="
- test? (
- dev-python/pip[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x COLUMNS=80
- epytest
-}
diff --git a/dev-python/argparse-manpage/argparse-manpage-3.ebuild b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
new file mode 100644
index 000000000000..6a4098d8b5b0
--- /dev/null
+++ b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Automatically build man-pages for your Python project"
+HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
+SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/pip[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local -x COLUMNS=80
+ epytest
+}
diff --git a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
deleted file mode 100644
index 7a5aa777739a..000000000000
--- a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/examples/copr/copr_cli/main.py
-+++ b/examples/copr/copr_cli/main.py
-@@ -8,15 +8,11 @@ import argparse
- import sys
- import datetime
- import time
--import six
- import simplejson
- from collections import defaultdict
-
- import logging
--if six.PY2:
-- from urlparse import urlparse
--else:
-- from urllib.parse import urlparse
-+from urllib.parse import urlparse
-
- if sys.version_info < (2, 7):
- class NullHandler(logging.Handler):
diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild
index a73a5388bc50..5e01f0da51d8 100644
--- a/dev-python/astor/astor-0.8.1-r1.ebuild
+++ b/dev-python/astor/astor-0.8.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/async_generator/async_generator-1.10-r1.ebuild b/dev-python/async_generator/async_generator-1.10-r1.ebuild
index c0f0e694ff3b..3f5d16f121ee 100644
--- a/dev-python/async_generator/async_generator-1.10-r1.ebuild
+++ b/dev-python/async_generator/async_generator-1.10-r1.ebuild
@@ -13,8 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
DOCS=( README.rst )
distutils_enable_tests pytest
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
diff --git a/dev-python/async_timeout/async_timeout-4.0.2.ebuild b/dev-python/async_timeout/async_timeout-4.0.2.ebuild
index 3b59e458a929..7238c29d32ed 100644
--- a/dev-python/async_timeout/async_timeout-4.0.2.ebuild
+++ b/dev-python/async_timeout/async_timeout-4.0.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
index 7a8b99ded206..e185b13e7d15 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests pytest
distutils_enable_sphinx docs \
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index ef18ee5b39e8..23a153a25e38 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1 @@
-DIST autobahn-22.2.2.tar.gz 375443 BLAKE2B a321cfeaa35e7da5aa58ade0da3bc5891baab1d4a915782e9d25038679261c19744d65baa4a981cb01025902dc8f4ffb93d8c0ad59b8db32119c0fb0eeb49d53 SHA512 95b0ee867a866b1cf67a55ffa9386addd3640b12a3e5a2673b4d496aa6d41ec49408e1f528bc21d1e390d5e3343dda0b1625d4ac0d9e9101db151c7c79623263
-DIST autobahn-22.3.1.tar.gz 375616 BLAKE2B 2644ff3766b268df54cf955d657870530723342dc9b040b05806766e25dbf89b78b448d8b6a949cb8a8d1486a16f6901348dc127903c34502f8663997b539ac8 SHA512 5fbeec8808d90431e37ede1b3c147ffd8e92af99af3bc4f6fec3519cdbfe5962c3d770e9102b7f54bfbdd03f453b488c8ba8eb104c6a34458ca429fd1233e037
DIST autobahn-22.3.2.tar.gz 376020 BLAKE2B 5d7b776c24541b08363942ed1868d5e7a2ccb4f99edc1ad722d3d68417852f324e79afa5ec8cc0251499ba27c078087ba40be744d657b562f5f1c431492705b6 SHA512 a33619bb7624f56bf571a4c61d11290316554c5c5a23724c6d5624f1e8e673dfc6a8e12ea3b17f809306a14f45e982b3425a23efb123003b575b248718c9a299
diff --git a/dev-python/autobahn/autobahn-22.2.2.ebuild b/dev-python/autobahn/autobahn-22.2.2.ebuild
deleted file mode 100644
index d59acbe9809e..000000000000
--- a/dev-python/autobahn/autobahn-22.2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 optfeature
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
- https://crossbar.io/autobahn/
- https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="test xbr"
-RESTRICT="!test? ( test )"
-
-# The order of deps is based on their appearance in setup.py
-# All extra deps should be included in test and in optfeature
-RDEPEND="
- >=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- >=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
- >=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
- >=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
- >=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
- >=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
-
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- if use xbr ; then
- eerror "***************"
- eerror "Required xbr dependencies are incomplete in Gentoo."
- eerror "So this functionality will not yet work"
- eerror "Please file a bug if this feature is needed"
- eerror "***************"
- else
- # remove xbr components
- export AUTOBAHN_STRIP_XBR="True"
- fi
-
- # avoid useless rust dependency
- sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
- # remove twisted plugin cache regen in setup.py
- # to fix tinderbox sandbox issue
- sed -e '/import/s:reactor:__importmustfail__:' \
- -i setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- einfo "Testing all, cryptosign using twisted"
- local -x USE_TWISTED=true
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- "${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
- unset USE_TWISTED
-
- einfo "RE-testing cryptosign and component_aio using asyncio"
- local -x USE_ASYNCIO=true
- epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
- unset USE_ASYNCIO
-
- rm -f twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
- optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
- optfeature "non-standard WebSocket compression support" "dev-python/snappy"
- optfeature "accelerated WAMP serialization support" \
- "dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
- optfeature "TLS transport encryption" \
- "dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
- optfeature "WAMP-SCRAM authentication" \
- "dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
- optfeature "native SIMD acceleration" "dev-python/cffi"
-
- python_foreach_impl twisted-regen-cache
-}
-
-pkg_postrm() {
- python_foreach_impl twisted-regen-cache
-}
diff --git a/dev-python/autobahn/autobahn-22.3.1.ebuild b/dev-python/autobahn/autobahn-22.3.1.ebuild
deleted file mode 100644
index a15603075d58..000000000000
--- a/dev-python/autobahn/autobahn-22.3.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
- https://crossbar.io/autobahn/
- https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test xbr"
-RESTRICT="!test? ( test )"
-
-# The order of deps is based on their appearance in setup.py
-# All extra deps should be included in test and in optfeature
-RDEPEND="
- >=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- >=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
- >=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
- >=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
- >=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
- >=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
-
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- if use xbr ; then
- eerror "***************"
- eerror "Required xbr dependencies are incomplete in Gentoo."
- eerror "So this functionality will not yet work"
- eerror "Please file a bug if this feature is needed"
- eerror "***************"
- else
- # remove xbr components
- export AUTOBAHN_STRIP_XBR="True"
- fi
-
- # avoid useless rust dependency
- sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
- # remove twisted plugin cache regen in setup.py
- # to fix tinderbox sandbox issue
- sed -e '/import/s:reactor:__importmustfail__:' \
- -i setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- einfo "Testing all, cryptosign using twisted"
- local -x USE_TWISTED=true
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- "${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
- unset USE_TWISTED
-
- einfo "RE-testing cryptosign and component_aio using asyncio"
- local -x USE_ASYNCIO=true
- epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
- unset USE_ASYNCIO
-
- rm -f twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
- optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
- optfeature "non-standard WebSocket compression support" "dev-python/snappy"
- optfeature "accelerated WAMP serialization support" \
- "dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
- optfeature "TLS transport encryption" \
- "dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
- optfeature "WAMP-SCRAM authentication" \
- "dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
- optfeature "native SIMD acceleration" "dev-python/cffi"
-
- python_foreach_impl twisted-regen-cache
-}
-
-pkg_postrm() {
- python_foreach_impl twisted-regen-cache
-}
diff --git a/dev-python/autobahn/autobahn-22.3.2.ebuild b/dev-python/autobahn/autobahn-22.3.2.ebuild
index a15603075d58..6280c160e0bd 100644
--- a/dev-python/autobahn/autobahn-22.3.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.3.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
IUSE="test xbr"
RESTRICT="!test? ( test )"
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 307c37d14245..5774ad0bd709 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1 @@
-DIST aws-sam-translator-1.40.0.tar.gz 988864 BLAKE2B 5a414bde5ceeb016267c64742e8c8dabf1460471261a84464ab2bffa4b5553eb042ffe2b4ac91b470316f64a68043e27f652b2cc5aabc8a83cf61faa89d7af51 SHA512 99c578cbe4100c30d2e6357dbb35aaf9e93180b8fce27f1b8400253153fef7d18487b5f67e0824920c6adb8bfdfe763a8fd893b3ac4ef3f781673f4761866e0e
-DIST aws-sam-translator-1.42.0.tar.gz 1017720 BLAKE2B d0166b09b99c64f5f4a4c1ebfe63b6a35ca6db73efb97f76b8748272b646fe2fcf9de06c2f6b29ce69a3edfce9235ba932913055e70f48d88569e4df25a6be0e SHA512 6b1bfd4bde203e31a9d98a385d6c0705ba651c39846358e750faf8a30c4e4e8b2ee57623af27da670ee8f1f5edca795b1b5528b5237ff9f01f911d4b9385ebcd
-DIST aws-sam-translator-1.43.0.tar.gz 1046840 BLAKE2B 19e405a07c9eb42ee77f26986eb09e6902559fc3fad5f1b7f4df0d09cb529add1c53910afa3fa3d867f048e69fb4c6872004733fc611347d4438013b80605e5c SHA512 9e7a5b4769eafcf1a9d8af7582cd4af3a82843d2c7c474495b9099fcb94f8dd0dd45d02f52ed609de7dc341b77f0f913526410935244836c3201b99c3fb6a292
-DIST aws-sam-translator-1.44.0.tar.gz 1047747 BLAKE2B 54714943b1bb561e32fb0102aa7b3fdb77d9bd864510ff1cc5315591fad70ef112fe7bc080f2c7ba1444fc2dd7ccae212c539b8ec2015a93b1486e9152493fac SHA512 0c165b808b6ead83bfb3d4ee75ff683e733433b505ec035527b3e2ecac4d166acf60ce7c0a16f16181a42adf126bb215f88916e705fc9746b412ba58dbfe1815
DIST aws-sam-translator-1.45.0.tar.gz 1053946 BLAKE2B b34c7417bd20fbd5907992e860ff7acaf1f6dea699d4385bda96467ff03965f30b068835af377d41dcd0ef210509d0b21a05b7e65394771981f8b499730acd41 SHA512 218eda9498fe0db9bab71cdd09d128403248e80936eb2a0e8afeff31f5f8e959aa9d70997ed565c05739ab40bc93d51d1fd84969ec9d7e48b8f10c062b2f74d1
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.40.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.40.0.ebuild
deleted file mode 100644
index 03889222928e..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.40.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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.17[${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
-
- # 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.42.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild
deleted file mode 100644
index 5249a3f3d407..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/boto3-1.17[${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
-
-EPYTEST_DESELECT=(
- tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-)
-
-python_prepare_all() {
- # remove pytest-cov dependency
- sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
- -i pytest.ini || 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.43.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.43.0.ebuild
deleted file mode 100644
index 34c909b06a88..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.43.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/boto3-1.17[${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
-
-EPYTEST_DESELECT=(
- tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
- tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-)
-
-python_prepare_all() {
- # remove pytest-cov dependency
- sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
- -i pytest.ini || 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.44.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.44.0.ebuild
deleted file mode 100644
index 34c909b06a88..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.44.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/boto3-1.17[${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
-
-EPYTEST_DESELECT=(
- tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
- tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-)
-
-python_prepare_all() {
- # remove pytest-cov dependency
- sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
- -i pytest.ini || 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.45.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
index 34c909b06a88..aaa2e4d290de 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 406577c52014..91b3ddff944a 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,3 +1,4 @@
DIST awxkit-19.4.0.tar.gz 95558 BLAKE2B fa8f408e310ba819e6d8a326e67dddac44ffe0fec2ff3018e8eeeda269c50257689b221785f27c897f526e6f5180c49aa506be6b85e01602b0d7d1dcd88a6987 SHA512 c6c6cf897128153fbb1dac77d50028a7649b97278394384bf5a549c1583b9c89b694f1ce2c850d0b072a4a7142a9b906edfba8d3a68cb446c73a13e3e33c0a61
DIST awxkit-20.0.1.gh.tar.gz 15896876 BLAKE2B b1ad083e8aa5075b2acd03fe588223186e96f7a09451dec471f58fc463717079840368ad770c3bbcc819fdf7b148fcfdc098baa72dae923d3a3db514318c8a5e SHA512 caa6092bb2d47c9027fd20e42207f4e4fd431afaaec88afd498d0f535545f99dbd9186338e803d33e3cbaa3fcb4e44f29d6d7688b2c22f9393438aae3c9c6ed3
DIST awxkit-20.1.0.gh.tar.gz 15917777 BLAKE2B da7f112472d55fa90fc2c92ac6c4fbce89928a24e861e18b04342039aae2ef467bbf5f8b67a0ad5a5e3a90d77f5363d6df742199d988aa7dd35ac1b00c3625ca SHA512 835053a7adabc96f21650e7ed2d4bfb088fbcdbf359572673904756d7bee4fe2b60fc42d1bdacf4c8ab5a1101e474cb8d6018ae67486b16d9675dbe69b9d056c
+DIST awxkit-21.0.0.gh.tar.gz 16493147 BLAKE2B 9b89f9f6f2e231efcde0edeb7d39a1b328b9b534a38663a2463f974028ce96aa13677d8e14d4b4a55fd3de252d5e53dbab2d104e018ad60eaca1ddb1b7bf937c SHA512 e100359eb9be184924c9b562473dd23dcfddf270e72f2f0fc1f71f8774dc1d3fbfce6b365f13ecffe20b25b116690fcca504d373663c497e74d2d1185b98f01f
diff --git a/dev-python/awxkit/awxkit-21.0.0.ebuild b/dev-python/awxkit/awxkit-21.0.0.ebuild
new file mode 100644
index 000000000000..f63cc6bc217b
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+ sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+ -e "/'clean'/d" \
+ -i setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
index 3ed6164fd3ba..9baef88f5072 100644
--- a/dev-python/backoff/Manifest
+++ b/dev-python/backoff/Manifest
@@ -1,2 +1,4 @@
DIST backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
DIST backoff-1.11.1.gh.tar.gz 17581 BLAKE2B ca940270859ad78cd29d33cfd3c17605f5b42c2c745b7e7a41d53b2d6ef4bee78dd9e8f15c80387da31679aac6d30404c0988013a890ff34bd55e91716c0eff8 SHA512 7ba0e579d2a4a4bb5046ddc0d1f4b5b58ae2969a10a10a3c657e7dd9b8fd0cd6bc56fec18c28c8fb49101521b3840fe31c65e103977ea5f52f3671a07def97d4
+DIST backoff-2.0.0.gh.tar.gz 19327 BLAKE2B a53d97c8f27b05a2cf0fac9d7ffd5c964f7f58c8c1d6957bb495502c4dd2742fb3dc7c9a6e31f9aabc8982d548926a93e23aa1a60bada4cb3ac9f0968647face SHA512 34e37b3ff45e92311e7d040b05783e094cafc5d1d32c7e2cb8ef89cb9c0ca1a7ca2b16ba596c3b1c4a308d1780d790c9b077411eb8d48d6c5c86f2d6ea82f475
+DIST backoff-2.0.1.gh.tar.gz 19356 BLAKE2B 0d4867372763d59cf3d20e15ef5a9d01d314f9862170f55bcbbb5c29eb571dd672d4e0393f6b5b6d84b695264915d6c9a2649637b84a79062d4fe6a37b742cfb SHA512 bcec57466470ab419b04e5bdcad7dd6717fda1e27678a9c0e2cab9ce974d55c2057a73dc488105e71ec9a893acb32a907809a839490ff6442f20d9d3f41436d9
diff --git a/dev-python/backoff/backoff-2.0.0.ebuild b/dev-python/backoff/backoff-2.0.0.ebuild
new file mode 100644
index 000000000000..6e819a3cee44
--- /dev/null
+++ b/dev-python/backoff/backoff-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="
+ https://github.com/litl/backoff/
+ https://pypi.org/project/backoff/
+"
+SRC_URI="
+ https://github.com/litl/backoff/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="
+ test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-2.0.1.ebuild b/dev-python/backoff/backoff-2.0.1.ebuild
new file mode 100644
index 000000000000..6e819a3cee44
--- /dev/null
+++ b/dev-python/backoff/backoff-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="
+ https://github.com/litl/backoff/
+ https://pypi.org/project/backoff/
+"
+SRC_URI="
+ https://github.com/litl/backoff/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="
+ test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/bandit/bandit-1.7.4.ebuild b/dev-python/bandit/bandit-1.7.4.ebuild
index e5fa5a6ea770..f75317ac605d 100644
--- a/dev-python/bandit/bandit-1.7.4.ebuild
+++ b/dev-python/bandit/bandit-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
RDEPEND="
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 6471ec7d2232..fbaf3adf4466 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/black/black-22.3.0.ebuild b/dev-python/black/black-22.3.0.ebuild
index 5af8bdaa4f15..d2cfe32f6a8d 100644
--- a/dev-python/black/black-22.3.0.ebuild
+++ b/dev-python/black/black-22.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/blockdiag/blockdiag-3.0.0.ebuild b/dev-python/blockdiag/blockdiag-3.0.0.ebuild
index fbe42c7c45a2..4d8a506e18b7 100644
--- a/dev-python/blockdiag/blockdiag-3.0.0.ebuild
+++ b/dev-python/blockdiag/blockdiag-3.0.0.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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/funcparserlib-1.0.0_alpha0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a2cbc1575e8d..5cc9203ad30a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,14 +1,6 @@
-DIST boto3-1.21.22.tar.gz 479768 BLAKE2B 3ae647a4c06cb9f7c4c32216dba439ce8bbf346fccf5a8651c08b398bcb7fdb0a4ac81c8d311625d0f50634b90c2f8a02160a19435db836ad05edf0d998a148d SHA512 583a49907339fdb8bb1deaec7683dad6bd0c2836a05cc317a8fc97a17e7b79fd114677fd6342cf6f96b1140bf1bcf9ca0fb1fd3af1c86600e6cfba5bbbf21ec2
-DIST boto3-1.21.27.tar.gz 482968 BLAKE2B f8dbabe73377a861cf1d3d2e9388f7ba91f2047d8ce792b44a10693e5b0575924b3abbd8ec2b72d0c3b9a553bb088fc17dc4cd23b571f375db45737376931a46 SHA512 54bb43022ba12fc7b5c54872632cd46c07c6f167246917b5413cdd30de6c327bc625410cdfe62f4ff257ad7c42da762d2bcec5515367e214131259ddc69a9061
-DIST boto3-1.21.32.tar.gz 485694 BLAKE2B da6fa6f38b234af9e67bfeb8182751f1ac533a2aea72d8d407aea21554501f598c9da71f3c30dd952248c1ab244c849b779a329fc941d05b53325fe46de2aba4 SHA512 d65cffa91ae1a29e69e4bac2fc0af704987e9bca914f3f905e00c383bc92127c6e41beed71e9445e3f484c6dadde2372aca69f550af600abbb42731275c53eda
-DIST boto3-1.21.35.tar.gz 486835 BLAKE2B 167070bf09785bac17083cef3caf144cf11a4266c4476af2f6e19b06c81f2d2bcee42b8c7de1d1c9ac178c025bcac08366b2c7cb072cdb663910d45f7e8369fa SHA512 fe73111a46fb27d9c77abec3a13c5267243b2fcc3f89c01d9036f6ca9f362d029c9cbfbb6c1df11b302a9fb0468453fc1b91ee3dac4853bab6662f1ebfa211b2
-DIST boto3-1.21.36.tar.gz 487111 BLAKE2B c812e80a2bd81f2feda25b9e43444d1587eb2706ab4372a71f6aad5051020dc2439c639e04f37322ab0c1a396c22c5dc45e773cf73518886d3aab9980633f45c SHA512 1530cd11471ddfdd6a77a250fc5af7546a760cc281b327be6b67b7e49ab40cdc440d4fbe8a72387009b2c2c3dc2e6d7baaa3b1dec3d5d4d276db89e1312e55cf
-DIST boto3-1.21.37.tar.gz 487557 BLAKE2B 1c716a07279ce2c1020faee9e2e81b2bde3ed6e4c56668fa76eabc03c7c0818f8dc3ac0fcef66d4007d892e1f227e8642757b6fa5d6e1e18184ad17a30a0e404 SHA512 512e7859e700a98aa3112e21bbd7653e39e7e21bc8f3ef623254322f18869bc9b8a65612a3a9133847c189c59b1e2480225b71bdebd38b2e42cf4820d7ab6972
-DIST boto3-1.21.38.tar.gz 487786 BLAKE2B c247f51e3a7a7f9c531ab18d0fa93b90881c869631bffe35be5482a463a6580e733915d4f966d5700cf6bd822676416e9431f261fd237cb9dd85440308399e2d SHA512 a1b09de7a1dbede4000d500d96028a9ae70c60aa0cc1fc74201d52bc76a83dc27937d422592985e22b3dd1b98359255e837f66f51bae59f2104b379bfa7e49b3
-DIST boto3-1.21.39.tar.gz 488120 BLAKE2B 7fc998ec59d19fd6ea0377443920e30bcacdce5f185200757a13758e5e5229a7bbd959cd6854d9520f8ca6737af9f1adba887f3caef50fb7bbc9a2a38df9b472 SHA512 7c949773e0791d170158f7a8cc47559dcd9b2b6fbe422325b12b7d90649244e0475a6c35cfa15e00f1a0f49d2e581ba27d78320514e4ab8e8533bfb8510b37eb
-DIST boto3-1.21.41.tar.gz 488529 BLAKE2B a07662e4499ea6e833ee7a207dbf84522369ae0609ee7ac305fb8afca572114a938a1c0a23d75404c86c6afc2a516148a565e9ff607898566beb9b552fa44c3e SHA512 620fea69e84de1c6e705a33b00ba137f8550e0590492e13ece24bdf8ba6439be58e31821404a6dded02873a69256568d5061bf9de19ab75c37630865dcf97373
DIST boto3-1.21.42.tar.gz 488786 BLAKE2B eba75a62e2460aeb2ea66641fadb52448314e639af3d3ecb09f2ab48336bfdc78be868a5d710ba295732a65518eaef882a162df4d25cb8cb344aa27ab3f2ecbb SHA512 3ee8a299cad05e4317916286028608f3d289e6c2c3b04606dca8ede9ba7f3e8931321f33c91c40bd9c4aa15a2cab21245de5c26f6637139fa716149fbcac9c2c
-DIST boto3-1.21.43.tar.gz 489557 BLAKE2B ad297963b34d176f686f09da408bbd7f236413fa0c1c88231285ab5c742402ad3c4c8e9da463d6de463e4b9e80f8b30f13999bb990435208cc38123fb4720d41 SHA512 b0c800b4d55d0cf6c1af6f2c55ca1e702ff16d2f40a1eda63b5c100e396c8d5fadc99eb6db41e92a8a86f174009758b31f59d7b5e0d3f17dd532f5c3303b374c
-DIST boto3-1.21.44.tar.gz 490125 BLAKE2B 37a18fe2beff3a232f17b809bf19519800b6481f7f2cf727a45ab965d9dee27978ce1efc192fab70925776757c77573eb2703815958dcf8be9388e0fe8081502 SHA512 4ed06c2adf3187d7cbda5ef481883289a83137bd6065c56a61d0b2d452845f55c74ff8bd62f3558463b83abbfccb4c29638d1774c7076539b3e6ec088eefbb6b
-DIST boto3-1.21.45.tar.gz 491080 BLAKE2B 32692caeb34f9b8bd515b4cd9fa406b9537912abd24c5f5446ff10adf1a038a423e3c1c17fe6469c51cc35067a128064dcee715de81c46b4b118ddd9fb4a89ff SHA512 538fb81c06e1e14e78d39123c531558f0c2a2206ee0f0c9a282b3a86e179ff76682db206cca5c53d4e3b6deb6ded6f8843ad0d398f8584afca1be042782ba004
DIST boto3-1.21.46.tar.gz 491253 BLAKE2B f55d30087e4f29e3d8ba577d798cd4e4c5fe1f710ac172d6684f005047a422855a6fad91aaaac76e3f33260cbac35be81c8177a80bea913283bcbe7bacb3750f SHA512 0d219b1af786583318a078413a3b30999b2aaad985db72eafe2b63f0068996f0d13b7a48464909cc753d5f9098ea583336ef4887839db5375ebdfcedad3dbffa
+DIST boto3-1.22.0.tar.gz 492175 BLAKE2B cce4b21c0f4de7e70b1c9e402d9e19ccda26e7fc6eab07686c378ae8a9a72a7cf3bb3e2927282e21cd167ca395d63e1fbdfb31d385e5e7a2591c48367c80517c SHA512 b4c51a26e95344ec6e4b876d88148c9603ae7807105ffd0564d928f611c278729f00efd38baff4b31154b358b17ae72c6b90698aef9c013b601bc70d543e2ffb
+DIST boto3-1.22.1.tar.gz 493753 BLAKE2B bd58778f89b792b3203b4b8f86edaca2149ebc24399af9ffa090d9c8ccfa812a078e2d6742bafd08197e39e5020da16948fabb685a448b7acf7ce520321c94cd SHA512 0a8d02325331bb2e069fd1f7280a3c57dae8f6a25f6593db8a1c7998f765d2957765a71645a748da891e66d5ccee859d34171fabea08de62e13ee7793c0d7cb5
+DIST boto3-1.22.2.tar.gz 494671 BLAKE2B c9b72c6a4b667772147235c5791ac4d08adb9e4bd690ea9e369ce712fd705dcc89b2fea4f5b2c580702cc4eb5064b3e46f1237de15e5dd812e2b88c54144d665 SHA512 ecf5d77fb5128a79001a0ccf2e141197d23c0a24d61517e191058de24498d63b13e351fb8e0bfe28f1c58c676d44b2e7f98bd80c41a2510c61d737e086c1010b
+DIST boto3-1.22.3.tar.gz 495091 BLAKE2B a917cfec2cb77f9c639160be06f610855b625a9cf55858e0df4602823d6b068a0e188ee911c40255db9fa88b8e20d8b0354948be36e6bf4923b2e4cc45c30524 SHA512 1b12f40b981faf110a76af2418b2afa6fbcfd1ec01bbc842c2c75518245ca11a7d9bc7d5704965246008d43005e7a7a839cdfee7a2e49786ff543bddd1a41c02
diff --git a/dev-python/boto3/boto3-1.21.22.ebuild b/dev-python/boto3/boto3-1.21.22.ebuild
deleted file mode 100644
index be1f2d7a31fd..000000000000
--- a/dev-python/boto3/boto3-1.21.22.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.27.ebuild b/dev-python/boto3/boto3-1.21.27.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.27.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.32.ebuild b/dev-python/boto3/boto3-1.21.32.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.32.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.35.ebuild b/dev-python/boto3/boto3-1.21.35.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.35.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.36.ebuild b/dev-python/boto3/boto3-1.21.36.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.36.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.37.ebuild b/dev-python/boto3/boto3-1.21.37.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.37.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.38.ebuild b/dev-python/boto3/boto3-1.21.38.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.38.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.39.ebuild b/dev-python/boto3/boto3-1.21.39.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.39.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.41.ebuild b/dev-python/boto3/boto3-1.21.41.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.41.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.42.ebuild b/dev-python/boto3/boto3-1.21.42.ebuild
index 6fcba460ab1d..be1f2d7a31fd 100644
--- a/dev-python/boto3/boto3-1.21.42.ebuild
+++ b/dev-python/boto3/boto3-1.21.42.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == "9999" ]]; then
BOTOCORE_PV=${PV}
else
SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
# botocore is x.(y+3).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.21.43.ebuild b/dev-python/boto3/boto3-1.21.43.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.43.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.44.ebuild b/dev-python/boto3/boto3-1.21.44.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.44.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.45.ebuild b/dev-python/boto3/boto3-1.21.45.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.45.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.0.ebuild b/dev-python/boto3/boto3-1.22.0.ebuild
new file mode 100644
index 000000000000..23a4a6fecbae
--- /dev/null
+++ b/dev-python/boto3/boto3-1.22.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.22.1.ebuild b/dev-python/boto3/boto3-1.22.1.ebuild
new file mode 100644
index 000000000000..23a4a6fecbae
--- /dev/null
+++ b/dev-python/boto3/boto3-1.22.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.22.2.ebuild b/dev-python/boto3/boto3-1.22.2.ebuild
new file mode 100644
index 000000000000..23a4a6fecbae
--- /dev/null
+++ b/dev-python/boto3/boto3-1.22.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.22.3.ebuild b/dev-python/boto3/boto3-1.22.3.ebuild
new file mode 100644
index 000000000000..23a4a6fecbae
--- /dev/null
+++ b/dev-python/boto3/boto3-1.22.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 08e404dd41b6..23a4a6fecbae 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -5,10 +5,14 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
+
inherit distutils-r1 multiprocessing
DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d3476011d137..dc02e1b8372e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,14 +1,6 @@
-DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8fd89a2eb52a90b33f8fb4c0449ff23a00f56347a2916b271346acf2c0721af0a9695bff3663888aa87c790705ce4c3 SHA512 070222b5eca46fa5463620af63816bc8813c717a56b4c41294556130390959ac14570a1256542f145a5b36727ced9657b386fcd5f538d64912c8a9f049673bd6
-DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fcd9b0a4d7dda04ac656e0681aff378267f5c6bde4e64432f309ad4ed89ff8cae50b0dc92f01086f8fbe433e5347ad3 SHA512 1cdeb2926bfdd54eb6805295982891cb02005c01ee74e3394d8680e486fd924f73322fb9ae56730deaf360b0e60c9fd482759d597eadb3dc180cb099beff487c
-DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
-DIST botocore-1.24.35.tar.gz 8891601 BLAKE2B b6a56efa73a3f76f51764c4c649d38f2e596fb262624bc5931904318b68a773790f6e4e358cf42567aad0de4e97099699935e6da4c21be66a782f7005fbc15bf SHA512 3c0a7c935798a6dcdd419080a31050301f795ff67b8262673ee4ca09d8344f222ce4b1b7bfff3459089bbcb59c42041281ed8005c1533c34c24542d9a45c353c
-DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeba278506ac066bae3572f578cd2877827cc8a45d74f57fd10c5e87fdd46f39b951ec4d5bd15f0c484194640813080a SHA512 49256c288b74126595521eabcab750a58a05d07ecf5243ce0626961963326099c3fa3cb571664fb72c0f835624bd79e55e4940c9fc4b03b2b1dc7fd7d3a71213
-DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 SHA512 412a656e879b09bf9f82d02e291e988499106dce1f589b1048adf2145774a5dd9a9ca5f18d2b6eaedd895e384cbf1836c7b6bdc0867a83c7b863bddea77727f4
-DIST botocore-1.24.38.tar.gz 8900705 BLAKE2B 1f1504856d5908df7d8af9f92847d1d7ac9d8ce0258a63bcea4b593aaae4d87e71da45becadb5873eab53ceea6916e4c6a4931efd797b0474e7bfe4f0b60eb46 SHA512 1cf7cf2acc7773ab9f5c4d01eca24191f6d27e3eddd98abd33348bf171bcaa2708e8c9a03ceb2676060a1f906d66e6982fe3bce3b78ed878abc30434812327c0
-DIST botocore-1.24.39.tar.gz 8901325 BLAKE2B ffdafe7b34c7114de12044d14dd9ba58f01b21455f51a527da55450840f7f74cfaee56babb105b18634b06293ef91427534ea08b47d223285046bd718cc6cc7a SHA512 13c24f4e305bc16441682f483b0478730f5487388d73e14fc3750e22fd3c4c1c958146264721f365b00d1cddd4222e7c0b5d0be26df171ba4e95091327a340c8
-DIST botocore-1.24.41.tar.gz 8906754 BLAKE2B ff2e19dca96137f7e6335ad41ce645d132989ddafecfe8be780166b697bd9fff18eaeddd7a88d4b76cf2aa95c1822f88590940d674ea82e97c14d7bdf6c1d5de SHA512 071fb09c50b3eacbb68ddc5831bb8fceef92e5cb8aad9e4b74b1ab65528edbefc83d0bc86271d87aea97d923813ab1613fe342be0815df7a350edf602dae49bd
DIST botocore-1.24.42.tar.gz 8907476 BLAKE2B 11cdce9d9c69835b1e57757d67d561f24932698dcaf9fc20e1add319889992b9c57c91ab5e9495027b9b96b6782698b29801d3f3815e8bfb47a67197c91448b5 SHA512 c7339cf03b121289eccc8dfe24c16ab28cba121ec1cd1883eaf2b29cd57b5e84d4e4b3a0bfcb8b4cbd0d213976af30630b2bda22e336edbaf208f5edd7823571
-DIST botocore-1.24.43.tar.gz 8913464 BLAKE2B b974ba0a5cc7c1176acab80baf329a11a78f440fe5a6d2b95ffab52d0973aa14c5dc88cfc1e17bf320492013d0f660ea80707c7ea7af384bf56882c31d5a82cd SHA512 aceb7182cbd4895149f751ff68e836b6bca439833213a7cffb20ea86101a60ccccb49941ab8ce5300449f9b2fbfcd42ff523c95eb220890cb060cf2b5de3c4cf
-DIST botocore-1.24.44.tar.gz 8915208 BLAKE2B eecbe7089e2aab77a90cedb87f729e1bd2f2074ec8218d3ebad314ab884806703d8a907c448e35586bafcc71fae0d0991e8656fdc1f937cc18bb503b4a807f93 SHA512 3850ea97e93b6cba211bd42e75ea1499ae09ea9c2acc576c229ca8ae4786779e2ff6ea283443d0d9fc6e856174cbf1bc402cbf87e946ce57f67569b448caf56a
-DIST botocore-1.24.45.tar.gz 8920603 BLAKE2B a71ba9d90edbbdc278890241cfce72753e5d3662298cb7a09e4314da1fa4af8fe33629c10160549b0d0832aef859b5bfeb449c3b559daad531d4e1e23afd2c43 SHA512 e7756bf7913bf5dce81d089674e2375ae5447c434b5ecc29c8b5b824d6cb19fe7f03e81cde46703a43356e5e8e2f45793ad521d0c0c7f3d29a810f01be50b087
DIST botocore-1.24.46.tar.gz 8922345 BLAKE2B f9caf235e902be9e4e15e9a570e67cac328eb7e53668e7e12ba8e6caa4c9ed53e22115231d58fdf8d782ff3ab618e5485438dce7c454918a5d53341e5e5967ac SHA512 ccdbd6e6617a68f810c5491f37a6e94ffe015b30dfea8b01c2543b58c81573358b69af702df2fcf3efb7dd2c4b715e86957c4d60b8f0a0a51279e921dfe02993
+DIST botocore-1.25.0.tar.gz 8925642 BLAKE2B 7f7b89e59801564284cd5e22958bb590aeb821c38682c7dd6163fd31b1c181ae67412b3d8cde351a48a63c2e762923d6bb2bb051e9a367468eb77db228e1c3ad SHA512 43f3edcd6868b37933b24486091097dd6dfc51f51773bea3e3cff1fce5eef5f8b3df6d09b8815c858f5c8d7e87e8ed14cf13f236e72c851e4f98d52ad85e4afc
+DIST botocore-1.25.1.tar.gz 8931771 BLAKE2B 6d2ba3c564104e8463ce588a0f9de47d4ecb7397ae03ddd4698b38f18617ab225676925d142ae0805467f860410addfbefbf6eed521d5142b994274c3bde7a06 SHA512 52dff81c0f7064aa1edc15aebf3e326c0b4ba1dc87667c8da6f487b1caa03a5ba3247253994139dab7d40873197d88f94e8545ffc3e2d51f26c14de27b5d6460
+DIST botocore-1.25.2.tar.gz 8947291 BLAKE2B fedf6c61ac2bc43ae6a60f7afb717d319ffd3baf4d6c5849a11279e96901e4968141b916c8d3c46ff007942ffe25fc85e7c8ef5176331e6537446cf349edc52f SHA512 5660e1fc96575dfa7d8c177192783f6edf5689176f6e3ac8c9ec5c85debe7a124297e1e61af5e1a35785346e40deba1ef7a2d8eac52902cda2cffb0327dcb701
+DIST botocore-1.25.3.tar.gz 8949001 BLAKE2B 5c59bbf4f5189de36093881f4b702027484f916664f8360ed90a301a9db407e44c41f69feb118a54e2f35025711e131f69bae1a032cbf7d3eb339b1cd0bc85a4 SHA512 27e2853e938139e670f1155b64b9e233675316ea11aa2eb6e8dc74dc1b50b75d909811b2a7d470a6933f5263bab10d8aa9108eddd0c501ad974dbb1bc2ff741e
diff --git a/dev-python/botocore/botocore-1.24.22.ebuild b/dev-python/botocore/botocore-1.24.22.ebuild
deleted file mode 100644
index f6855cd0f126..000000000000
--- a/dev-python/botocore/botocore-1.24.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.27.ebuild b/dev-python/botocore/botocore-1.24.27.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.27.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.32.ebuild b/dev-python/botocore/botocore-1.24.32.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.32.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.35.ebuild b/dev-python/botocore/botocore-1.24.35.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.35.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.36.ebuild b/dev-python/botocore/botocore-1.24.36.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.37.ebuild b/dev-python/botocore/botocore-1.24.37.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.37.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.38.ebuild b/dev-python/botocore/botocore-1.24.38.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.39.ebuild b/dev-python/botocore/botocore-1.24.39.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.39.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.41.ebuild b/dev-python/botocore/botocore-1.24.41.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.41.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.42.ebuild b/dev-python/botocore/botocore-1.24.42.ebuild
index 3bf7c7cfb689..f6855cd0f126 100644
--- a/dev-python/botocore/botocore-1.24.42.ebuild
+++ b/dev-python/botocore/botocore-1.24.42.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
fi
RDEPEND="
diff --git a/dev-python/botocore/botocore-1.24.43.ebuild b/dev-python/botocore/botocore-1.24.43.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.43.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.44.ebuild b/dev-python/botocore/botocore-1.24.44.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.44.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.45.ebuild b/dev-python/botocore/botocore-1.24.45.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.45.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- )
-
- epytest tests/{functional,unit} \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.0.ebuild b/dev-python/botocore/botocore-1.25.0.ebuild
new file mode 100644
index 000000000000..759ccf657074
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+
+ # unbundle deps
+ rm -r botocore/vendored || die
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # rely on bundled six
+ tests/functional/test_six_imports.py::test_no_bare_six_imports
+ tests/functional/test_six_threading.py::test_six_thread_safety
+ )
+
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.25.1.ebuild b/dev-python/botocore/botocore-1.25.1.ebuild
new file mode 100644
index 000000000000..759ccf657074
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+
+ # unbundle deps
+ rm -r botocore/vendored || die
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # rely on bundled six
+ tests/functional/test_six_imports.py::test_no_bare_six_imports
+ tests/functional/test_six_threading.py::test_six_thread_safety
+ )
+
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.25.2.ebuild b/dev-python/botocore/botocore-1.25.2.ebuild
new file mode 100644
index 000000000000..759ccf657074
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+
+ # unbundle deps
+ rm -r botocore/vendored || die
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # rely on bundled six
+ tests/functional/test_six_imports.py::test_no_bare_six_imports
+ tests/functional/test_six_threading.py::test_six_thread_safety
+ )
+
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.25.3.ebuild b/dev-python/botocore/botocore-1.25.3.ebuild
new file mode 100644
index 000000000000..759ccf657074
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+
+ # unbundle deps
+ rm -r botocore/vendored || die
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # rely on bundled six
+ tests/functional/test_six_imports.py::test_no_bare_six_imports
+ tests/functional/test_six_threading.py::test_six_thread_safety
+ )
+
+ epytest tests/{functional,unit} \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 35239170e3a4..759ccf657074 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -5,10 +5,14 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
+
inherit distutils-r1 multiprocessing
DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
LICENSE="Apache-2.0"
SLOT="0"
@@ -22,7 +26,7 @@ fi
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
+ =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
"
diff --git a/dev-python/cattrs/cattrs-22.1.0.ebuild b/dev-python/cattrs/cattrs-22.1.0.ebuild
index 5f09a67c0719..333c5d6b2290 100644
--- a/dev-python/cattrs/cattrs-22.1.0.ebuild
+++ b/dev-python/cattrs/cattrs-22.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
@@ -48,9 +48,6 @@ src_prepare() {
sed -e 's:--benchmark.*::' \
-e '/addopts/d' \
-i pyproject.toml || die
- # backport pyproject.toml fix (50ba769c8349f5891b157d2bb7f06602822ac0a3)
- sed -e 's:group.dev.dependencies:dev-dependencies:' \
- -i pyproject.toml || die
distutils-r1_src_prepare
}
diff --git a/dev-python/certifi/certifi-3021.3.16-r1.ebuild b/dev-python/certifi/certifi-3021.3.16-r1.ebuild
index 6019af2a84af..cc5fde7ec874 100644
--- a/dev-python/certifi/certifi-3021.3.16-r1.ebuild
+++ b/dev-python/certifi/certifi-3021.3.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index e47fd7ad88f1..33077eec9fe8 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1 @@
-DIST cfn-lint-0.58.3.tar.gz 8779688 BLAKE2B 0964d477f61ec3dc4f80d59e3b05bc92cba27c0c9293a343bf15ee25df967643adf4d8aaa0c11d336a857957bc19dd1cc711b7fe9014c9c43ffd0171b197c4f5 SHA512 9f88f533a6533cf23ce9be83f61cc7418df7775e331ea932f469b391e136a370e5adef9a41a5378dc99d4aec352ababebc1eb59b15d19c0c0c6f19e12410ae06
-DIST cfn-lint-0.58.4.tar.gz 8838063 BLAKE2B 77caf931c79b90d44c09c7ad63ff928c5217fa3cb9474ce8d3a3151a4a804365293e4304484ae1a2c55acfb2718dddce9f0b26165d35a570c3a7baab3cf76290 SHA512 53c24e265eaa8064bc23740376668c4a640571e0e273fc475f70de468be51683f3eacbbce82dddb9e05a23049299b49e660f28d5ef93150a60260fa0f4b77a19
DIST cfn-lint-0.59.0.tar.gz 9004743 BLAKE2B e778c1081e45dacc813f8a4ae7726eb929fabcdbfaafcbbc5f0d925cfe32773851366c9488363728ae42349cbe899a6cacd114940ee8d76dc284b30ea87fe19a SHA512 e8e9d0fb1f366c49f8a008000a808ec4b6c4299ff3c9650229619d8e48f1812709ecd54274163d8bd389c6823f20accd7d31f6147bec926ec233ede3ee51ee10
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
deleted file mode 100644
index de09469670c8..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
- https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
- >=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- >=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- >dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
- >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
- >=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # TODO
- test/unit/module/test_template.py::TestTemplate::test_build_graph
- # requires git repo
- test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
- # Internet
- test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
- # unpin the deps
- sed -e 's:~=[0-9.]*::' -i setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
deleted file mode 100644
index b8ea9d7827e1..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
- https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- >=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- >dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
- >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
- >=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # TODO
- test/unit/module/test_template.py::TestTemplate::test_build_graph
- # requires git repo
- test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
- # Internet
- test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
- # unpin the deps
- sed -e 's:~=[0-9.]*::' -i setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
index f3316978d184..3af094e51db8 100644
--- a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
RDEPEND="
>=dev-python/aws-sam-translator-1.45.0[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
index c91d0df301e5..a7232a14a2cb 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/cheroot/metadata.xml b/dev-python/cheroot/metadata.xml
index 38f6d95d105a..303e66eaa698 100644
--- a/dev-python/cheroot/metadata.xml
+++ b/dev-python/cheroot/metadata.xml
@@ -1,10 +1,6 @@
-
- zmedico@gentoo.org
- Zac Medico
-
python@gentoo.org
Python
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a785ef33c460..4dfb61c584a9 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,3 @@
-DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
diff --git a/dev-python/clang-python/clang-python-11.1.0.ebuild b/dev-python/clang-python/clang-python-11.1.0.ebuild
deleted file mode 100644
index 283e3ceee1f6..000000000000
--- a/dev-python/clang-python/clang-python-11.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
- >=sys-devel/clang-${PV}:*
- !sys-devel/llvm:0[clang(-),python(-)]
- !sys-devel/clang:0[python(-)]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
- "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
- python_foreach_impl python_test
-}
-
-src_install() {
- python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-15.0.0.9999.ebuild b/dev-python/clang-python/clang-python-15.0.0.9999.ebuild
index fb6456619641..9e000ace36bf 100644
--- a/dev-python/clang-python/clang-python-15.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-15.0.0.9999.ebuild
@@ -13,17 +13,23 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
KEYWORDS=""
IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# The module is opening libclang.so directly, and doing some blasphemy
# on top of it.
-RDEPEND="
+DEPEND="
>=sys-devel/clang-${PV}:*
!sys-devel/llvm:0[clang(-),python(-)]
!sys-devel/clang:0[python(-)]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
+"
+RDEPEND="
+ ${DEPEND}
+ ${PYTHON_DEPS}
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+"
LLVM_COMPONENTS=( clang/bindings/python )
llvm.org_set_globals
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index cb0bcdbd3f9f..b5f1c1ff93b9 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,3 +3,4 @@ DIST click-8.0.4.tar.gz 332977 BLAKE2B 71366fa8436fb6997675ecb84d98f43b40a646466
DIST click-8.1.0.tar.gz 333449 BLAKE2B c0f5dfb245c5c8a71e9aa5200393d021f4e77ae73fa9a8cdef4abc35546d2ff0b7b1322776002dc28b37e8311141fc3db8a39b5cfbb8947781326b6417494563 SHA512 7d9fcd74392baa55e0fd9050e7382d4b8b542856d4fee79ec5a4d6185ddeb47abaed1de6771e30aaec6cee5cff7166dd8ab7fefbc6aefa1856adc58b9fecc0c7
DIST click-8.1.1.tar.gz 333663 BLAKE2B c7b0de884c3ea5365d3227f5a4e81a41531dfa100705b203745bed15826cc7e9ace112c959ab5f4eabac510623d83ceeedf6ea36a40aaf8f997cbb6b3ba1abfb SHA512 b553d140f1425001575d7584367bd90cea6d20760b4a811efb0fb164f0d62d631f54514b033ceb1130d510f35cfb330f4af6d93d1e70dd1ea929b878304b9140
DIST click-8.1.2.gh.tar.gz 333755 BLAKE2B cf579db101e296a0626445e0823d8c72bc6cd40f0ec667c3179465050d0aa7d7a94ed1416d583f7c9afde8e5ea41738c26b000f87c95074a9d93837c039d687a SHA512 8781965212a0732990e47050db8ae5e37633986b23cd7895d74f06007c61993f8ea45183376761987931caf00dd68c22900bc8d3930d4416853374cfd170a0e5
+DIST click-8.1.3.gh.tar.gz 333961 BLAKE2B ed80d9be1e5740f1e4af62e97cd78488dc99d59da4a6dc9c99fb62b08c32ca2b889e3678a2841052922d102d8ac83df19e3e2d0ff41c46387e695d3718c7702d SHA512 29194ee3877e013a2fe1037870522c5b5a78136ca60da9109f29312a3e52c767867f5eec2d90ca385cd0508f77555b9d6ad8f5141dc31900ddc9307a2207a818
diff --git a/dev-python/click/click-8.1.2.ebuild b/dev-python/click/click-8.1.2.ebuild
index ba8f4b9c8fe8..50739b50f97a 100644
--- a/dev-python/click/click-8.1.2.ebuild
+++ b/dev-python/click/click-8.1.2.ebuild
@@ -27,7 +27,8 @@ distutils_enable_sphinx docs \
'>=dev-python/docutils-0.14' \
dev-python/pallets-sphinx-themes \
dev-python/sphinxcontrib-log_cabinet \
- dev-python/sphinx-issues
+ dev-python/sphinx-issues \
+ dev-python/sphinx-tabs
distutils_enable_tests pytest
python_install_all() {
diff --git a/dev-python/click/click-8.1.3.ebuild b/dev-python/click/click-8.1.3.ebuild
new file mode 100644
index 000000000000..4da31f5189e1
--- /dev/null
+++ b/dev-python/click/click-8.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+HOMEPAGE="
+ https://palletsprojects.com/p/click/
+ https://github.com/pallets/click/
+ https://pypi.org/project/click/
+"
+SRC_URI="
+ https://github.com/pallets/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_sphinx docs \
+ '>=dev-python/docutils-0.14' \
+ dev-python/pallets-sphinx-themes \
+ dev-python/sphinxcontrib-log_cabinet \
+ dev-python/sphinx-issues \
+ dev-python/sphinx-tabs
+distutils_enable_tests pytest
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index 26a05e90d1bf..b3c095fe347b 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/colorlog/colorlog-6.6.0.ebuild b/dev-python/colorlog/colorlog-6.6.0.ebuild
index e5a3cd0d0c41..427a96dd30ba 100644
--- a/dev-python/colorlog/colorlog-6.6.0.ebuild
+++ b/dev-python/colorlog/colorlog-6.6.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
distutils_enable_tests pytest
diff --git a/dev-python/commentjson/commentjson-0.9.0-r1.ebuild b/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..c90432d94b96
--- /dev/null
+++ b/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Add Python and JavaScript style comments in your JSON files"
+HOMEPAGE="
+ https://pypi.org/project/commentjson/
+ https://github.com/vaidik/commentjson/
+"
+SRC_URI="
+ https://github.com/vaidik/commentjson/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+ dev-python/lark[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/six[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # remove lark-parser dependency to allow painless upgrade to lark
+ sed -i -e '/lark-parser/d' setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/commentjson/commentjson-0.9.0.ebuild b/dev-python/commentjson/commentjson-0.9.0.ebuild
deleted file mode 100644
index d76e173d3810..000000000000
--- a/dev-python/commentjson/commentjson-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Add Python and JavaScript style comments in your JSON files"
-HOMEPAGE="
- https://pypi.org/project/commentjson/
- https://github.com/vaidik/commentjson/"
-SRC_URI="
- https://github.com/vaidik/commentjson/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
- dev-python/lark-parser[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/six[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- # remove unnecessary version bind
- sed -i -e '/lark-parser/s:,<0.8.0::' setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index aa5d8fe00cc4..5d1a7e796737 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/coreapi/coreapi-2.3.3-r2.ebuild b/dev-python/coreapi/coreapi-2.3.3-r2.ebuild
index 02f186b758d1..6c4a63e92554 100644
--- a/dev-python/coreapi/coreapi-2.3.3-r2.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3-r2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-python/coreschema[${PYTHON_USEDEP}]
diff --git a/dev-python/coreschema/coreschema-0.0.4-r1.ebuild b/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
index f839f7e41981..3236b029d8a7 100644
--- a/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 54dec941495d..0ef4b34669a6 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,50 +2,50 @@ DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877
DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
DIST asn1-0.8.7.crate 26288 BLAKE2B 702fdd34d5489b74cad023969c8873c6d469bd58376fc86fc124638ffe677f2d7f2592d28219ba741597d3791716b1303cff1fa6352f5df0fa41fdd0add628fd SHA512 4cccfa41423784cb82a0dc4fb0a23da7a14d7be883e22ec4263c219d9f14b1fb90d84f59750e11c561a494cbe6171494f60f9cdf1d1510411d579306c47f06a5
DIST asn1_derive-0.8.7.crate 4305 BLAKE2B cc1fe4a8c27730e65164daaed5d2d346364f08a47439e012f670db82190dba50cfbdf720cb253d7a057cb4b560b8ce73c557c639e90856e27d632995643dc45f SHA512 44c36d43761d8890354d40c0fe6f5b700bd9d90867ba258437d325fc6e2549921255b47107a2fb556f462194e468f0cb6d27f7bd644e2ffba8d98b0b8d84ee1a
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
-DIST cryptography-36.0.2.tar.gz 572053 BLAKE2B b34b994e44b1ccd099a56fba4a167d563a29652f86ab0f0000ef78b4093a15cbfb82a9cebecdcaf6bca782a5fdd20f6c7d2206d68a219626a9fe8ae13e9aec5e SHA512 cf4a537ba0ccaf136c82aefc2fc80f042827c48bf9ef072e3513760a93285cb4174021c72f9df0033a8bf58af6f831988adc0f4658855710715558b56631362e
+DIST cryptography-37.0.0.tar.gz 584360 BLAKE2B d2ff4e0185ea5ab8a5d3d3a1a9f67a87aeca6b01777c074b51bb936b4c7c8f8e46fd39c7ab6cb56d7a887c4fd83157a9fa650059aff51577c5d948fbe743e6d0 SHA512 bc73a4e73cdfdb0379535551c524dfcd06ee9d11f91bc4a8e8d725a9997b3468973c37b90d40f21237b9c66de78a13caf396a5bff8779c651f8a244704afc5a2
+DIST cryptography-37.0.1.tar.gz 585248 BLAKE2B c25d62110e49b52849856fa04fc62a72f7f57d8f7b6237e68a5aed4af5b770819440d0980ff0b3535dca076856a6c7bcf546ada705270bba9f41266d267f76f5 SHA512 751029ecfb911e70cd402f7bf1573ec6b4e1dd98bed27723e8c48e918cb417b2327af84f173dd21c986fe1d39a5721df38ccaa37f8b5ed569290c66c5e42f34a
DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-DIST cryptography_vectors-36.0.2.tar.gz 35227191 BLAKE2B ea2581778246cb32aaedcc47541c7f3db22449b915b4a4956e73588704714ae22efc1fcd7d095e3d9f6b451793ae5e04994eee6cf56327785583efec4f516931 SHA512 b7725a92191312686a0fdc0fcdb8f1ecba5ccfe249b3d6eebb5675bb5efd7bce6a424a4eef94dade0ab21415a952caee3c3d4624dade9d5de492be9e7175d623
+DIST cryptography_vectors-37.0.0.tar.gz 35240400 BLAKE2B 23d7e6212809a9e3269ae8f2d3714450032c774516e44f083a74ad6f0d500ce2500a20bf0f12b31abfc9ef774984a1d587019489743d2e04e983ae9842b66a1b SHA512 41f12f0593fe2c57f77bb76226d685c8bb0f7f8de0f0b32e0991d55571842f2639399d719855cc6800e29a85ec4f45a1b93a7b10d290ed66112f5b5d8ddc718c
+DIST cryptography_vectors-37.0.1.tar.gz 35240482 BLAKE2B 031587f4ab33348c366654a4717f18bf8a252d428309a94807cf57f7fc39858dd3f33376ad1d5112e14023370ae3d39939e9f0bba54306a55c643c94b66f9a0f SHA512 ed34add6fd9821412bd03214d197693d66d7e0507c5d9a1ce888c020052776952f1e9f2f3e4c1437198aa77cf459cedf9366f4c56f518211c7e4611760b9558d
DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
-DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
-DIST ouroboros-0.13.0.crate 5929 BLAKE2B ff54f4ed318f7a1875612a4ed5762c60de516f43825f0ecf23e5343958e5c8af68ae4aecc1daf913e58d21183ac037af047be015ef1e5c227ab4750e763ed4ab SHA512 3f5bbf3b9bcb7c8e8f5723ead9d7bc205137973efe7ffe474db707264c4b65e4645d9b9de87e515a1e55831f64d4be719ff7059cf8ed899a71548e3fbfcb0b42
-DIST ouroboros_macro-0.13.0.crate 15755 BLAKE2B 16b65a6417ef147d15083c51c96b382a96a71fae124f1baae91432c5de7585edf7ca3f3f8e35b303d3e3c17a411f740d1dccc3382d541c0e7ded22bda81a838e SHA512 976a548c0691f04f797f10a89da2ac4e1d84efca2876308a9b69d8513bfcfcbd5e07cdb62584b80ba83d5839e14b072bf331ecbd1c20fd65e1c2d731f947ce05
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST ouroboros-0.15.0.crate 6177 BLAKE2B 70989f764e3b83cf3f3ed598290540370a305a9b5e22f76954117a19c9bb0ccd4723892c0cbccd361a13e4961c49b3383a3f216b368d70de9d4908da87db1f72 SHA512 20e1dd42bd5789d3822c7f7d862f69c11695c19475cd943ce049b33184e231dac32d89745cf57a2db822f5f2967ee84b29320f40708612610e336aedb0c08be8
+DIST ouroboros_macro-0.15.0.crate 16239 BLAKE2B 6e40a0bd4f04dfe5f1b93f2ff0f9d169792e8f5c9c57089061f488b4d0907d0b45c63d0ccfe2ee7e0989c7009d96760bb4c873afa688e1359db09c1ee8ce0a68 SHA512 78003e89f1a062957d66261474392b32d67a75ab1933b2dadf9c6a8c8ecd29d184ef4a1f25cadd7e1afb23aa58dacf69ca6969c327405be5dc97b8fbc09568ae
DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
-DIST pem-1.0.1.crate 9669 BLAKE2B fd75f3a45125e1510a65edbec9125c8b33fc4db6aecd8e375ba29e9d55ac67d81f51b8c780888ec0f47e9b7df18b42394db8bdbb597e85767a5098b78575a19b SHA512 1464c572b6b100294b0992c5cee6cb12774d4b7199436580f502960bfdbacac0f8824915d2c7bac8c4d998ba87b1551a1f3c2b68eb298df62c261766b5d0cb5f
+DIST pem-1.0.2.crate 10305 BLAKE2B 17c3457a90807bdcc75795161e244a7c531449d0679212394a76601c2bc1b353d8c18d34c5cccae3a728387c834a23011b17a8a1bace15a1aae26de30adb1c8a SHA512 548498cdd2ba114b6f0905949fdb5880c667e6f300fdc96dc1e9abcea275ac281b85ce88830ca4478cd3318994a3c9528ba3a5597262bf8cf2da8cab8674cd0d
DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
DIST pyo3-0.15.2.crate 371382 BLAKE2B 79b813eca0818bf79e0e1c118c952219f16f1fe22a0ab1aaaac0499a5048ebbc27326bdd2d96054e410ef116866250464aa4e4d8e91bb733f915f77536bf0f05 SHA512 81595bf2b5d2b3a4e79750f0779c142fe7c3e7185f9ffa68a83fce30062ae6812d7af71bee425206552c95839ad7473408f658ff936d4a1f58fd1ac922822582
DIST pyo3-build-config-0.15.2.crate 22235 BLAKE2B 35355ee30242b7e95426920e7f108fd7f32aa86f2949bb388139ed84ac0a8da2adbc05a5ecaf3beb89525d0c7a4e25ca8e33e9f35e324cbd970f6b4dbe5fbfdf SHA512 e05e68bc54bc7287d3fb037251767dcbcb512e3cae29948507deb7e0ca18ec4d7fd5d598f1dca1a595b6edcd5395fb443189fe56724e67ef68422bf050b10324
DIST pyo3-macros-0.15.2.crate 7596 BLAKE2B f8ab6ba53354705617ad88a2db693e38596d563f14e5481141b913595f367cf43fdb438c077c89b22a60fb0cccba7d67e79f9528af25c626ec7d8ba2c2ae3825 SHA512 4a40fae4362aa811996d9ff94ff7bfb645396eccffe13fbfc1fff70ada80db56f1a03630cadffca4ff6e156f04c052e82e059d72541d720abbf0ab18f2a7057e
DIST pyo3-macros-backend-0.15.2.crate 46112 BLAKE2B f3efd72d375f709efca7366f702837222b3bde498a89750a9184437ac495cab031f12f83a062329ea3907e264ec0782523656e15cbe3eb03bc0535fe438a3e4d SHA512 5c3be99d863764376c3f66de304de8b36548cd99fae8ac40c548b3d467b6bdfcd683c53b4cd1aba26b1730c6b9214c36b1723a5d1299265734e67ea791918c82
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
+DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
-DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
-DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/dev-python/cryptography/cryptography-36.0.2.ebuild b/dev-python/cryptography/cryptography-36.0.2.ebuild
deleted file mode 100644
index fbc543c684f8..000000000000
--- a/dev-python/cryptography/cryptography-36.0.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
- Inflector-0.11.4
- aliasable-0.1.3
- asn1-0.8.7
- asn1_derive-0.8.7
- autocfg-1.0.1
- base64-0.13.0
- bitflags-1.3.2
- cfg-if-1.0.0
- chrono-0.4.19
- indoc-0.3.6
- indoc-impl-0.3.6
- instant-0.1.12
- lazy_static-1.4.0
- libc-0.2.107
- lock_api-0.4.5
- num-integer-0.1.44
- num-traits-0.2.14
- once_cell-1.8.0
- ouroboros-0.13.0
- ouroboros_macro-0.13.0
- parking_lot-0.11.2
- parking_lot_core-0.8.5
- paste-0.1.18
- paste-impl-0.1.18
- pem-1.0.1
- proc-macro-error-1.0.4
- proc-macro-error-attr-1.0.4
- proc-macro-hack-0.5.19
- proc-macro2-1.0.32
- pyo3-0.15.2
- pyo3-build-config-0.15.2
- pyo3-macros-0.15.2
- pyo3-macros-backend-0.15.2
- quote-1.0.10
- redox_syscall-0.2.10
- regex-1.5.4
- regex-syntax-0.6.25
- scopeguard-1.1.0
- smallvec-1.7.0
- stable_deref_trait-1.2.0
- syn-1.0.81
- unicode-xid-0.2.2
- unindent-0.1.7
- version_check-0.9.3
- winapi-0.3.9
- winapi-i686-pc-windows-gnu-0.4.0
- winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
- https://github.com/pyca/cryptography/
- https://pypi.org/project/cryptography/
-"
-SRC_URI="
- mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- $(cargo_crate_uris ${CRATES})
- test? (
- mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
- )
-"
-
-# MIT and BSD-3-Clause come from rust dependencies, some dependencies are also Apache 2.0 exclusively,
-# and some are Apache 2.0 or MIT
-LICENSE="Apache-2.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2o-r6:0=
-"
-DEPEND="
- ${RDEPEND}
- $(python_gen_cond_dep '
- >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
- ' 'python*')
-"
-BDEPEND="
- dev-python/setuptools-rust[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
- dev-python/iso8601[${PYTHON_USEDEP}]
- dev-python/pretend[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- )
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-PATCHES=(
- "${FILESDIR}"/${P}-pyo3-bump.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
- cargo_src_unpack
-}
-
-src_prepare() {
- default
-
- # work around availability macros not supported in GCC (yet)
- if [[ ${CHOST} == *-darwin* ]] ; then
- local darwinok=0
- if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
- darwinok=1
- fi
- sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
- src/_cffi_src/openssl/src/osrandom_engine.c || die
- fi
-}
-
-python_test() {
- local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
- epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cryptography/cryptography-37.0.0.ebuild b/dev-python/cryptography/cryptography-37.0.0.ebuild
new file mode 100644
index 000000000000..982405fb07d6
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+ Inflector-0.11.4
+ aliasable-0.1.3
+ asn1-0.8.7
+ asn1_derive-0.8.7
+ autocfg-1.1.0
+ base64-0.13.0
+ bitflags-1.3.2
+ cfg-if-1.0.0
+ chrono-0.4.19
+ indoc-0.3.6
+ indoc-impl-0.3.6
+ instant-0.1.12
+ lazy_static-1.4.0
+ libc-0.2.124
+ lock_api-0.4.7
+ num-integer-0.1.44
+ num-traits-0.2.14
+ once_cell-1.10.0
+ ouroboros-0.15.0
+ ouroboros_macro-0.15.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ paste-0.1.18
+ paste-impl-0.1.18
+ pem-1.0.2
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.37
+ pyo3-0.15.2
+ pyo3-build-config-0.15.2
+ pyo3-macros-0.15.2
+ pyo3-macros-backend-0.15.2
+ quote-1.0.18
+ redox_syscall-0.2.13
+ scopeguard-1.1.0
+ smallvec-1.8.0
+ stable_deref_trait-1.2.0
+ syn-1.0.91
+ unicode-xid-0.2.2
+ unindent-0.1.8
+ version_check-0.9.4
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+ https://github.com/pyca/cryptography/
+ https://pypi.org/project/cryptography/
+"
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ test? (
+ mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+ )
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2o-r6:0=
+"
+DEPEND="
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+ ' 'python*')
+"
+BDEPEND="
+ dev-python/setuptools-rust[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+ cargo_src_unpack
+}
+
+src_prepare() {
+ sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+ default
+
+ # work around availability macros not supported in GCC (yet)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local darwinok=0
+ if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+ darwinok=1
+ fi
+ sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+ src/_cffi_src/openssl/src/osrandom_engine.c || die
+ fi
+}
+
+python_test() {
+ local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+ local EPYTEST_IGNORE=(
+ tests/bench
+ )
+ epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cryptography/cryptography-37.0.1.ebuild b/dev-python/cryptography/cryptography-37.0.1.ebuild
new file mode 100644
index 000000000000..982405fb07d6
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+ Inflector-0.11.4
+ aliasable-0.1.3
+ asn1-0.8.7
+ asn1_derive-0.8.7
+ autocfg-1.1.0
+ base64-0.13.0
+ bitflags-1.3.2
+ cfg-if-1.0.0
+ chrono-0.4.19
+ indoc-0.3.6
+ indoc-impl-0.3.6
+ instant-0.1.12
+ lazy_static-1.4.0
+ libc-0.2.124
+ lock_api-0.4.7
+ num-integer-0.1.44
+ num-traits-0.2.14
+ once_cell-1.10.0
+ ouroboros-0.15.0
+ ouroboros_macro-0.15.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ paste-0.1.18
+ paste-impl-0.1.18
+ pem-1.0.2
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.37
+ pyo3-0.15.2
+ pyo3-build-config-0.15.2
+ pyo3-macros-0.15.2
+ pyo3-macros-backend-0.15.2
+ quote-1.0.18
+ redox_syscall-0.2.13
+ scopeguard-1.1.0
+ smallvec-1.8.0
+ stable_deref_trait-1.2.0
+ syn-1.0.91
+ unicode-xid-0.2.2
+ unindent-0.1.8
+ version_check-0.9.4
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+ https://github.com/pyca/cryptography/
+ https://pypi.org/project/cryptography/
+"
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ test? (
+ mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+ )
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2o-r6:0=
+"
+DEPEND="
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+ ' 'python*')
+"
+BDEPEND="
+ dev-python/setuptools-rust[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+ cargo_src_unpack
+}
+
+src_prepare() {
+ sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+ default
+
+ # work around availability macros not supported in GCC (yet)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local darwinok=0
+ if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+ darwinok=1
+ fi
+ sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+ src/_cffi_src/openssl/src/osrandom_engine.c || die
+ fi
+}
+
+python_test() {
+ local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+ local EPYTEST_IGNORE=(
+ tests/bench
+ )
+ epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch b/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch
deleted file mode 100644
index 9a7d7237c80c..000000000000
--- a/dev-python/cryptography/files/cryptography-36.0.2-pyo3-bump.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a39fbdcf31c1bb50d2d57fb42cf2b44f6d76525f Mon Sep 17 00:00:00 2001
-From: Alex Gaynor
-Date: Thu, 14 Apr 2022 14:18:02 -0400
-Subject: [PATCH] Update pyo3 to 0.15.2
-
----
- src/rust/Cargo.lock | 16 ++++++++--------
- src/rust/Cargo.toml | 2 +-
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
-index 6798102729..501dc47cc3 100644
---- a/src/rust/Cargo.lock
-+++ b/src/rust/Cargo.lock
-@@ -280,9 +280,9 @@ dependencies = [
-
- [[package]]
- name = "pyo3"
--version = "0.15.1"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720"
-+checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
- dependencies = [
- "cfg-if",
- "indoc",
-@@ -296,18 +296,18 @@ dependencies = [
-
- [[package]]
- name = "pyo3-build-config"
--version = "0.15.1"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b"
-+checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
- dependencies = [
- "once_cell",
- ]
-
- [[package]]
- name = "pyo3-macros"
--version = "0.15.1"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755"
-+checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
- dependencies = [
- "pyo3-macros-backend",
- "quote",
-@@ -316,9 +316,9 @@ dependencies = [
-
- [[package]]
- name = "pyo3-macros-backend"
--version = "0.15.1"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a"
-+checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
- dependencies = [
- "proc-macro2",
- "pyo3-build-config",
-diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
-index 7e10a5374c..d17245d46d 100644
---- a/src/rust/Cargo.toml
-+++ b/src/rust/Cargo.toml
-@@ -7,7 +7,7 @@ publish = false
-
- [dependencies]
- lazy_static = "1"
--pyo3 = { version = "0.15.1" }
-+pyo3 = { version = "0.15.2" }
- asn1 = { version = "0.8.7", default-features = false, features = ["derive"] }
- pem = "1.0"
- chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] }
diff --git a/dev-python/cython/cython-0.29.28.ebuild b/dev-python/cython/cython-0.29.28.ebuild
index 1867715c710a..a083c1c8e8e8 100644
--- a/dev-python/cython/cython-0.29.28.ebuild
+++ b/dev-python/cython/cython-0.29.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
index c173bf76ab7d..c284be800ff3 100644
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ b/dev-python/daemonize/daemonize-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
python_test() {
"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index c3aa3a743e87..529761e3008a 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
diff --git a/dev-python/dill/dill-0.3.4-r1.ebuild b/dev-python/dill/dill-0.3.4-r1.ebuild
index 7a718cbc6f15..fd46b8012dde 100644
--- a/dev-python/dill/dill-0.3.4-r1.ebuild
+++ b/dev-python/dill/dill-0.3.4-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
python_test() {
local fail= t
diff --git a/dev-python/dill/dill-0.3.4.ebuild b/dev-python/dill/dill-0.3.4.ebuild
deleted file mode 100644
index edfacf4878f7..000000000000
--- a/dev-python/dill/dill-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="
- https://github.com/uqfoundation/dill/archive/${P}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
- local fail= t
- for t in tests/test_*.py; do
- ebegin "\t${t}"
- "${EPYTHON}" "${t}"
- eend || fail=1
- done
-
- [[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/dirty-equals/dirty-equals-0.3.ebuild b/dev-python/dirty-equals/dirty-equals-0.3.ebuild
index f42198fbb2d9..eda6ad1e2ee0 100644
--- a/dev-python/dirty-equals/dirty-equals-0.3.ebuild
+++ b/dev-python/dirty-equals/dirty-equals-0.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
RDEPEND="
>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
diff --git a/dev-python/django-filter/django-filter-21.1-r2.ebuild b/dev-python/django-filter/django-filter-21.1-r2.ebuild
index 23b5fd509266..d64a0826500e 100644
--- a/dev-python/django-filter/django-filter-21.1-r2.ebuild
+++ b/dev-python/django-filter/django-filter-21.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index eb1086f1ce59..6e515861f6ef 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,2 +1 @@
-DIST django-prometheus-2.1.0.tar.gz 24615 BLAKE2B 381aa345fac29e71e2b883fb485dce1d6ca3f13fc863d6ca9a62d5cd8f605f8cca727fbc3a3946e707d80f89d7fbaf544610cfb4857a45bc3dc13eeb22aeb4d6 SHA512 0c102467b99df409e31f99fb77d16558bd01c9c11f04ac0f80b59e486bc6e03979e16785083980c43ee3caad26b7a6bf618f9592fcca788ec2793a30d6b44241
DIST django-prometheus-2.2.0.tar.gz 24995 BLAKE2B db79cbed99d4d5cb7d9ce22dfee69914a63373417b176b4311406f9a1fdcada16447d6ec8cb19ebd14789f520aa1d5755aace824e5462611f81a0cc688566f19 SHA512 a72c8345f220799ad0709e0e73912229267b5e01fc67ae7f647e53ccf7c7e170ad2456c81070a002dc411e840b1129d55719a7aa891b4dabe262837c8c7b3db5
diff --git a/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild b/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
deleted file mode 100644
index a669adb8d16e..000000000000
--- a/dev-python/django-prometheus/django-prometheus-2.1.0.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library to export Django metrics for Prometheus"
-HOMEPAGE="https://github.com/korfuri/django-prometheus"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -i "/pytest-runner/d" setup.py || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/django-tables2/django-tables2-2.4.1.ebuild b/dev-python/django-tables2/django-tables2-2.4.1.ebuild
index d39562b1bad8..1e7bbfe87159 100644
--- a/dev-python/django-tables2/django-tables2-2.4.1.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
SLOT="0"
LICENSE="BSD-2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild b/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
index c5a6e18e9304..abd393c14ea4 100644
--- a/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/django-2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.20.35.ebuild b/dev-python/dulwich/dulwich-0.20.35.ebuild
index 413607672873..8679a9d972dd 100644
--- a/dev-python/dulwich/dulwich-0.20.35.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
@@ -27,10 +27,10 @@ RDEPEND="
BDEPEND="
test? (
${RDEPEND}
- !hppa? ( !ia64? (
+ !hppa? ( !ia64? ( !s390? (
dev-python/gevent[${PYTHON_USEDEP}]
dev-python/geventhttpclient[${PYTHON_USEDEP}]
- ) )
+ ) ) )
app-crypt/gpgme[python,${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/fastimport[${PYTHON_USEDEP}]
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index e99735f26d80..9a4ae5989e2b 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1 +1,2 @@
DIST elementpath-2.5.0.gh.tar.gz 263680 BLAKE2B 50ecea0766ddad4239b9283b223e945ae12fabf51bc246bb672517d04912b07cc2d46c1f04ff74f7f6da44d7dc422cde0c38a1f25a1f61068390dbfcc5ad58c4 SHA512 bbc6ce6a6a3eb3312d53be6040b8f4676f460e76de9b476410a3170734410b7a3d61c53081633d39089def05c74446d26abe093f02b9686a595cdb6e10440047
+DIST elementpath-2.5.1.gh.tar.gz 263727 BLAKE2B adfc3727c8afe691ba09e143249779ca3f0cee2fd743963b013d790215b30650eecbe2c924a026c07f9018a23710a0ade6e83567103d8eeffd85a71d398b7c77 SHA512 35c272a9f3dc2ddb1ab6b1aaa67588c1e3fcc5765a2edfd4dae47346b7b45f209b38a501a24f0c37b5ca0d933928c13b8608f33a2aadc57e1e4eeb928a491ab8
diff --git a/dev-python/elementpath/elementpath-2.5.1.ebuild b/dev-python/elementpath/elementpath-2.5.1.ebuild
new file mode 100644
index 000000000000..d2b8df609526
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="
+ https://github.com/sissaschool/elementpath/
+ https://pypi.org/project/elementpath/
+"
+SRC_URI="
+ https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+ test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/xmlschema[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # fails for some reason, more fit for upstream testing anyway
+ rm tests/test_typing.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/etuples/Manifest b/dev-python/etuples/Manifest
index a16fbe5edd09..be8b750c0b5c 100644
--- a/dev-python/etuples/Manifest
+++ b/dev-python/etuples/Manifest
@@ -1,2 +1 @@
-DIST etuples-0.3.4.gh.tar.gz 44650 BLAKE2B 4d0e7235d010ff10e01d4143858bbc2ee1516f66db35fb9c6acf054df898a605a49dc82e4eeaddcb7ab6e5ea9bbd5dec493ac5d1741c4d595756e0f4af0ed1c1 SHA512 4e2c2884cd741a1e85358678347dc65c994583ff700c6a1adaa561bd4446035ccca2e27855fbb5842012f7e2bfa90ef7fa1634e9b3cc43cf9c7006acd7b66595
DIST etuples-0.3.5.gh.tar.gz 44924 BLAKE2B 81b603c851b89b3ec3556246d7dfc12a533632f4e99f8b784c4b9f46c3ee51fe7d370556e376a957e52c980b6e16fc93d85c597d31cee371fa2e5cbeec962c9e SHA512 df51ff42609a341c42009b650dadac2a6fb8ea85c3ccc6145ee2bdf6270ed9509d73196f8b0b789091918e93492f766d5fc242e2d5acc30074c171a2334a42fa
diff --git a/dev-python/etuples/etuples-0.3.4.ebuild b/dev-python/etuples/etuples-0.3.4.ebuild
deleted file mode 100644
index 7943b068985c..000000000000
--- a/dev-python/etuples/etuples-0.3.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python S-expression emulation using tuple-like objects"
-HOMEPAGE="
- https://pypi.org/project/etuples/
- https://github.com/pythological/etuples/
-"
-SRC_URI="
- https://github.com/pythological/etuples/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
- dev-python/cons[${PYTHON_USEDEP}]
- dev-python/multipledispatch[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/etuples/etuples-0.3.5.ebuild b/dev-python/etuples/etuples-0.3.5.ebuild
index 5d23977f1232..c06f2a9a3d72 100644
--- a/dev-python/etuples/etuples-0.3.5.ebuild
+++ b/dev-python/etuples/etuples-0.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
RDEPEND="
dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild
index f47bb4a6b395..2571619d98a3 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT PSF-2.4"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index 3c97842c7061..f785e8ef6c57 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
python_test() {
"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index f655e88ca6ec..fae9f5947ce7 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1 +1,2 @@
DIST Flask-Compress-1.11.tar.gz 12322 BLAKE2B c8d1096273a977512eabc9fe642a0fe240c21f10b5828db168dfe952ac5858377fd6906fa93dc3bfd8d888bf8bf70f541b1e5789f1de5e2d0f46565c55e0f9df SHA512 dd2ceca37eee968527f2008e9356f0ab89f2df46e6d874eff38b93a2cf326c9d24433f0adc8dfe7a7b72599a33f8d173f330aefcd4eea8650923a0466959d7fb
+DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5
diff --git a/dev-python/flask-compress/flask-compress-1.12.ebuild b/dev-python/flask-compress/flask-compress-1.12.ebuild
new file mode 100644
index 000000000000..42b2c07bd2dd
--- /dev/null
+++ b/dev-python/flask-compress/flask-compress-1.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Compress"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Compress responses in your Flask app with gzip"
+HOMEPAGE="
+ https://github.com/colour-science/flask-compress/
+ https://pypi.org/project/Flask-Compress/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-arch/brotli[python,${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 5b9597bdbad3..3216ea37c9ee 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,3 +2,4 @@ DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b
DIST Flask-2.0.3.tar.gz 629304 BLAKE2B dae5ffb86b9f57ea95c682be4f858faec6432c877695c06fff40a056cd7eedff25cf120458435b634954f0e65e57ad6c22c3eb6b5ed751b6d7f5d4501358c240 SHA512 b759ada3ab610d4893cd48f6de070c23929ab2e37af863238912fa19246acfb399b1e67576bf6112c9bb56b00002792d28c7538c65b026f31bcc6f64305ae966
DIST Flask-2.1.0.tar.gz 630852 BLAKE2B 6a67d4c0f67aebf326493d86baefcdfb5d1e1b36a3b6a2e818d8bd92d84267ca8762ee0af3e70254bd4ce53a4f781edc9560e6408adf8ac285b308cdf1103c0f SHA512 8d9da72e3ad7df378a32fc40290e9499bc79eb3167235e8497f8f2753ac2c9da170d34f0ae3e87db99ba8282c887a479a64b680818b668bc13e033e6e5603926
DIST Flask-2.1.1.tar.gz 630996 BLAKE2B 39b34a3f68111e4b58f4e1e63fc55077b839d42b9ab4f87bf96f22d1dbcf05c1a520e84d35af81d4ebad2535e4f22af2070c8354b3f7d885b4db304d374243a7 SHA512 492bd72e80b6ad8a5d91191b996252c05fee8d8b2f703855fe635755976e75ee7a93a30ebe4889c80cc959034c3fb8caca0dec8436657ad8096860b1b11dcb2e
+DIST Flask-2.1.2.tar.gz 631846 BLAKE2B 9024a12dd6fabeffcf5939e2852734b278f25fb99830bb165cf46a09e3fd67d0997558d1b06a0dec3425d9b750be25bde147341c937e874811fe2496224a1f3e SHA512 65ca756d63da05e74863fbfd2ae574d6e75d6fab683dd08ea97b22a9b27be4f9a03ce7be44312a1f2c6a802bdf77ede3899734f3f1546000dd8b9c592571deec
diff --git a/dev-python/flask/flask-2.1.2.ebuild b/dev-python/flask/flask-2.1.2.ebuild
new file mode 100644
index 000000000000..08dbff876df8
--- /dev/null
+++ b/dev-python/flask/flask-2.1.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="
+ https://palletsprojects.com/p/flask/
+ https://github.com/pallets/flask/
+ https://pypi.org/project/Flask/
+"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+ >=dev-python/click-8.0[${PYTHON_USEDEP}]
+ dev-python/blinker[${PYTHON_USEDEP}]
+ >=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ >=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
+ ' 3.8 3.9)
+"
+BDEPEND="
+ test? (
+ >=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+ !!dev-python/shiboken2
+ )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/pallets-sphinx-themes \
+ dev-python/sphinx-issues \
+ dev-python/sphinx-tabs \
+ dev-python/sphinxcontrib-log_cabinet
+distutils_enable_tests pytest
+
+python_test() {
+ epytest -p no:httpbin
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
deleted file mode 100644
index eec62df569de..000000000000
--- a/dev-python/flask/flask-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
- >=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
- !!dev-python/shiboken2
- )"
-
-distutils_enable_sphinx docs \
- dev-python/pallets-sphinx-themes \
- dev-python/sphinx-issues \
- dev-python/sphinx-tabs \
- dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
- epytest -p no:httpbin
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
diff --git a/dev-python/flit_core/flit_core-3.7.1.ebuild b/dev-python/flit_core/flit_core-3.7.1.ebuild
index f765725ef52c..2da9764263f4 100644
--- a/dev-python/flit_core/flit_core-3.7.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_scm/flit_scm-1.5.0.ebuild b/dev-python/flit_scm/flit_scm-1.5.0.ebuild
index 3a77f0846d78..98b5a9d1c60b 100644
--- a/dev-python/flit_scm/flit_scm-1.5.0.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 07ed79e7d6be..07910863c4f0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -5,3 +5,4 @@ DIST fonttools-4.32.0.tar.gz 2966840 BLAKE2B 67a79c8c2e26f9f72fcf6ea4ab5ee3712d3
DIST fonttools-4.33.0.tar.gz 3525052 BLAKE2B 5ea275adbfbf6e01222f6eba8f5eef7afe533b9692e6a7a2fb644fb68dec632ab2962d6b7f6b4ff876676e8314aadbfc04a005ea7a389904e398723feaa756d0 SHA512 147f6d41d1a6b27ebe6973cb91a90384291ad8c7b75b71c3b814908012530066b79f4c39bdd6da9e98614ef61b1cc19803756aba73e4da7ce2e82147390f0023
DIST fonttools-4.33.1.tar.gz 3526591 BLAKE2B c720e9159602168bc2f435f96e9b470e95a748e3e61aac717659e01e5998c8ead825056fe6114cb40be47ab1ebcd7dc6f3152cccd87aec5b49134147694aa3eb SHA512 14e4da0e146d4b88ab6375ad7c912f1ec6f437386e2d676bbffcd5a84be980151ed4f77f69bf618843b321106ca763af564cf05dfb6fa11888f02adfde7d74b2
DIST fonttools-4.33.2.tar.gz 3526700 BLAKE2B faa8db2d5ba80a7cb2cd4fb82045aa821f72d296c3b0994f266c69bc1f38b9c46a24208612d539e3576d75371d95d49d9a103fed8ab7604ebf0df50ec8f25d2f SHA512 dd032f9f8d9167aa8d83137006062a5d293aeb4116cd2b24a9d5d3d750887876214a6b6e9fe54efd569cada64164c76f242b234569d86b45e5f279d6c1a5db95
+DIST fonttools-4.33.3.tar.gz 3526937 BLAKE2B 26539f76ac1919e572633695aca7a95f7f715ef18bd7d36de22e5491124ce36d3907f1e7b167d23685bca437f0bf7cf99159cd918ab2b1a450b716166d30fc37 SHA512 403e19cda46d67dea9f517e58c2e95ed04c53e6832919d85df9db4538431252e5ec4554e22410fd45cba634998de1576cf55d50f56de5ad497a108dcec4ed56a
diff --git a/dev-python/fonttools/fonttools-4.33.2.ebuild b/dev-python/fonttools/fonttools-4.33.2.ebuild
index f0532d0a8742..1e5f5a109536 100644
--- a/dev-python/fonttools/fonttools-4.33.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
new file mode 100644
index 000000000000..1e5f5a109536
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ test? (
+ app-arch/brotli[python,${PYTHON_USEDEP}]
+ app-arch/zopfli
+ )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # When dev-python/pytest-shutil is installed, we get weird import errors.
+ # This is due to incomplete nesting in the Tests/ tree:
+ #
+ # Tests/feaLib/__init__.py
+ # Tests/ufoLib/__init__.py
+ # Tests/svgLib/path/__init__.py
+ # Tests/otlLib/__init__.py
+ # Tests/varLib/__init__.py
+ #
+ # This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+ touch Tests/svgLib/__init__.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_configure() {
+ export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+ # virtualx used when matplotlib is installed causing plot module tests to run
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/frozenlist/frozenlist-1.3.0.ebuild b/dev-python/frozenlist/frozenlist-1.3.0.ebuild
index dd5198b9b548..80781122e348 100644
--- a/dev-python/frozenlist/frozenlist-1.3.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index bae6143af039..5165ae806ff4 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1 +1,2 @@
DIST funcparserlib-1.0.0_alpha0.gh.tar.gz 68260 BLAKE2B e1a9a9a516142d683424df881a7c390a3999438905136fbd394f23856022f14390d22f1dd3914e680d2c188c819cce9cc4f7ff2e485478614dd4632701db4614 SHA512 02cac31d76bb888118a99367811a8cfac28a999ba113ce43f4bd6211cef815ce1793fc1767637dd019728f15d5c408e859d5bc8365a2c53804092f1d6f03e54e
+DIST funcparserlib-1.0.0_alpha1.gh.tar.gz 74033 BLAKE2B bf4ee5011f595c6b7ba7430c63e21243257ddc2e00cccea75bf5b16feca2a629becd28f196d657e024419010051a33e5f12fae29b6f8763b35cb8d1bb9144a6b SHA512 16dbf07edd5cad979c61396adc3ccce7dcedd46b3cf6394ecf35c9fd2b22cdf262bb609ffca9a4b6f9f0c236124a7b7cdd929166d65056ca71e73afa2f6b97e2
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
new file mode 100644
index 000000000000..61cd5cd72023
--- /dev/null
+++ b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PV="${PV/_alpha/a}"
+
+DESCRIPTION="Recursive descent parsing library based on functional combinators"
+HOMEPAGE="https://pypi.org/project/funcparserlib/"
+SRC_URI="
+ https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/six[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+ local DOCS=( doc/*.md )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index baec9fb9407a..d3574c776669 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1 +1,2 @@
DIST python-fuse-1.0.4.tar.gz 46571 BLAKE2B b839043343e5abda2725545c696afd4da847e33a77647d910bc7ea71d17480536770d99899ae8f949734304ea6b4b591934f34476ea84aad1adbe39ee5897fa7 SHA512 48fffc02aa7125df03cf2a5819449a5e10a772ecc737bc8a19199beca6a2f8181b98c91cf05fedd06fc258d846c8d67d073dc1e8620c336a3ae09320688dc389
+DIST python-fuse-1.0.5.tar.gz 46592 BLAKE2B 9d33cf508a57b1a08f6c257ecee89386826f5f6c9be223f33c36789930baccaacab112305e264aa5c412f30bfff0562c6701b8ec1f9632d9d2e5ff8ea6013073 SHA512 e0d0cc0f3dee9416eefe430119e8f2f5a9bbc88a214d36d1d23c7e1f7ce78cc977a173f6d22c05cb928715d5c657ba29738f60453323b25299dddc08d57595d2
diff --git a/dev-python/fuse-python/fuse-python-1.0.5.ebuild b/dev-python/fuse-python/fuse-python-1.0.5.ebuild
new file mode 100644
index 000000000000..a00df7c82c9c
--- /dev/null
+++ b/dev-python/fuse-python/fuse-python-1.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-fuse-${PV}
+DESCRIPTION="Python FUSE bindings"
+HOMEPAGE="https://github.com/libfuse/python-fuse"
+SRC_URI="
+ https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz
+ -> ${MY_P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-fs/fuse:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index dc1571ed4af2..7725b3803c65 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,3 @@
-DIST google-api-python-client-2.41.0.tar.gz 29608471 BLAKE2B 5a6f9eb414f02b9528d0ee8f8777da6596bd298f6aea8191966d1ebaa67219f8ea2e44a77bc667bfedab39c4ab0352a13ba04fd805f0df9a6936247cd4cf3481 SHA512 b9ee6a4374438d019d0efd09d02426c1c773fd2ca561e2bf91e426535fec2865a47a32cc5cf780e5e7da193ca3d8b5677339fee2a4983e7f4af9612d901c883d
-DIST google-api-python-client-2.42.0.tar.gz 29772877 BLAKE2B f478a719c3a6ef2f78d1fa16c231d47f2d72b55e67746612579f644b92dbd93ebd7f320f0684d85c1c1e253ed2f5163d7f6ce2904343bbe7a4f6746889663970 SHA512 e55cd75dec478a3410829a7eb7ee5478b52b44450d4ade69e3a7ee11b30e5ab5690c93ff6444f4b723db6cd1f26ac70553b3f1b9c77dc0b428db271b773faa9f
-DIST google-api-python-client-2.43.0.tar.gz 29820752 BLAKE2B d0f7337f2d63d9db2da3526670a5f034103cb1b2e3eefcc77fea6d15258d185c06c238662de6d304e73b4f9ea25f8b202386eae8b7b94d7c52ad2b6c15d2ea76 SHA512 0e59f22b0c03d1b29247219e39a83bf6b637afe3eddfa302ecd34acc30bebb850f771e4b7b5c24e5a607ddd74ef6833fe0597465776d00675ed868612ebd1d70
DIST google-api-python-client-2.44.0.tar.gz 29961288 BLAKE2B 3bb7d421c76180009c7105d693edc32c5f6af7d853cf9f70d18001976e854c343d6d9e03ad5210562a1c1c17c5127b6d96d2b12128997a8007bc027eb10c841d SHA512 8a12684117a1bdd6b72ec6fce2e7d1e48115e05788e39c8aaad8f6095e4bdc3245f6c471044e6b0e6983210f8cd0328bb9ef459f55c4c9b973a89a658a30677b
DIST google-api-python-client-2.45.0.tar.gz 30011332 BLAKE2B e8a734a7aea1152ac92427de7059fa59216ba96c5fc68976b341fe0fcdd8851cbbcf1eb8e9cdc37cd18eec5cce0e8f87d3832b0df39c8795f3363f61c457a17e SHA512 b0adabae6ea29390fa7506cd7b846b8499591e49ecb247818b7304683c4ea3def25203a106b371ceff5e576c84f3ab207ffd428cb7b1b543b170c2ef0ea731d4
+DIST google-api-python-client-2.46.0.tar.gz 30051613 BLAKE2B c1ada6b9e59ec269e6584c6555af17b1e0561e9d3e273c56b554280ee32e3db9b0e96677fc6490990d2944d532d1eb908fa9c45e38faee942c80fa1c10a10bcb SHA512 fec085668fe9ad842c2b4ffc74165af459f99e91758580e83b3270cecd6c3faaba47f27113655859a2dd616ad42cd652541230eb515ed14ff759ae9891eed03b
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.41.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.41.0.ebuild
deleted file mode 100644
index e50aafd6b03d..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.41.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- >=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
- =dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
- >=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-
installer
- pradyunsg/installer
+ pypa/installer
diff --git a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
index 557fc7d20ce8..3ce20768a4e1 100644
--- a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
RDEPEND="
dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/irc/irc-20.0.0-r1.ebuild b/dev-python/irc/irc-20.0.0-r1.ebuild
index bb8df2685890..9e1600a8771c 100644
--- a/dev-python/irc/irc-20.0.0-r1.ebuild
+++ b/dev-python/irc/irc-20.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/isodate/isodate-0.6.1.ebuild b/dev-python/isodate/isodate-0.6.1.ebuild
index a4367a3f3a57..db5684e409f0 100644
--- a/dev-python/isodate/isodate-0.6.1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 5e96ddf5332d..72ae768d2a28 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,2 @@
DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-DIST itsdangerous-2.1.1.tar.gz 56217 BLAKE2B 8b35b32ce0d9a5432079199165f9d7a43dee80775737bfde637820a86c6c2c4cf122914958d4e88466446b75deaf4dfe995c9cda64c254793056e5773136d07d SHA512 54ec17e540fc7c39e5880c044c1ce222260b1141355cc341dc96eefbfd8f12e3018eadd531081a00aa719736b9af437bafe147dd5fee456d8b4478f7107aacdb
DIST itsdangerous-2.1.2.tar.gz 56143 BLAKE2B 4c36cb26bcc6b6821b92b88b0254711ebe00bfda2193cecf0a7eb1fd514806f366fc0b4dc587a383003ec1272a2bc732418a46b44fa711beaedc06c379635ddc SHA512 e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
deleted file mode 100644
index 3599f307595a..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
- test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
index 629fdcbd42a3..592c832116d2 100644
--- a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="
test? (
diff --git a/dev-python/itypes/itypes-1.2.0-r1.ebuild b/dev-python/itypes/itypes-1.2.0-r1.ebuild
index 99a0098c43c9..bee7b6e67991 100644
--- a/dev-python/itypes/itypes-1.2.0-r1.ebuild
+++ b/dev-python/itypes/itypes-1.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
index 45b71769f2ac..9b8447929707 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
index 2c1dd04b6915..d54aa2dd845c 100644
--- a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
index e403490faa67..03d3f5c600c0 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
index de27db6d094c..5c918cbdd9eb 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
index f72cbefc5a94..dd1c0eab47f0 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
RDEPEND="
dev-python/tempora[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index fdfb98c99971..7bf400fadb60 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1 +1,2 @@
DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
+DIST jaraco.path-3.4.0.tar.gz 9574 BLAKE2B 41c7b65be0f7f8ae93b2137f1527145ac91acde2a2d4e338cd68e35f7e5233e6a8dcfe9a0c07f36ae9cd2a00946031eb6b692cfaf1a299bf7a451f25b39cc8cc SHA512 00a853bffdde4a931938b1d193898c039e253018f06ca9d102ee8e07f797b4c9dac33eb50243f714e3f3e151b6ce2fed7d47e1b82ab18d3e8715525b57040a6a
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
new file mode 100644
index 000000000000..0d9a9d13f611
--- /dev/null
+++ b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Miscellaneous path functions"
+HOMEPAGE="
+ https://github.com/jaraco/jaraco.path/
+ https://pypi.org/project/jaraco.path/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+ ">=dev-python/jaraco-packaging-8.2" \
+ ">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+ epytest tests
+}
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
index 804185b719dc..661225b1f833 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
BDEPEND="
>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
index ca615b49accf..3b04ab47615b 100644
--- a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 4b12ce66cdc5..8b48e44911db 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,2 +1,2 @@
-DIST jc-1.18.5.tar.gz 3981643 BLAKE2B 9eebaef4e2ee0a014df5fa73f0fecf9d91c62483594d529d6ae9b1d538ee4c62ec1ab6f673f0f3fbb32220920c843e8fd6a487ecaaa9662b63128ff9df786dcc SHA512 f105aa3aa6e5059d06976d089f52eb9c8a1005e2b2c0b9ee2b4229e2f82028277a45979d34a6f81679c22472d7a99903711ac6946accdb86c796e790d121112e
-DIST jc-1.18.6.tar.gz 4007477 BLAKE2B 9380e8a254df921983f486d8d9d0e8479e477e391075ace3fcaa40029f72b733abd6d55ed62f4cd436bb280fa37d9bdec6398418e24c714caa833fcef2991d35 SHA512 ae291ea271e12cebd1e0287cdc8e3f52c72959711d9da752880a1a90257b3add23c6a4b97d34ee0ebfa2332e355b90f8388cd425d18f03aa37c4979765101086
+DIST jc-1.18.7.tar.gz 8106032 BLAKE2B 05c069d0c00c1c789d253419dfc1e2caee656a848618b761664e7d46f87705f945955164c4fc213f7e8f19840b529d02ab52bc439384db122f3d464226c2b4b4 SHA512 c5ce538d4565f29a0d5fb1e39eda80a84481ad74c7ea4ce9339ec7881f2888a105af5c77c8adaf0b6174830e2f7cd1bf9628e5b9bb87d9c7b17e567251645ca9
+DIST jc-1.18.8.tar.gz 8103065 BLAKE2B 77713dda97a4228ed4715f123f2b8c1609496767aabcd38b0e80981959af5308b4296b0e1a76afed42f57517d2dadc773b00e8877324f2e1473f9f4457ea7dfd SHA512 2ed8d6946bc2230f4caaf3ef4fcf80ebb64d1fb5e3d42fddbd306bd84b6f4d4e3e84213ae479267293adb4defb443cb94828f55c74c82782eab8b4b192f792c7
diff --git a/dev-python/jc/jc-1.18.5.ebuild b/dev-python/jc/jc-1.18.5.ebuild
deleted file mode 100644
index f4014eac3167..000000000000
--- a/dev-python/jc/jc-1.18.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
- https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.6.ebuild b/dev-python/jc/jc-1.18.6.ebuild
deleted file mode 100644
index f4014eac3167..000000000000
--- a/dev-python/jc/jc-1.18.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
- https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.7.ebuild b/dev-python/jc/jc-1.18.7.ebuild
new file mode 100644
index 000000000000..989dcb9e4a0b
--- /dev/null
+++ b/dev-python/jc/jc-1.18.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+ https://github.com/kellyjonbrazil/jc/
+ https://pypi.org/project/jc/
+"
+SRC_URI="
+ https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.8.ebuild b/dev-python/jc/jc-1.18.8.ebuild
new file mode 100644
index 000000000000..989dcb9e4a0b
--- /dev/null
+++ b/dev-python/jc/jc-1.18.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+ https://github.com/kellyjonbrazil/jc/
+ https://pypi.org/project/jc/
+"
+SRC_URI="
+ https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 801972ab0d16..f57f4c13c346 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,4 +1,6 @@
DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
+DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1
DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
+DIST jedi-0.18.1.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25
+DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa
DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
deleted file mode 100644
index d49d1ea8809d..000000000000
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="
- https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
- -> ${P}.tar.gz
- https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
- -> ${TYPESHED_P}.tar.gz
- https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
- -> ${DJANGO_STUBS_P/v/}.tar.gz"
-
-LICENSE="MIT
- test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # upstream includes these as submodules ...
- rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
- mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
- "${S}/jedi/third_party/django-stubs" || die
- mv "${WORKDIR}/${TYPESHED_P}" \
- "${S}/jedi/third_party/typeshed" || die
-
- # don't run doctests, don't depend on colorama
- sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
- sed -i "s: --doctest-modules::" pytest.ini || die
-
- # test_complete_expanduser relies on $HOME not being empty
- > "${HOME}"/somefile || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local deselect=(
- # TODO
- 'test/test_integration.py::test_completion[stdlib:197]'
- 'test/test_integration.py::test_completion[on_import:29]'
- # assume pristine virtualenv
- test/test_utils.py::TestSetupReadline::test_local_import
- test/test_inference/test_imports.py::test_os_issues
- # fragile
- test/test_speed.py
- )
- [[ ${EPYTHON} == python3.10 ]] && deselect+=(
- # new features increased the match count again
- test/test_utils.py::TestSetupReadline::test_import
-
- )
-
- # django and pytest tests are very version dependent
- epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
-}
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index ae592db2a559..59d2c1396385 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -52,22 +52,30 @@ python_prepare_all() {
}
python_test() {
- local deselect=(
+ local EPYTEST_DESELECT=(
# TODO
'test/test_integration.py::test_completion[stdlib:155]'
'test/test_integration.py::test_completion[on_import:29]'
+ # pytest?
+ 'test/test_integration.py::test_completion[conftest:27]'
# assume pristine virtualenv
test/test_utils.py::TestSetupReadline::test_local_import
test/test_inference/test_imports.py::test_os_issues
# fragile
test/test_speed.py
)
- [[ ${EPYTHON} == python3.10 ]] && deselect+=(
+ [[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
+ # TODO
+ 'test/test_integration.py::test_completion[lambdas:112]'
+ )
+ [[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
# new features increased the match count again
test/test_utils.py::TestSetupReadline::test_import
)
+ # some plugin breaks case-insensitivity on completions
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
# django and pytest tests are very version dependent
- epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
+ epytest -k "not django and not pytest"
}
diff --git a/dev-python/jedi/jedi-0.18.1.ebuild b/dev-python/jedi/jedi-0.18.1.ebuild
new file mode 100644
index 000000000000..695103134ebb
--- /dev/null
+++ b/dev-python/jedi/jedi-0.18.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+TYPESHED_P="typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3"
+DJANGO_STUBS_P="django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9"
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="
+ https://github.com/davidhalter/jedi/
+ https://pypi.org/project/jedi/
+"
+SRC_URI="
+ https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+ https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
+ -> ${TYPESHED_P}.tar.gz
+ https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+ -> ${DJANGO_STUBS_P/v/}.tar.gz
+"
+
+LICENSE="
+ MIT
+ test? ( Apache-2.0 )
+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ =dev-python/parso-0.8*[${PYTHON_USEDEP}]
+"
+
+# RDEPEND needed because of an import jedi inside conf.py
+distutils_enable_sphinx docs \
+ dev-python/parso \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # upstream includes these as submodules ...
+ rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+ mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+ "${S}/jedi/third_party/django-stubs" || die
+ mv "${WORKDIR}/${TYPESHED_P}" \
+ "${S}/jedi/third_party/typeshed" || die
+
+ # don't run doctests, don't depend on colorama
+ sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
+ sed -i "s: --doctest-modules::" pytest.ini || die
+
+ # test_complete_expanduser relies on $HOME not being empty
+ > "${HOME}"/somefile || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # fragile
+ test/test_speed.py
+ # assumes pristine virtualenv
+ test/test_inference/test_imports.py::test_os_issues
+ )
+ [[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
+ # TODO
+ 'test/test_integration.py::test_completion[lambdas:112]'
+ )
+
+ # some plugin breaks case-insensitivity on completions
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ # django and pytest tests are very version dependent
+ epytest -k "not django and not pytest"
+}
diff --git a/dev-python/jeepney/jeepney-0.8.0.ebuild b/dev-python/jeepney/jeepney-0.8.0.ebuild
index 18ca1de03898..c944c65a777e 100644
--- a/dev-python/jeepney/jeepney-0.8.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.8.0.ebuild
@@ -14,7 +14,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 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="examples"
BDEPEND="
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 9d7b28b760f1..f97e2a8e295c 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,4 +1,3 @@
DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.0.3.tar.gz 273634 BLAKE2B 3f72840f3f895471896b918b0d3173aa7b40a077fe78a014064e66ac74c3d1ef1ae811723a84ea56d32edde23ee26ab6091bd5ce7ee4e46a9693f34d2538b491 SHA512 8a364620a4660add0593f4b252a2f20423aa3017193dffe6e8aa80710444da0cae5e6c4b77247d39f33e90185f475714fb892f6b5f01d3055a88b0f669a748be
-DIST jinja-3.1.0.tar.gz 271851 BLAKE2B de55a518aa63e3c6ca88bd107709172f73fcb9419c75254b2c23c531b598af7860a303e7da6e61f03cf18edf6935c92f5c12c8b91a7f4eb955c64f472a506b02 SHA512 1bd75c752f8e1c45f05f881598c257a6a357658892307e1352dd4752f45ede9b23f0ce3c16909e1885243199c2b845357c3ea33af8d6848fe346c29eeaf22b60
DIST jinja-3.1.1.tar.gz 272001 BLAKE2B 4787ee89d7e10cea24d3bf2810e391d5c17c00ffee8fd2f9244a9e24b219bc126e4111cc6b788107cbc07dd96732a2d1fc51dd87506545dc8beb7fdce5cd89b1 SHA512 285b3a2e09fbf891ce1d18e2692e400a9fe9d8968a36be50229972d9bdbb590bbea099cd26443de0fbe5ed7a2c6419eb211bfdac15c27a61b8db903e88855478
+DIST jinja-3.1.2.gh.tar.gz 272546 BLAKE2B dc4bc81900c07e7816ff63259073409650f1f679e00d76b9574aaba301b36a7037aaf77a87cc1c160ea2aa2272ceb67e2fd20fbd74bb9850880fb909babded8e SHA512 50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144
diff --git a/dev-python/jinja/jinja-3.0.3.ebuild b/dev-python/jinja/jinja-3.0.3.ebuild
deleted file mode 100644
index 2fb8cc8d12ee..000000000000
--- a/dev-python/jinja/jinja-3.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
- !dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-issues \
- dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
- # avoid unnecessary dep on extra sphinxcontrib modules
- sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- if use examples ; then
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- if ! has_version dev-python/Babel; then
- elog "For i18n support, please emerge dev-python/Babel."
- fi
-}
diff --git a/dev-python/jinja/jinja-3.1.0.ebuild b/dev-python/jinja/jinja-3.1.0.ebuild
deleted file mode 100644
index 008e162474da..000000000000
--- a/dev-python/jinja/jinja-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-issues \
- dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
- # avoid unnecessary dep on extra sphinxcontrib modules
- sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- if use examples ; then
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- if ! has_version dev-python/Babel; then
- elog "For i18n support, please emerge dev-python/Babel."
- fi
-}
diff --git a/dev-python/jinja/jinja-3.1.1.ebuild b/dev-python/jinja/jinja-3.1.1.ebuild
index 008e162474da..abae5016c7d6 100644
--- a/dev-python/jinja/jinja-3.1.1.ebuild
+++ b/dev-python/jinja/jinja-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/jinja/jinja-3.1.2.ebuild b/dev-python/jinja/jinja-3.1.2.ebuild
new file mode 100644
index 000000000000..c96fbd71375a
--- /dev/null
+++ b/dev-python/jinja/jinja-3.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="
+ https://palletsprojects.com/p/jinja/
+ https://github.com/pallets/jinja/
+ https://pypi.org/project/Jinja2/
+"
+SRC_URI="
+ https://github.com/pallets/jinja/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+ >=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-issues \
+ dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+ # avoid unnecessary dep on extra sphinxcontrib modules
+ sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_install_all() {
+ if use examples ; then
+ docinto examples
+ dodoc -r examples/.
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ if ! has_version dev-python/Babel; then
+ elog "For i18n support, please emerge dev-python/Babel."
+ fi
+}
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 7616822e2725..d4c5f01fc21a 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1 +1,2 @@
DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
+DIST jsonref-0.2.tar.gz 13032 BLAKE2B 0db36904f6914c889d608ac6a368cc8a80b0f81b6bf9f77bb229042c484084c6a06f31099440a48f49f5efea248e0e4f498269bdf89e240be8e149a0f221747d SHA512 415eaefcaf2c7a02bf70749522fef0d96f1e0cc5772edd50ca016a564258df21dd3eb178b7a33ee61e606125fb802a29b0cb8855a81c6116baf6393208927b0f
diff --git a/dev-python/jsonref/jsonref-0.2.ebuild b/dev-python/jsonref/jsonref-0.2.ebuild
new file mode 100644
index 000000000000..84fdd34cbed9
--- /dev/null
+++ b/dev-python/jsonref/jsonref-0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON Reference for Python"
+HOMEPAGE="
+ https://github.com/gazpachoking/jsonref/
+ https://pypi.org/project/jsonref/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest tests.py
+}
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index ce059b105bec..cda3cfd16183 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1 +1,2 @@
DIST jsonrpclib-0.4.2.tar.gz 59590 BLAKE2B 4201d62c9be469d7016943acfc84dca56606f17383ac26e86f574c34927ee6131c5c1a9bc5c3934b8324049ac35b1ff5e4e49ca7ef850251ebdf9a42a53e59a4 SHA512 8d9e5ebe8de960272a1ea0a194544d41851f96c5bc16b9eb6984ac4e48ec1aeaee8e4c3846cfe747a737612934d43a3df72bb1267f0608b1cd2d6faba2acc7b2
+DIST jsonrpclib-0.4.3.2.gh.tar.gz 63127 BLAKE2B 4301f23a981f00e78f88f78a8f5e8d776985fcd5d268373430b308cd9e2b07d5e1aaae9fa514640275439f4269ecf9ac5a2e42d5c96b870b72e37e4faea7c790 SHA512 718b9a8a49b6f936635ea8e500d16b8d3f42a28e44c4d0bb2bf1e648063ab1107edca93b4f178600a0b36d2e0584cf531f6e9721f5ed6967ea9a160c923103f3
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
new file mode 100644
index 000000000000..afe4f32dda97
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
+ inherit git-r3
+else
+ SRC_URI="
+ https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="
+ https://github.com/tcalmant/jsonrpclib/
+ https://pypi.org/project/jsonrpclib/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+ test? (
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/ujson[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest
+
+ # NB: we need to run this test separately as it breaks
+ # tests/test_server.py::PooledServerTests
+ # see jsonlib.py, get_handler()
+ # the most preferred (first) lib that's in test deps
+ local -x JSONRPCLIB_TEST_EXPECTED_LIB=ujson
+ epytest tests/test_jsonlib.py::TestJsonLibLoading
+}
diff --git a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
index ffdfba8e2b57..e4b6118cba1d 100644
--- a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index dbb435536101..69531887efb5 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1 +1,2 @@
DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
+DIST jupyter_client-7.3.0.tar.gz 328515 BLAKE2B a5e0ad2f44c2171d75848f057c3d582e66b308d0d0fb8d7c8c7266e51009f2281a1ff5b0f92b7a5491709a43dccd6aa69f45681cfb6b79008082f5a955212b61 SHA512 5edf711afe9799fadee901de404ffed5b152618ccab960777a5f17cdb5adc6b945b189502f1dc7b2728fc0abceb668e54f9543eb952738d02500f109df6fa913
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
new file mode 100644
index 000000000000..2c0770e6eb96
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/entrypoints[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+ >=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+ dev-python/pyzmq[${PYTHON_USEDEP}]
+ >=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+ dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ >=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
+ dev-python/ipython[${PYTHON_USEDEP}]
+ >=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # relax pyzmq dep
+ sed -i -e '/pyzmq/s:>=.*::' requirements.txt || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 29195d5de682..a8eecff20a45 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1 +1,2 @@
DIST jupyter_server-1.15.6.tar.gz 440539 BLAKE2B 11a090495fa9cf8fd59bc7c1b1149bb16e1e2e0b78a54e0ba827e5012fcc5910d90498c572c1f96cd4c73b5232f0e91c23f4296bddc7e63b006df034ad8fde3d SHA512 b967165c5509e724cb75dfbad0647e7c69fb4fa981bffd3475d480264c52de3d58e2504b01d7096091579dc065646eda11554c2b1ba9d5b6bc840cbcfb484f53
+DIST jupyter_server-1.17.0.tar.gz 445648 BLAKE2B d7e19804b6b4cccb72c0a24febe8702829c2a32768e916a9da09ee9f55a08e360cf2a81c3c4bc535ff342c916155bc0b7933a9b5b49645db2b5f9a58ec02ab3a SHA512 d99d4036698d6f8d5e1258de214e3cbc6239b978314af4af7e722789c950edb1f261b98e666cffb46efdfe97a23c001784cfd29d7bf75c02dae53c2c07476b7f
diff --git a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
index 76783271a17c..31abbffb1de9 100644
--- a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
new file mode 100644
index 000000000000..7d41175712ea
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+ =dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+ >=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+ >=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+ >=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+ dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ dev-python/pydata-sphinx-theme \
+ dev-python/myst_parser \
+ dev-python/ipython \
+ dev-python/sphinxemoji \
+ dev-python/sphinxcontrib-github-alt \
+ dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # This fails if your terminal is zsh (and maybe other non-bash as well?)
+ tests/test_terminal.py::test_culling
+ tests/test_terminal.py::test_terminal_create_with_cwd
+ tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+ # disable npm use
+ sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest \
+ -p pytest_tornasync.plugin \
+ -p jupyter_server.pytest_plugin \
+ -p pytest_console_scripts \
+ -p pytest_timeout
+}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 84dfa532c658..a374acbb4deb 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1 +1,3 @@
DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
+DIST jwcrypto-1.1.0.gh.tar.gz 87344 BLAKE2B 4bc72c01e6d49d68ff8e3c89a09758a5e8a634c308926ed2b750fdc373006b30710a841df4e26e1ce3287be6e4b509674887a0b01cc3b225bc87d97588f5b7a6 SHA512 c7530f68d74247f23ad2d76def257f4f0091203a22d39f248f4a15363b17bdf79699b96775cfb7f909b5b0a99ed1dd73ff5ae30ca8bc41662f1be38933c9f3c1
+DIST jwcrypto-1.2.0.gh.tar.gz 88369 BLAKE2B c2f03cef2130884e8a27faa5a7e204ee448ef0a2b56da414f10df34821a67898a0ed2768201d00e2dc7d14b5a3cad3e73c0bd5707910dd2cb1082d1a20a14c04 SHA512 df9073b0561b43cd92f7f1861f9b517bc736d0846f8ef1c7496a48aa5dec49755e5915285ae659c5e2bb18cd51912cd782d799c41c5c6399330f688348096fa5
diff --git a/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
new file mode 100644
index 000000000000..b57976ef02c6
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+HOMEPAGE="
+ https://github.com/latchset/jwcrypto/
+ https://pypi.org/project/jwcrypto/
+"
+SRC_URI="
+ https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+ dev-python/deprecated[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # Do not install doc in non-standard paths
+ sed -i "/data_files/d" setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
new file mode 100644
index 000000000000..b57976ef02c6
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+HOMEPAGE="
+ https://github.com/latchset/jwcrypto/
+ https://pypi.org/project/jwcrypto/
+"
+SRC_URI="
+ https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+ dev-python/deprecated[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # Do not install doc in non-standard paths
+ sed -i "/data_files/d" setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/keyring/keyring-23.5.0.ebuild b/dev-python/keyring/keyring-23.5.0.ebuild
index 5012e18d282c..3a2495f8f7fe 100644
--- a/dev-python/keyring/keyring-23.5.0.ebuild
+++ b/dev-python/keyring/keyring-23.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
deleted file mode 100644
index 7b9075f7d1c7..000000000000
--- a/dev-python/lark-parser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
diff --git a/dev-python/lark-parser/lark-parser-0.11.3-r1.ebuild b/dev-python/lark-parser/lark-parser-0.11.3-r1.ebuild
deleted file mode 100644
index 818a01345e28..000000000000
--- a/dev-python/lark-parser/lark-parser-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="https://github.com/lark-parser/lark"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/atomicwrites[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- "${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
deleted file mode 100644
index b5d7c689cbf8..000000000000
--- a/dev-python/lark-parser/lark-parser-0.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="https://github.com/lark-parser/lark"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/atomicwrites[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- "${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lark-parser/metadata.xml b/dev-python/lark-parser/metadata.xml
deleted file mode 100644
index 2b3b22eccde1..000000000000
--- a/dev-python/lark-parser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- lark-parser
- lark-parser/lark
-
-
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
new file mode 100644
index 000000000000..1f959cf5ef32
--- /dev/null
+++ b/dev-python/lark/Manifest
@@ -0,0 +1,2 @@
+DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c8c6f5cba6bbe9e03486b5598f55fa7c6f4d77798ed070decd902d01faa4df62039031fe21d392d29122125 SHA512 fc797c263410f461e1ef28fbbba526472b9c4d8dbb296b309e59daa5945fdcc0c2f9347b3b4bf78e189c6a3d8f1333c74a5f3d80b82ee54867181b84ba263c00
+DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
diff --git a/dev-python/lark/lark-0.11.3-r1.ebuild b/dev-python/lark/lark-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..1b17ebf7368b
--- /dev/null
+++ b/dev-python/lark/lark-0.11.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=lark-parser-${PV}
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/lark-parser/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/atomicwrites[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ )
+"
+
+python_test() {
+ "${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/lark/lark-1.1.2.ebuild b/dev-python/lark/lark-1.1.2.ebuild
new file mode 100644
index 000000000000..60322bd56428
--- /dev/null
+++ b/dev-python/lark/lark-1.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="
+ https://github.com/lark-parser/lark/
+ https://pypi.org/project/lark/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/atomicwrites[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ )
+"
+
+python_test() {
+ "${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/lark/metadata.xml b/dev-python/lark/metadata.xml
new file mode 100644
index 000000000000..a619139b1f21
--- /dev/null
+++ b/dev-python/lark/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+ lark
+ lark-parser/lark
+
+
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a785ef33c460..4dfb61c584a9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,3 @@
-DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
diff --git a/dev-python/lit/lit-11.1.0.ebuild b/dev-python/lit/lit-11.1.0.ebuild
deleted file mode 100644
index 2d27ec84ffbb..000000000000
--- a/dev-python/lit/lit-11.1.0.ebuild
+++ /dev/null
@@ -1,40 +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_{7..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- sys-devel/llvm )"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
- cd "${WORKDIR}" || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local -x LIT_PRESERVES_TMP=1
- local litflags=$(get_lit_flags)
- ./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-14.0.1.ebuild b/dev-python/lit/lit-14.0.1.ebuild
index 575c98bacff6..76651b3b3a28 100644
--- a/dev-python/lit/lit-14.0.1.ebuild
+++ b/dev-python/lit/lit-14.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lit/lit-15.0.0.9999.ebuild b/dev-python/lit/lit-15.0.0.9999.ebuild
index 89c5315a5acb..cc8dd9798ac7 100644
--- a/dev-python/lit/lit-15.0.0.9999.ebuild
+++ b/dev-python/lit/lit-15.0.0.9999.ebuild
@@ -22,7 +22,8 @@ BDEPEND="
test? (
dev-python/psutil[${PYTHON_USEDEP}]
sys-devel/llvm
- )"
+ )
+"
LLVM_COMPONENTS=( llvm/utils/lit )
llvm.org_set_globals
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
index 12333f0a0945..59de9e826e8a 100644
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.8.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/lxml-${P}
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/markdown/markdown-3.3.6.ebuild b/dev-python/markdown/markdown-3.3.6.ebuild
index f002bdf41c90..4f161f58b702 100644
--- a/dev-python/markdown/markdown-3.3.6.ebuild
+++ b/dev-python/markdown/markdown-3.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 7d15892592d3..d395bec808b3 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1 +1,2 @@
DIST markdown2-2.4.2.tar.gz 96270 BLAKE2B 63808f2b6e8af25eca047e7b24a7ab7ce7afc35fa10aff57b93952cefae765ae8746300f6e93033be87aa73607249198cdfd4fa6e3b3aed711e80d9dc7a006ab SHA512 8c41617213ae8a2d02a986489756d511ee7e1ae970eef348f68808439feaef099ef935ea0a2c31cb9e9abe39899a24fd981a29b7c90d1f8096ba999506121e60
+DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
diff --git a/dev-python/markdown2/markdown2-2.4.3.ebuild b/dev-python/markdown2/markdown2-2.4.3.ebuild
new file mode 100644
index 000000000000..9bf9f43c0072
--- /dev/null
+++ b/dev-python/markdown2/markdown2-2.4.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Markdown language reimplementation"
+HOMEPAGE="
+ https://github.com/trentm/python-markdown2/
+ https://pypi.org/project/markdown2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/pygments[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+ cd test || die
+ "${EPYTHON}" -m unittest test_markdown2.py -v ||
+ die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
index fd27c0fb925d..16e7cf131ec3 100644
--- a/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
@@ -18,6 +18,6 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 51b32d45c2cb..6224a3d1089b 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,3 @@
+DIST mkdocs-material-8.2.10.gh.tar.gz 8324008 BLAKE2B 333c8cdcc09cb4b64cc165884933e81c5986b9d7c423f722c517b73a6348d97396b359ca20488de5dbd547816070c4585f6e21f0ad13e8415f7b007d1207fb72 SHA512 c9babbb06a91d52e8a9f6e33b1a2a15ab124af5322b893667d704acaa77f4d7702b4fd05e3d677770f02dcf7e9a14bc70ac048599ecbb8817c7af3ce84b69368
+DIST mkdocs-material-8.2.11.gh.tar.gz 8333237 BLAKE2B 10b891f712a9df03a6e3cccb2e1df15c8dca138b18aed3f4ece33bdc5c81c545b3d5a8030f5a6346277150661586fce33888a4837cc7452c077362da7be9bfaf SHA512 02af540a966cc684d2dd014764b18f85ffe854c0093ac7b69ae147ba57c4d059d8a8ba83439ca9b31c9bdf4436c524467590de74e09f2bdbb070c1cfd464ff2a
DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild
new file mode 100644
index 000000000000..348f317ad661
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/mkdocs-material-extensions
+ dev-python/mkdocs-minify-plugin
+ dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+ https://github.com/squidfunk/mkdocs-material/
+ https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+ https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ >=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+ >=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild
new file mode 100644
index 000000000000..348f317ad661
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/mkdocs-material-extensions
+ dev-python/mkdocs-minify-plugin
+ dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+ https://github.com/squidfunk/mkdocs-material/
+ https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+ https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ >=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+ >=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
index cc6892714019..cb58e6381111 100644
--- a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 18d3d2f8b8cc..bebd41387057 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,6 +1,2 @@
-DIST moto-3.0.5.tar.gz 2219507 BLAKE2B 019e0f66d8a183f9d758c372252488e79692e140db19820b568279148d88181b944f547d3a213072a29fb61115b73b40b656d3a0657078c54ca1c6de001c65ab SHA512 0529711897a25ff969bf945abfda9e86ab0a310b6b273240b35c981960e04ed14f879a4a86e2251f9824d1d5bc9241afe4a0b964981c8a02a176bca459025359
-DIST moto-3.1.1.tar.gz 2236948 BLAKE2B 8ab52a59dc09f4819c1169d26fd198b13159635c2571fd27e38eaedc0a83fa5e7af0a7adba90db1c48658a849ff0b17e8d9c9750a47c6981960ac786f3d9a4e0 SHA512 2354886a9b3b46bb33b832495a94f1dcd10cf5cb00454b6e8b6b6838618842ca06f8577c1826bca02a10e2f723cf474a7c492cd9fb587bdb660deb118c17aa4d
-DIST moto-3.1.2.tar.gz 2245068 BLAKE2B f25a4476bfbbbd3cab77efc1ef2ceeb74b2b7ee9067aac4a02f90c6fd385c5ed0d66d3fd8171945e22dcd78555c9fdbec78656109b9f61fd15950c44b456d4ea SHA512 51dfef58069f09b4654aa59bef2ee0426c0e662af51d78013c19671b664ade78d2c664c20f19592236808ba7bcc50613700232e87be1ac8dcead4be2df36d39b
-DIST moto-3.1.3.tar.gz 2246198 BLAKE2B 935271da2b09b160c7ed8c8b1e2466b352d879c7b8bbe4406a410c301f9659fde3187ed76f2ad6695c79a667a44c698570dcb30206a0fe0b525a5e5bef72f40c SHA512 20963f9a1a99a2ac1654660284b3cb60439538da0d363baba92e813dd3c7bde815c125bc39cd1cf5c0cd883fba024dfda85b7e98a54141ad3e25311986c68c9a
-DIST moto-3.1.4.tar.gz 2256325 BLAKE2B d0b90eee9f77370ea48e95a5920b139825550850276760842e16ddbe340e09746a0ec6c4e4d9a57f8a68232d807b17920fff4bd88a9a75d0a72c8153cb5cbfb1 SHA512 3ec226dc19b46af50f4a266957e54292b65b9b198a5daf2f5eba6242cf2ab9a42ba743d0af1f30695de625e9fa222871890b497717ac2b9ed111b033f3804b25
DIST moto-3.1.5.tar.gz 2282060 BLAKE2B f7b2cbf1de96b6d96b334e5b51bcdf69fb9645261564b28b290c19c37c27df5c25395ce54cc7d9c424f25cb381f4ddf13dc51456fb7baeec5e21b2da6abf725b SHA512 583c4e76a5acacdcce456cd953109b130dd53d6bf3e50d56d5ead6bfbdcd181109ce3df141686a4717687d3e1e8b33a73bdc7155c36aa5d064a4621e007ab17a
+DIST moto-3.1.6.tar.gz 2273226 BLAKE2B 91966fd315b3e5b4904ecc0e17c716bb47ecb6b644ccaad2cd52fb92754b79af0edb11573fadfd40b8ae75c17bad3429b6e2c4801424c4f30fea32689cd790d1 SHA512 f97ca412910ec9a0cf6d7e28b2ff2f2bf6a3d142a091f65eb4ccf8d53ae9d5362cccdbd24d72083f2d9c6200a3f6e400cca32c16965731d0fbd22239f9866d59
diff --git a/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch b/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
deleted file mode 100644
index f4ab312f0332..000000000000
--- a/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 878ce5bfd58060324fe58cb0a84653c02d895be4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Sun, 20 Mar 2022 10:19:18 +0100
-Subject: [PATCH] Fix test failures on systems with 32-bit time_t
-
-Skip tests if OverflowError is raised when boto3 is processing
-timestamps. This is a known limitation of boto3 on 32-bit platforms
-(https://github.com/boto/botocore/issues/2355).
-
-Catching OverflowError is the best option here since some 32-bit
-platforms (e.g. NetBSD) use 64-bit time_t, and others are working
-on providing a switch to the 64-bit type (e.g. glibc).
----
- tests/test_acm/test_acm.py | 5 ++++-
- tests/test_budgets/test_budgets.py | 14 ++++++++++----
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_acm/test_acm.py b/tests/test_acm/test_acm.py
-index b48897c1..6594787a 100644
---- a/tests/test_acm/test_acm.py
-+++ b/tests/test_acm/test_acm.py
-@@ -160,7 +160,10 @@ def test_describe_certificate():
- client = boto3.client("acm", region_name="eu-central-1")
- arn = _import_cert(client)
-
-- resp = client.describe_certificate(CertificateArn=arn)
-+ try:
-+ resp = client.describe_certificate(CertificateArn=arn)
-+ except OverflowError:
-+ pytest.skip("This test requires 64-bit time_t")
- resp["Certificate"]["CertificateArn"].should.equal(arn)
- resp["Certificate"]["DomainName"].should.equal(SERVER_COMMON_NAME)
- resp["Certificate"]["Issuer"].should.equal("Moto")
-diff --git a/tests/test_budgets/test_budgets.py b/tests/test_budgets/test_budgets.py
-index 578a7298..b3de3121 100644
---- a/tests/test_budgets/test_budgets.py
-+++ b/tests/test_budgets/test_budgets.py
-@@ -22,9 +22,12 @@ def test_create_and_describe_budget_minimal_params():
- )
- resp["ResponseMetadata"]["HTTPStatusCode"].should.equal(200)
-
-- budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
-- "Budget"
-- ]
-+ try:
-+ budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
-+ "Budget"
-+ ]
-+ except OverflowError:
-+ pytest.skip("This test requires 64-bit time_t")
- budget.should.have.key("BudgetLimit")
- budget["BudgetLimit"].should.have.key("Amount")
- budget["BudgetLimit"]["Amount"].should.equal("10")
-@@ -140,7 +143,10 @@ def test_create_and_describe_all_budgets():
- },
- )
-
-- res = client.describe_budgets(AccountId=ACCOUNT_ID)
-+ try:
-+ res = client.describe_budgets(AccountId=ACCOUNT_ID)
-+ except OverflowError:
-+ pytest.skip("This test requires 64-bit time_t")
- res["Budgets"].should.have.length_of(1)
-
-
---
-2.35.1
-
diff --git a/dev-python/moto/moto-3.0.5.ebuild b/dev-python/moto/moto-3.0.5.ebuild
deleted file mode 100644
index 4c400131d65b..000000000000
--- a/dev-python/moto/moto-3.0.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
- >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/cfn-lint[${PYTHON_USEDEP}]
- >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/botocore[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-cors[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/pretty-yaml[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-jose[${PYTHON_USEDEP}]
- dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
- >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
-)
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
- tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
- tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
- tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
- tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
- # broken code (local variable used referenced before definition)
- tests/test_appsync/test_appsync_schema.py
- # Needs network (or docker?) but not marked as such, bug #807031
- # TODO: report upstream
- tests/test_batch/test_batch_jobs.py::test_terminate_job
- tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
- tests/test_batch/test_batch_jobs.py::test_cancel_running_job
- tests/test_batch/test_batch_jobs.py::test_dependencies
- tests/test_batch/test_batch_jobs.py::test_container_overrides
- tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
- tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
- tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
- tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
- # broken by new expat
- tests/test_sts/test_sts.py::test_assume_role_with_saml
- tests/test_sts/test_sts.py::test_assume_role_with_saml_should_not_rely_on_attribute_order
- tests/test_sts/test_sts.py::test_assume_role_with_saml_should_respect_xml_namespaces
- tests/test_sts/test_sts.py::test_assume_role_with_saml_should_retrieve_attribute_value_from_text_when_xml_tag_contains_xmlns_attributes
- tests/test_sts/test_sts.py::test_assume_role_with_saml_should_default_session_duration_to_3600_seconds_when_saml_attribute_not_provided
- )
-
- # pytest-django causes freezegun try to mangle stuff inside django
- # which fails when django is not really used
- epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.1.ebuild b/dev-python/moto/moto-3.1.1.ebuild
deleted file mode 100644
index 71834ad342e9..000000000000
--- a/dev-python/moto/moto-3.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/cfn-lint[${PYTHON_USEDEP}]
- >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/botocore[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-cors[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/pretty-yaml[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-jose[${PYTHON_USEDEP}]
- dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
- >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
-)
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
- tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
- tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
- tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
- # broken code (local variable used referenced before definition)
- tests/test_appsync/test_appsync_schema.py
- # Needs network (or docker?) but not marked as such, bug #807031
- # TODO: report upstream
- tests/test_batch/test_batch_jobs.py::test_terminate_job
- tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
- tests/test_batch/test_batch_jobs.py::test_cancel_running_job
- tests/test_batch/test_batch_jobs.py::test_dependencies
- tests/test_batch/test_batch_jobs.py::test_container_overrides
- tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
- tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
- tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
- tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
- )
-
- # pytest-django causes freezegun try to mangle stuff inside django
- # which fails when django is not really used
- epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.2.ebuild b/dev-python/moto/moto-3.1.2.ebuild
deleted file mode 100644
index 49b6647dfd22..000000000000
--- a/dev-python/moto/moto-3.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/cfn-lint[${PYTHON_USEDEP}]
- >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/botocore[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-cors[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/pretty-yaml[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-jose[${PYTHON_USEDEP}]
- dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
- >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
- tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
- tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
- tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
- # broken code (local variable used referenced before definition)
- tests/test_appsync/test_appsync_schema.py
- # Needs network (or docker?) but not marked as such, bug #807031
- # TODO: report upstream
- tests/test_batch/test_batch_jobs.py::test_terminate_job
- tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
- tests/test_batch/test_batch_jobs.py::test_cancel_running_job
- tests/test_batch/test_batch_jobs.py::test_dependencies
- tests/test_batch/test_batch_jobs.py::test_container_overrides
- tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
- tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
- tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
- tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
- )
-
- # pytest-django causes freezegun try to mangle stuff inside django
- # which fails when django is not really used
- epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.3.ebuild b/dev-python/moto/moto-3.1.3.ebuild
deleted file mode 100644
index 49b6647dfd22..000000000000
--- a/dev-python/moto/moto-3.1.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/cfn-lint[${PYTHON_USEDEP}]
- >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/botocore[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-cors[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/pretty-yaml[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-jose[${PYTHON_USEDEP}]
- dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
- >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
- tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
- tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
- tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
- # broken code (local variable used referenced before definition)
- tests/test_appsync/test_appsync_schema.py
- # Needs network (or docker?) but not marked as such, bug #807031
- # TODO: report upstream
- tests/test_batch/test_batch_jobs.py::test_terminate_job
- tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
- tests/test_batch/test_batch_jobs.py::test_cancel_running_job
- tests/test_batch/test_batch_jobs.py::test_dependencies
- tests/test_batch/test_batch_jobs.py::test_container_overrides
- tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
- tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
- tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
- tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
- )
-
- # pytest-django causes freezegun try to mangle stuff inside django
- # which fails when django is not really used
- epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.4.ebuild b/dev-python/moto/moto-3.1.4.ebuild
deleted file mode 100644
index 49b6647dfd22..000000000000
--- a/dev-python/moto/moto-3.1.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/cfn-lint[${PYTHON_USEDEP}]
- >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/botocore[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-cors[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/pretty-yaml[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/python-jose[${PYTHON_USEDEP}]
- dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
- >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
- tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
- tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
- tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
- tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
- # broken code (local variable used referenced before definition)
- tests/test_appsync/test_appsync_schema.py
- # Needs network (or docker?) but not marked as such, bug #807031
- # TODO: report upstream
- tests/test_batch/test_batch_jobs.py::test_terminate_job
- tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
- tests/test_batch/test_batch_jobs.py::test_cancel_running_job
- tests/test_batch/test_batch_jobs.py::test_dependencies
- tests/test_batch/test_batch_jobs.py::test_container_overrides
- tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
- tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
- tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
- tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
- )
-
- # pytest-django causes freezegun try to mangle stuff inside django
- # which fails when django is not really used
- epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.5.ebuild b/dev-python/moto/moto-3.1.5.ebuild
index a0c6ea25e7d8..9069529dd086 100644
--- a/dev-python/moto/moto-3.1.5.ebuild
+++ b/dev-python/moto/moto-3.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
RDEPEND="
>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-3.1.6.ebuild b/dev-python/moto/moto-3.1.6.ebuild
new file mode 100644
index 000000000000..a0c6ea25e7d8
--- /dev/null
+++ b/dev-python/moto/moto-3.1.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+ dev-python/boto[${PYTHON_USEDEP}]
+ dev-python/cfn-lint[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+ dev-python/cookies[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.5[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+ >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
+ dev-python/botocore[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/flask-cors[${PYTHON_USEDEP}]
+ dev-python/more-itertools[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pretty-yaml[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/python-jose[${PYTHON_USEDEP}]
+ dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+ >=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5[${PYTHON_USEDEP}]
+ dev-python/xmltodict[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ >=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+ tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+ tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+ tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+ tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+ tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+ # broken code (local variable used referenced before definition)
+ tests/test_appsync/test_appsync_schema.py
+ # Needs network (or docker?) but not marked as such, bug #807031
+ # TODO: report upstream
+ tests/test_batch/test_batch_jobs.py::test_terminate_job
+ tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+ tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+ tests/test_batch/test_batch_jobs.py::test_dependencies
+ tests/test_batch/test_batch_jobs.py::test_container_overrides
+ tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+ tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+ tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+ tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+ "tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+ "tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+ "tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+ )
+
+ # pytest-django causes freezegun try to mangle stuff inside django
+ # which fails when django is not really used
+ epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 3d587eeae6e5..923c890eaf9f 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
SLOT="0"
BDEPEND="
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 4437c142098e..c43416443d74 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,3 +5,4 @@ DIST mypy-0.931.tar.gz 2779826 BLAKE2B 11986102c6bc498a23bae52002e6ac515fa03724e
DIST mypy-0.940.tar.gz 2700469 BLAKE2B 4ac13002c3752566ade30a720c4de56d600552221c42f930af54a68573e6b5eb10de90ce66e2cd42f9eb419d5d09e354e4bf2d09cbcf0d6b841ab0e6710d7058 SHA512 5131ea3fe8d96f12442c68dddf04261582a063dcdd031804276263949af9f9af967be3dd775868d289709987773e1911f33e1f43951389f93cabf91c771e271f
DIST mypy-0.941.tar.gz 2700297 BLAKE2B 1d0369336b82c167dc25da8bcc21817b351a65a2543727f08c2e14aa15a75fec21b0937eb09b8060b405c09703b8052d4ed2df65d6e27f5dd429998b110a9e35 SHA512 39ef6e0d9215f0f530ca572d3b701a877f9b968034c2ca5a04549bf6a337a8d3609c23bc45bf45b16209128d26ab2b74bca27ecbdc5de53581429b47fb348aa8
DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c39f2e5834f4b68df70263c05b2b9abb08fe58202ee65f5e22d2291f39fcb1fc47168416134538c5f6e12ab3 SHA512 79b83587eefad10d7d20d3bfd8484a9e8b2d363e68c1e5ffaa3a82ca8b8f8d9183036ea46695a634f9156911d6f918af684ac636105b37b3a5d0e958f5d661f4
+DIST mypy-0.950.tar.gz 2746164 BLAKE2B 8466012fd3622f5e730acef774115ac84ff8c6f5488213a450de63d5acc790f937b7c69a1b05b46deef6fe8f81a13ed8e85f83c6c22cce9abdbb73b2ecf4179c SHA512 949d1dade3f225bbef0934fff040f7d5aec47039f554a669ca491d6cb46d56de3fcae0186864cdcaf5dec1347bc3af453218520536a0afa77e89a5c0e4640500
diff --git a/dev-python/mypy/mypy-0.942.ebuild b/dev-python/mypy/mypy-0.942.ebuild
index aa40a8f0ad7f..a55c240c55e5 100644
--- a/dev-python/mypy/mypy-0.942.ebuild
+++ b/dev-python/mypy/mypy-0.942.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
# stubgen collides with this package: https://bugs.gentoo.org/585594
RDEPEND="
diff --git a/dev-python/mypy/mypy-0.950.ebuild b/dev-python/mypy/mypy-0.950.ebuild
new file mode 100644
index 000000000000..7a153fc2a262
--- /dev/null
+++ b/dev-python/mypy/mypy-0.950.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+ !dev-util/stubgen
+ >=dev-python/psutil-4[${PYTHON_USEDEP}]
+ >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+ =dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+ >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+
mysqlclient
- PyMySQL/mysqlclient-python
+ PyMySQL/mysqlclient
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
deleted file mode 100644
index b5b006717481..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- !dev-python/mysql-python
- dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
- use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
deleted file mode 100644
index 4ec7923901d3..000000000000
--- a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- dev-db/mariadb[server]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-src_test() {
- local datadir="${T}/mysql" \
- install_log="${T}/mysqld_install.log" \
- pidfile="${T}/mysqld.pid" \
- socket="${T}/mysqld.sock" \
- log="${T}/mysqld.log"
- einfo "Creating test MySQL instance ..."
- if ! mysql_install_db \
- --no-defaults \
- --auth-root-authentication-method=normal \
- --basedir="${EPREFIX}/usr" \
- --datadir="${datadir}" >& "${install_log}"
- then
- cat "${install_log}"
- die "Failed to create database"
- fi
-
- einfo "Starting test MySQL instance ..."
- mysqld \
- --no-defaults \
- --character-set-server=utf8 \
- --pid-file="${pidfile}" \
- --socket="${socket}" \
- --skip-networking \
- --datadir="${datadir}" >& "${log}" &
-
- local i timeout=10
- einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
- for i in seq 1 ${timeout}; do
- [[ -S "${socket}" ]] && break
- sleep 1
- done
- if [[ ! -S "${socket}" ]]; then
- cat "${log}"
- die "MySQL failed to start in ${timeout} seconds"
- fi
-
- cat > "${T}/mysql.cnf" <<- EOF
- [MySQLdb-tests]
- socket = ${socket}
- user = root
- database = test
- EOF
-
- distutils-r1_src_test
-
- einfo "Stopping test MySQL instance ..."
- pkill -F "${pidfile}" &>/dev/null
-}
-
-python_test() {
- # The C extension ("_mysql") can't be imported from "${S}/MySQLdb"
- # so we need to cd somewhere else to make sure "MySQLdb" is imported
- # from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
- cd "${T}" || die
- TESTDB="${T}/mysql.cnf" epytest "${S}"
-}
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
index dc9f024957f7..9e962740b881 100644
--- a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+HOMEPAGE="
+ https://pypi.org/project/mysqlclient/
+ https://github.com/PyMySQL/mysqlclient/
+"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 201a96103fb6..2d49dcb61d32 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1 +1,2 @@
DIST node-semver-0.8.0.tar.gz 18449 BLAKE2B 171374808e18b1f3fc2807abb9b99ecfe18a392afbc59ad056f0524e374ef4a27e5a56acf0c3927c6f351503981d743e4e63f108bf0e5bd5eda62f04e24191d4 SHA512 665ae0dbced16e0f05306614b1577464aa1bdac666b35cf2e7ad4b8844a6814dc7e8672f0dff3043c7bd048aa455d671efd268052ac59166293b91d1dff17784
+DIST python-node-semver-0.8.1.gh.tar.gz 18550 BLAKE2B fd033b22595c4173ab33ea456f561f158dc7db4ef03a83948d5c4eacf33f2530d03f881d28073eb3d84790f306574ceba7fd5eec8ea5c50f9dafc74a0cc11003 SHA512 5a988755ed97aa1ba9b97595738200821787c2cc71f40198cffdc22c4b823fe132668946ecc3f0fb66d6c33fe0ec7bdcfa9c9794e3d382b38f8551d15d4af5e6
diff --git a/dev-python/node-semver/node-semver-0.8.1.ebuild b/dev-python/node-semver/node-semver-0.8.1.ebuild
new file mode 100644
index 000000000000..890c1dd273ad
--- /dev/null
+++ b/dev-python/node-semver/node-semver-0.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
+HOMEPAGE="
+ https://pypi.org/project/node-semver/
+ https://github.com/podhmo/python-node-semver/
+ https://github.com/npm/node-semver/
+"
+SRC_URI="
+ https://github.com/podhmo/python-node-semver/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index 989348dbb461..1e067e009479 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,2 +1,3 @@
DIST nptyping-1.4.4.gh.tar.gz 48098 BLAKE2B e13e7d6189a1ac826e8ea66918c006a63f0ec584e6d61cc7e0393b9a10709b41f75b43548ac94ce762c5180dc716e0717316573d45e8bec8951188d5df9bc1ad SHA512 4dd124734fde7e19867af0efd0c3a79f220b20576cb2f34a1cfb5e47c4fde44e936dca708d68bef99eb554afe7576f7fee447d6dd73f3c136340c8f48770f7b8
DIST nptyping-2.0.0.gh.tar.gz 54691 BLAKE2B 05343da5b1b36ea0b06267ce0c8108b2e236c8d4124872da2ae5858b3fe9c06875846fdd07960abcc9bc961e468e1883a5da6b50d12e74b7628aacec9c1c1e16 SHA512 e7de94e93896af34285117be61799ee971cb2fabe87e8f04473393a042b299765e91ad7cf2d07339d2d1b7cee117e42ecea28197adda6de54686154e21754dc0
+DIST nptyping-2.0.1.gh.tar.gz 54790 BLAKE2B 75aadc4310dc3e5262aa8f007bc65584ee110fd0f2c1d0737c35a0c57bb0f0a5191f0260dbc0a6c80cab0f546d1e3ade219d6b6318cc2d195ba0579318c20841 SHA512 d832cc0d701a36a94c97bc6db2445c7ff72ec7c41fbcb48ea2006fa201bfca169012be9501029f77f4da7a2fd126227292bd16ba5d0bd7cb6924e3eb74cfaa01
diff --git a/dev-python/nptyping/nptyping-2.0.1.ebuild b/dev-python/nptyping/nptyping-2.0.1.ebuild
new file mode 100644
index 000000000000..3a0ad81b5c2a
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+ https://pypi.org/project/nptyping/
+ https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+ https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ' 3.8 3.9)
+"
+BDEPEND="
+ test? (
+ dev-python/mypy[${PYTHON_USEDEP}]
+ dev-python/typeguard[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_IGNORE=(
+ # TODO: package beartype?
+ tests/test_beartype.py
+ # relies on Internet access to fetch packages for pip
+ tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index eff49b08c5b8..b78805c81cd5 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k 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 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild b/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8a0d7f8dfe4d
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ >=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+ # unpin the dep
+ sed -i -e '/Jinja2/s:,<3.1::' setup.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # these require Internet (intersphinx)
+ numpydoc/tests/test_full.py::test_MyClass
+ numpydoc/tests/test_full.py::test_my_function
+ )
+ epytest --pyargs numpydoc
+}
diff --git a/dev-python/numpydoc/numpydoc-1.2.1.ebuild b/dev-python/numpydoc/numpydoc-1.2.1.ebuild
deleted file mode 100644
index f59030e0df57..000000000000
--- a/dev-python/numpydoc/numpydoc-1.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- >=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # these require Internet (intersphinx)
- numpydoc/tests/test_full.py::test_MyClass
- numpydoc/tests/test_full.py::test_my_function
- )
- epytest --pyargs numpydoc
-}
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index 3eecbb5845d1..f6bc24c33d4d 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_sphinx doc \
dev-python/sphinx_rtd_theme
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
index ebf67beebad9..1a2bdef4d1d6 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
BDEPEND="
>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index 81311a6c52ee..0b2f50ec0989 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index db024b0c6c4a..02910c6154d0 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1 +1,2 @@
DIST oslo.utils-4.12.2.tar.gz 101505 BLAKE2B fb2d56c767e8ed100ba789560e6b50dfecf8528de2a2717a9660e3dc8ceb93838137d59f1c2e3f05ccb99b95ea1ec86870e22160fb670a8cfb2dd9d6783f1d0f SHA512 fa56225f1991b031e2122cf08cd0992d8a9bfacd9a83d590f87ff86c495d51763ac06f65076c746a59563a60f886601d00ea9536dfcc927fca94c5a1431bcf67
+DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
diff --git a/dev-python/oslo-utils/oslo-utils-4.13.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.13.0.ebuild
new file mode 100644
index 000000000000..b991aafb859e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-4.13.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ >=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+ ' python3_{8..9})
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # spurious rdep
+ sed -i -e '/pbr/d' requirements.txt || die
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ if ! has "${EPYTHON}" python3.{8..9}; then
+ find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+ fi
+}
+
+python_test() {
+ cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+ eunittest
+}
diff --git a/dev-python/outcome/outcome-1.1.0-r1.ebuild b/dev-python/outcome/outcome-1.1.0-r1.ebuild
index 8da627573eeb..cfcf8d1007d8 100644
--- a/dev-python/outcome/outcome-1.1.0-r1.ebuild
+++ b/dev-python/outcome/outcome-1.1.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/packaging-21.3-r2.ebuild b/dev-python/packaging/packaging-21.3-r2.ebuild
index 7ccaeebe96a1..3eaada9efec2 100644
--- a/dev-python/packaging/packaging-21.3-r2.ebuild
+++ b/dev-python/packaging/packaging-21.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index bb3ad3811586..cda2918825b1 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1 +1,2 @@
DIST paramiko-2.10.3.tar.gz 347738 BLAKE2B ccc66a7e0fe3f777e74b94374ed59435eda440fe0aeab3871e68a132610193d2fadca1fd200db3d194566b8a2a8d6ff889d71594fed69a01fb97ca43b967e957 SHA512 e1fce2ad33ee2942b519458d53497671e66d4777c23877954b135cf9bb8ec43357156147c7e012956ccf6198de800835a617b541a4b0faf54df00f936128514b
+DIST paramiko-2.10.4.tar.gz 348637 BLAKE2B 8ce0d34418b6a1dc1d98fc180d2b2f0fb4333b7e1c52fcf7edabc3b0fc096f1b644dbc21a5b37f9001f046969c3d513ad5f6d7261339a71fa3ec922161cd7be7 SHA512 df39958e647dd6519929f68c4870228a61f54e763751e6b1d07b5e802786c85dfc34af39588009e729c4d189ca17d3aa09a58d4242403a1a1a53d36f6cd313b1
diff --git a/dev-python/paramiko/paramiko-2.10.4.ebuild b/dev-python/paramiko/paramiko-2.10.4.ebuild
new file mode 100644
index 000000000000..6f8a297919b6
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.10.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+ >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+ >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-2.7.1-tests.patch"
+ )
+
+ if ! use server; then
+ PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+ fi
+ distutils-r1_src_prepare
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if use examples; then
+ docinto examples
+ dodoc -r demos/*
+ fi
+}
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 91bdb40e9e69..bdcfd4c9eab0 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,2 +1 @@
-DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1
diff --git a/dev-python/parso/files/parso-0.7.1-flaky-test.patch b/dev-python/parso/files/parso-0.7.1-flaky-test.patch
deleted file mode 100644
index 609918f31bb5..000000000000
--- a/dev-python/parso/files/parso-0.7.1-flaky-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2799a7a3c2cf87fdc2d0c19a0890acea425091ce Mon Sep 17 00:00:00 2001
-From: Ivan Babrou
-Date: Tue, 23 Feb 2021 22:27:05 -0800
-Subject: [PATCH] Fix flaky test_cache_last_used_update
-
-Sometimes time moves slowly and strict comparison is not enough:
-
-```
-> assert now < node_cache_item.last_used < time.time()
-E assert 1614147958.869299 < 1614147958.869299
-E + where 1614147958.869299 = .last_used
-E + and 1614147958.869299 = ()
-E + where = time.time
-
-test/test_cache.py:149: AssertionError
-```
-
-In particular, macOS timings can be a bit coarse.
-
-The test failure is from Apple Silicon M1.
----
- test/test_cache.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_cache.py b/test/test_cache.py
-index bfdbaf5..f4291c2 100644
---- a/test/test_cache.py
-+++ b/test/test_cache.py
-@@ -146,7 +146,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
- parse('somecode2', cache=True, path=p, diff_cache=diff_cache)
-
- node_cache_item = next(iter(parser_cache.values()))[p]
-- assert now < node_cache_item.last_used < time.time()
-+ assert now <= node_cache_item.last_used <= time.time()
-
-
- @skip_pypy
diff --git a/dev-python/parso/files/parso-0.8.2-flaky-test.patch b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
deleted file mode 100644
index 729ec409c829..000000000000
--- a/dev-python/parso/files/parso-0.8.2-flaky-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 60fed7b9f80cbb3d9cb7a9e42ad8c0f3c513801d Mon Sep 17 00:00:00 2001
-From: Saiyang Gou
-Date: Sat, 29 May 2021 18:17:24 -0700
-Subject: [PATCH] Fix flaky test_cache_last_used_update again (#189)
-
-This is a follow up for #177. On Windows, `assert node_cache_item.last_used < now` may fail as the two time values can be equal.
----
- test/test_cache.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_cache.py b/test/test_cache.py
-index f4291c2..5e633fc 100644
---- a/test/test_cache.py
-+++ b/test/test_cache.py
-@@ -137,7 +137,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
- parse('somecode', cache=True, path=p)
- node_cache_item = next(iter(parser_cache.values()))[p]
- now = time.time()
-- assert node_cache_item.last_used < now
-+ assert node_cache_item.last_used <= now
-
- if use_file_io:
- f = _FixedTimeFileIO(p, 'code', node_cache_item.last_used - 10)
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
deleted file mode 100644
index 61ffc2a3595c..000000000000
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-flaky-test.patch
- "${FILESDIR}"/${PN}-0.8.2-flaky-test.patch
-)
-
-python_test() {
- local deselect=()
- [[ ${EPYTHON} == python3.10 ]] && deselect+=(
- # py3.10 changed exception messages
- test/test_python_errors.py::test_python_exception_matches
- test/test_python_errors.py::test_default_except_error_postition
- )
- epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/parso/parso-0.8.3-r1.ebuild b/dev-python/parso/parso-0.8.3-r1.ebuild
index e2527b1ee829..7aae84fd1c6c 100644
--- a/dev-python/parso/parso-0.8.3-r1.ebuild
+++ b/dev-python/parso/parso-0.8.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_sphinx docs
distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.3.ebuild b/dev-python/parso/parso-0.8.3.ebuild
deleted file mode 100644
index 1ed4f8130271..000000000000
--- a/dev-python/parso/parso-0.8.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # py3.10 changed exception messages
- test/test_python_errors.py::test_python_exception_matches
-)
diff --git a/dev-python/parver/parver-0.3.1-r1.ebuild b/dev-python/parver/parver-0.3.1-r1.ebuild
index c155d8283573..3b22b3d2afea 100644
--- a/dev-python/parver/parver-0.3.1-r1.ebuild
+++ b/dev-python/parver/parver-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND="
>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/parver/parver-0.3.1.ebuild b/dev-python/parver/parver-0.3.1.ebuild
deleted file mode 100644
index 0d92eb5c4126..000000000000
--- a/dev-python/parver/parver-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Parse and manipulate version numbers"
-HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
-SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
- >=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
- >=dev-python/attrs-19.2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- "
-
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pretend[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unlock dependencies
- sed -i -e 's:~=:>=:g' setup.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/passlib/passlib-1.7.4-r1.ebuild b/dev-python/passlib/passlib-1.7.4-r1.ebuild
index d9487fa75f40..b99c6a2ed2d5 100644
--- a/dev-python/passlib/passlib-1.7.4-r1.ebuild
+++ b/dev-python/passlib/passlib-1.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
SLOT="0"
IUSE="doc"
diff --git a/dev-python/pbr/pbr-5.8.0-r1.ebuild b/dev-python/pbr/pbr-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..0c4254d5cca3
--- /dev/null
+++ b/dev-python/pbr/pbr-5.8.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack/pbr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+"
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+ dev-vcs/git
+ ' 'python*')
+ )"
+
+distutils_enable_tests unittest
+
+# This normally actually belongs here.
+python_prepare_all() {
+ # TODO: investigate
+ sed -e s':test_console_script_develop:_&:' \
+ -e s':test_console_script_install:_&:' \
+ -i pbr/tests/test_core.py || die
+ # broken on pypy3
+ # https://bugs.launchpad.net/pbr/+bug/1881479
+ sed -e 's:test_generates_c_extensions:_&:' \
+ -i pbr/tests/test_packaging.py || die
+ rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+ # installs random packages via pip from the Internet
+ sed -e 's:test_requirement_parsing:_&:' \
+ -e 's:test_pep_517_support:_&:' \
+ -i pbr/tests/test_packaging.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ if [[ ${EPYTHON} != python* ]]; then
+ einfo "Testing on ${EPYTHON} is not supported at the moment"
+ return
+ fi
+
+ distutils_install_for_testing
+ eunittest -b
+}
diff --git a/dev-python/pbr/pbr-5.8.0.ebuild b/dev-python/pbr/pbr-5.8.0.ebuild
deleted file mode 100644
index 0e9948c5a3f6..000000000000
--- a/dev-python/pbr/pbr-5.8.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack/pbr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
- dev-vcs/git
- ' 'python*')
- )"
-
-distutils_enable_tests unittest
-
-# This normally actually belongs here.
-python_prepare_all() {
- # TODO: investigate
- sed -e s':test_console_script_develop:_&:' \
- -e s':test_console_script_install:_&:' \
- -i pbr/tests/test_core.py || die
- # broken on pypy3
- # https://bugs.launchpad.net/pbr/+bug/1881479
- sed -e 's:test_generates_c_extensions:_&:' \
- -i pbr/tests/test_packaging.py || die
- rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
- # installs random packages via pip from the Internet
- sed -e 's:test_requirement_parsing:_&:' \
- -e 's:test_pep_517_support:_&:' \
- -i pbr/tests/test_packaging.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- if [[ ${EPYTHON} != python* ]]; then
- einfo "Testing on ${EPYTHON} is not supported at the moment"
- return
- fi
-
- distutils_install_for_testing
- eunittest -b
-}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 8602e13a04ee..31cffd90adf6 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,4 +1 @@
-DIST pikepdf-5.0.1.tar.gz 2354060 BLAKE2B 0aafaa27642dc2ee5994e670cbc7c7f828027111ce6a7aeb0ff71db8a07a271a1335c60ee9cbbbdbaaf9f8403e206df2c3083cc735cf5bc7f8810b4b113d1634 SHA512 d259806303a3faed861b91cc838efb1317b0d865220708f379d9a674e4ffc0a2752be9b09bcad9950edff7fe8a1c1511c56d9348cfd8ce7c0ca8893316a3ce78
-DIST pikepdf-5.1.0.tar.gz 2354197 BLAKE2B dd6fdfac9a5050ed0f935f4a17a4ce6561f5e67b02b8f651d3d9944aee329086827eda06c6fba95d4371147ab148394cde7040d003efcdad14dcf0fbe89690c5 SHA512 2b7aeb5156e296957c6f7a0c9c1e46e75368b6683f0c79d11a6e01c04c7cb58839d831990c8203f2d6ad5759b95e7766cf2e6fd831e582744eb830d3483fac68
-DIST pikepdf-5.1.1.tar.gz 2354977 BLAKE2B e9cdeac42fe49fd4497931ee1a45dea43b36059b485fd81bef0a7c73fda018c60db55d686a4016c6c10d39b85730da72cb064a3dec0619e8ad5f9ea72a451b5a SHA512 63e44381404a15d29a81d1b6ec0d547ada93f43cfea8ef5bd9310b9ffc60bc17a55f32fcfd3c5f92e8818817f167ff549cf88df0c95ef960c353bc3d7efd2f25
DIST pikepdf-5.1.2.tar.gz 2355023 BLAKE2B 1186174a8375b63035157a65a23d62d2e52447719de8b0182a4d6892334eea52f140ce113415941e9f096716b5bc71d9c4967658428d87bd45a14e0a43b70caf SHA512 1b18c3ddb3826a1a74e82cf341a4ebeb5c98b587e148dbc6b479768cad14860700b39ebbcb421459f720bea63a4aa9ee4987f1c2cb944620e56c71193741a5ec
diff --git a/dev-python/pikepdf/pikepdf-5.0.1.ebuild b/dev-python/pikepdf/pikepdf-5.0.1.ebuild
deleted file mode 100644
index 2a2524c3004e..000000000000
--- a/dev-python/pikepdf/pikepdf-5.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
- -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=app-text/qpdf-10.6.2:0="
-RDEPEND="${DEPEND}
- =dev-python/lxml-4.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-20[${PYTHON_USEDEP}]
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]"
-BDEPEND="
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
- test? (
- >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-5[${PYTHON_USEDEP}]
- >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
- >=dev-python/psutil-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
- )"
-
-#distutils_enable_sphinx docs \
-# dev-python/ipython \
-# dev-python/matplotlib \
-# dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/-n auto/d' pyproject.toml || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.0.ebuild b/dev-python/pikepdf/pikepdf-5.1.0.ebuild
deleted file mode 100644
index d3aa52613582..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
- -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-text/qpdf-10.6.2:0="
-RDEPEND="${DEPEND}
- =dev-python/lxml-4.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-20[${PYTHON_USEDEP}]
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]"
-BDEPEND="
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
- test? (
- >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-5[${PYTHON_USEDEP}]
- >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
- >=dev-python/psutil-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
- )"
-
-#distutils_enable_sphinx docs \
-# dev-python/ipython \
-# dev-python/matplotlib \
-# dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/-n auto/d' pyproject.toml || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.1.ebuild b/dev-python/pikepdf/pikepdf-5.1.1.ebuild
deleted file mode 100644
index d3aa52613582..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
- -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-text/qpdf-10.6.2:0="
-RDEPEND="${DEPEND}
- =dev-python/lxml-4.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-20[${PYTHON_USEDEP}]
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]"
-BDEPEND="
- >=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
- test? (
- >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-5[${PYTHON_USEDEP}]
- >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
- >=dev-python/psutil-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
- )"
-
-#distutils_enable_sphinx docs \
-# dev-python/ipython \
-# dev-python/matplotlib \
-# dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/-n auto/d' pyproject.toml || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.2.ebuild b/dev-python/pikepdf/pikepdf-5.1.2.ebuild
index 2c35cdb9cba5..ab8a2b9d246c 100644
--- a/dev-python/pikepdf/pikepdf-5.1.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.1.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
>=app-text/qpdf-10.6.2:0=
diff --git a/dev-python/pillow/pillow-9.1.0.ebuild b/dev-python/pillow/pillow-9.1.0.ebuild
index 4b2101d1e1b2..4ee9d207318e 100644
--- a/dev-python/pillow/pillow-9.1.0.ebuild
+++ b/dev-python/pillow/pillow-9.1.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-22.0.4.ebuild b/dev-python/pip/pip-22.0.4.ebuild
index 1e7e51ed6bd0..093f1c0ab4ad 100644
--- a/dev-python/pip/pip-22.0.4.ebuild
+++ b/dev-python/pip/pip-22.0.4.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="test vanilla"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pkginfo/pkginfo-1.8.2.ebuild b/dev-python/pkginfo/pkginfo-1.8.2.ebuild
index d6ac80a74e4e..52d692595d2f 100644
--- a/dev-python/pkginfo/pkginfo-1.8.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
test? (
diff --git a/dev-python/poetry-core/poetry-core-1.0.8.ebuild b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
index e8241366bd28..497006d41331 100644
--- a/dev-python/poetry-core/poetry-core-1.0.8.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/lark-parser[${PYTHON_USEDEP}]
+ dev-python/lark[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/pyrsistent[${PYTHON_USEDEP}]
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index d404b28f39c5..e5e5075ddec8 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1 +1,2 @@
DIST portend-3.0.0.tar.gz 9439 BLAKE2B 50c6455c8d5ad51e1b523d4aa150ffc5a607a35d3c6fed4d2f686f2fa7fd7eefbe00bf0a033b9178b205e5bba5650e3de484c66d824f41b259ea031b985d2ccd SHA512 7228d454e7d22317de3462edb1e2f1b7fcf29e4601c9373709d80260ea5964c0dd4fbc39543e27a7f375b478ca119b285e47fac6ffda41401399cbe7bf485c8c
+DIST portend-3.1.0.tar.gz 9448 BLAKE2B d9391577ecc6f878ebbceb07266f06902352076fb61164b5e905a3ed0a557ce5dafcd8e3c77a099aab97fa576aee5be024d98f457e3b333aa80dbd534167218b SHA512 017dff68ea85f48d19398f71fbd8189329ca9c27c05d8599dd5e53632eb5ddc6dea322e94c924a0653f25f042a3c8ee1cda5f8450b02f3406a72036d54cd1aaf
diff --git a/dev-python/portend/portend-3.1.0.ebuild b/dev-python/portend/portend-3.1.0.ebuild
new file mode 100644
index 000000000000..1a1c0a756377
--- /dev/null
+++ b/dev-python/portend/portend-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="TCP port monitoring utilities"
+HOMEPAGE="
+ https://github.com/jaraco/portend/
+ https://pypi.org/project/portend/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ >=dev-python/tempora-1.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 0d6fa4c67345..a6c0d4b98a98 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,2 +1 @@
-DIST precis_i18n-1.0.3.tar.gz 64037 BLAKE2B 99486f8791785ecad7f3a246a0a13f26ec52aa91bc40ac904e92409f2cdbb28a5458c153da593ca8dd626462f0216e8c72447fdc81f8133ed61240717d08cbf7 SHA512 afb987fe4d0fb2732c62585e70361ad5ffc14d1eb9b8e767fe314fa9a3dee8dcd14f2531f5638d3a72fa7ac4fbeed94ed8907976816570257b405468cdb6702a
DIST precis_i18n-1.0.4.tar.gz 67599 BLAKE2B db1f614b46015741b9f511b9a5df12e44b960ffb247357bf8d2e9f3a1deea9d417eed937e6c9e6a34d19a22c3e6d87bf8f2314767cd02b15cba068759588896f SHA512 f57840cffe1224d282e707f6a36ebd53b539f9acee58de7053f28ceed5356bd35627d7c205cc91dc81983925cca55138715051c0ca535ca1dcc9d26aad9a9353
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
deleted file mode 100644
index bc94d4d73374..000000000000
--- a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Internationalized Usernames and Passwords"
-HOMEPAGE="https://pypi.org/project/precis-i18n/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/prettytable/prettytable-3.2.0.ebuild b/dev-python/prettytable/prettytable-3.2.0.ebuild
index b1fb8aed347a..5ce1f0f06343 100644
--- a/dev-python/prettytable/prettytable-3.2.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pycares/pycares-4.1.2.ebuild b/dev-python/pycares/pycares-4.1.2.ebuild
index 1ff06a1aacd3..9cdca1537051 100644
--- a/dev-python/pycares/pycares-4.1.2.ebuild
+++ b/dev-python/pycares/pycares-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P/_p/-fix}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE="test"
# Tests fail with network-sandbox, since they try to resolve google.com
PROPERTIES="test_network"
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2-r1.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..590658633aa1
--- /dev/null
+++ b/dev-python/pydispatcher/pydispatcher-2.1.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P="PyPyDispatcher-${PV}"
+DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
+HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher/"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyenchant/pyenchant-3.2.2.ebuild b/dev-python/pyenchant/pyenchant-3.2.2.ebuild
index 1b3406335ea0..d4bad80116ad 100644
--- a/dev-python/pyenchant/pyenchant-3.2.2.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="app-text/enchant:*"
BDEPEND="
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 089ed7e723e5..a5fbfe90b855 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1 @@
-DIST pygit2-1.9.0.gh.tar.gz 312349 BLAKE2B 067074d58887597cdce9b7bbebb96a8ec8629c4dc42c87c2a0a9a23849bc2e8e36763273c7d883ccfadbc9f71a3b4b5612a9a7b58e3cfb39475e568d85cbdc64 SHA512 8934f1099004a536b78973f74efc8854cbfb736369a0592c382fbc1325409105640235a2b3ce4602ad0dce863cb9ffd34b2359c9840d2abdadb55e2a43df18f9
DIST pygit2-1.9.1.gh.tar.gz 317487 BLAKE2B 56855e656eafc27f24d8d59a0f21e36c49d292d322e6809257036ec0673f88d3299bca76c8f1c1a16bc79d667f0c6a355467ac5960c9999b11c8eddbf398cec6 SHA512 cfc050ef8cb6af7eace49d2e2ca10c77893abcafa1b319e173d39553e01a595ba084e345dedff22e22806527ecaed5387584f813b30184931820bb2bb1c93e58
diff --git a/dev-python/pygit2/pygit2-1.9.0.ebuild b/dev-python/pygit2/pygit2-1.9.0.ebuild
deleted file mode 100644
index ef2034d47953..000000000000
--- a/dev-python/pygit2/pygit2-1.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="
- https://github.com/libgit2/pygit2/
- https://pypi.org/project/pygit2/"
-SRC_URI="
- https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- =dev-libs/libgit2-1.4*:=
-"
-BDEPEND="
- >=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
- ${DEPEND}
- ${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # unconditionally prevent it from using network
- sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
- rm -r pygit2 || die
- distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/pygit2-1.9.1.ebuild b/dev-python/pygit2/pygit2-1.9.1.ebuild
index 89ada6d61a8a..ef2034d47953 100644
--- a/dev-python/pygit2/pygit2-1.9.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.9.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
=dev-libs/libgit2-1.4*:=
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index a6c3f8ed0b90..b096c4cec670 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1 +1,2 @@
DIST Pygments-2.11.2.tar.gz 4206258 BLAKE2B d9b7ac03ab564051df8eebf390586387d824584f5485eb6af2048cec181412fe2812409251c9c042421125a2579d9ac6de4006c1c0de025ed7b010482482b9f9 SHA512 606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f
+DIST Pygments-2.12.0.tar.gz 4282017 BLAKE2B 9ad241d5bcafe59057e9495edb75468e6fa74d150f2d3266590a5a567a7df8ce2ef4ea18f90a8ab83e2fb84993fcf00dec12b04dd968f4c516b8339c49aecc08 SHA512 70bbfaefeb34f9afb5d74aa924ac3da4a913d1c7f607c0b3f80b6cd25c88a8996e516a689062bf2009c472b29999e309eb044f0f427fa1ea8479bf921b51c524
diff --git a/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch b/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch
new file mode 100644
index 000000000000..199a88d28dbb
--- /dev/null
+++ b/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch
@@ -0,0 +1,26 @@
+Subject: Fix relative path for doc generation
+
+Signed-off-by: Arthur Zamarin
+
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -244,7 +244,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg):
+ ctx['languages'] = lexer_name_url
+
+ if pagename in ('styles', 'demo'):
+- with open('examples/example.py') as f:
++ with open('doc/examples/example.py') as f:
+ html = f.read()
+ lexer = pygments.lexers.get_lexer_for_filename('example.py')
+ min_contrasts = test_contrasts.min_contrasts()
+@@ -280,7 +280,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg):
+ def source_read(app, docname, source):
+ # linkify issue / PR numbers in changelog
+ if docname == 'docs/changelog':
+- with open('../CHANGES') as f:
++ with open('CHANGES') as f:
+ changelog = f.read()
+
+ idx = changelog.find('\nVersion 2.4.2\n')
+--
+2.35.1
diff --git a/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
index c4c5e5f41005..4df58e44053c 100644
--- a/dev-python/pygments/pygments-2.11.2.ebuild
+++ b/dev-python/pygments/pygments-2.11.2.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
virtual/ttf-fonts
)"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch"
+)
+
distutils_enable_sphinx doc \
dev-python/wcag-contrast-ratio
distutils_enable_tests pytest
diff --git a/dev-python/pygments/pygments-2.12.0.ebuild b/dev-python/pygments/pygments-2.12.0.ebuild
new file mode 100644
index 000000000000..3ae83b82e8ae
--- /dev/null
+++ b/dev-python/pygments/pygments-2.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+ https://pygments.org/
+ https://github.com/pygments/pygments/
+ https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+ virtual/ttf-fonts
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch"
+)
+
+distutils_enable_sphinx doc \
+ dev-python/wcag-contrast-ratio
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pylatex/pylatex-1.4.1.ebuild b/dev-python/pylatex/pylatex-1.4.1.ebuild
index bb22065092e9..833b1f73d5e3 100644
--- a/dev-python/pylatex/pylatex-1.4.1.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
MY_PN="PyLaTeX"
MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 8a07ce5ee5c9..ea1cfcdcf74e 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,8 +1,3 @@
DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
-DIST pylint-2.13.0.gh.tar.gz 1114326 BLAKE2B 2d99ae38474a13ecf0b306b2de445b93ef39c4ed286abdbc62e08580b34ea22615983bded024f87eb4ad5e9cfdd12edbab6e7bf841d4e7827c945e798f31771f SHA512 7ca5fdf6d5835886ae01937fad56319cc9b71248d7a8aa6c6d92ba4bf5d35340ec0a16c1b2029d1ca5170f8c3abd29b1d6915a415d5df3c0949f4f9c0d6a690c
-DIST pylint-2.13.1.gh.tar.gz 1116054 BLAKE2B 633636f97e284a8a93c598261b90019ea359fd61cf2e833936749a6a650098772c46008f465b118634cfa3cc8d873d9bbdd7d4b0e54621e47b7c33a33938b01d SHA512 9e5f6f2578d240a4984e00fd9e9a33a39bac4855060054f96c4414d8e1c6c16cd6a27d4d5e82fde52f91b2d25595d638e66e928c82aa3eb72a37c61f7aa6e038
-DIST pylint-2.13.2.gh.tar.gz 1116482 BLAKE2B da35c9f39781bbd796e2ec055b41c44211588d7da360fd27f81eef57a3f5c65e27931ca927b41692627c9914f5c28e3262c0f34a45c38b20aa1b83710ab1d1f1 SHA512 15274658cf3067ffa6635a94f2c75d8854b3843be45ea5dc5896bc12583b156428858baeed19eed4bfab35489326d70d0cce1375354d9ec97d00cfd895fc4a47
-DIST pylint-2.13.3.gh.tar.gz 1116747 BLAKE2B 9ab6ff4746f78472de9c248754d102e55e8cb60d3ead8c5079cfe851b2b7c8e16afc9b0be02041cf24e789784200b90751ad0bcf172eb6d4edd88463863d18ac SHA512 0bda6d89219ad6f7f64f1361f95b85a34e3bc70f9f18f71eaa3d69deb47ab6fc056000c13a11c8c5644f0a9789eac2a5c262ddcf96302aeebfa16aa2e3b3086c
-DIST pylint-2.13.4.gh.tar.gz 1117488 BLAKE2B a660c15c41b529d932a21d438c7cf0f3b97683d6b1452f4383193f97dd22ba6e216a7dc8c3677cb1cb0ab5b76ddb936afa2d87df38d41950e2249bd8867bf44d SHA512 2c0c60908f89bf7a2552f65e0b4957ee6223f5429a6c2ec997aaf75572b11e4247e159da744937dbc7752ebd5eab0a0c873d129983de09ea0954f35f47a1f524
DIST pylint-2.13.5.gh.tar.gz 1118551 BLAKE2B 70ee4254aa140aba16adfe67aeb896d9c455843dfa945d335b5ba48e85c9d2d8f057223bc74bd4c0c0bfa2d343a9f78e783705b885caaee6895fcddf7ce23ccb SHA512 e399239fbea58260b17f226dddb63f1e6a2f12cdd601a4e73913a169d23fe2b6085e776bf8144e2c5a555dfdc1b28a5818a4103969d504b638b6b41ee296d182
DIST pylint-2.13.7.gh.tar.gz 1120083 BLAKE2B c45d6ec65c11d3682bf3279969f3e45b827b2bbcebbfeb05a31df3a93bb943bf9643a5d467c1e2eebf717577032571a48db1ce84e1c81d72000808ec302aaf1b SHA512 ec0b2ef565239ab3e577c5c2d22c1c8df8b8bb0858c34b6606f649484d69a25c1f51ca61a3da66833d9a713e8a686dc32b940e574650577bdcc4e13d76acc2e5
diff --git a/dev-python/pylint/pylint-2.13.0.ebuild b/dev-python/pylint/pylint-2.13.0.ebuild
deleted file mode 100644
index 00f7749a1f55..000000000000
--- a/dev-python/pylint/pylint-2.13.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
- https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint/
- https://github.com/pycqa/pylint/
-"
-SRC_URI="
- https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
- =dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
- >=dev-python/dill-0.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/GitPython-3[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
-
- # TODO
- 'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
- 'tests/test_functional.py::test_functional[dataclass_with_field]'
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests
-}
-
-python_install_all() {
- if use examples ; then
- docompress -x "/usr/share/doc/${PF}/examples"
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.1.ebuild b/dev-python/pylint/pylint-2.13.1.ebuild
deleted file mode 100644
index f3e46e1cdb7e..000000000000
--- a/dev-python/pylint/pylint-2.13.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
- https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint/
- https://github.com/pycqa/pylint/
-"
-SRC_URI="
- https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
- =dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
- >=dev-python/dill-0.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/GitPython-3[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
-
- # TODO
- 'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
- 'tests/test_functional.py::test_functional[dataclass_with_field]'
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests
-}
-
-python_install_all() {
- if use examples ; then
- docompress -x "/usr/share/doc/${PF}/examples"
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.2.ebuild b/dev-python/pylint/pylint-2.13.2.ebuild
deleted file mode 100644
index f3e46e1cdb7e..000000000000
--- a/dev-python/pylint/pylint-2.13.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
- https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint/
- https://github.com/pycqa/pylint/
-"
-SRC_URI="
- https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
- =dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
- >=dev-python/dill-0.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/GitPython-3[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
-
- # TODO
- 'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
- 'tests/test_functional.py::test_functional[dataclass_with_field]'
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests
-}
-
-python_install_all() {
- if use examples ; then
- docompress -x "/usr/share/doc/${PF}/examples"
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.3.ebuild b/dev-python/pylint/pylint-2.13.3.ebuild
deleted file mode 100644
index f3e46e1cdb7e..000000000000
--- a/dev-python/pylint/pylint-2.13.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
- https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint/
- https://github.com/pycqa/pylint/
-"
-SRC_URI="
- https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
- =dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
- >=dev-python/dill-0.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/GitPython-3[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
-
- # TODO
- 'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
- 'tests/test_functional.py::test_functional[dataclass_with_field]'
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests
-}
-
-python_install_all() {
- if use examples ; then
- docompress -x "/usr/share/doc/${PF}/examples"
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.4.ebuild b/dev-python/pylint/pylint-2.13.4.ebuild
deleted file mode 100644
index 168eae7e434b..000000000000
--- a/dev-python/pylint/pylint-2.13.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
- https://pypi.org/project/pylint/
- https://github.com/PyCQA/pylint/
-"
-SRC_URI="
- https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
- =dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
- >=dev-python/dill-0.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- test? (
- >=dev-python/GitPython-3[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
-
- # TODO
- 'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
- 'tests/test_functional.py::test_functional[dataclass_with_field]'
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
- tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests
-}
-
-python_install_all() {
- if use examples ; then
- docompress -x "/usr/share/doc/${PF}/examples"
- docinto examples
- dodoc -r examples/.
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.5.ebuild b/dev-python/pylint/pylint-2.13.5.ebuild
index e424462a5e3e..6c8bf9dba248 100644
--- a/dev-python/pylint/pylint-2.13.5.ebuild
+++ b/dev-python/pylint/pylint-2.13.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="examples"
# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pylint/pylint-2.13.7.ebuild b/dev-python/pylint/pylint-2.13.7.ebuild
index b96cf6dfe334..899511134c63 100644
--- a/dev-python/pylint/pylint-2.13.7.ebuild
+++ b/dev-python/pylint/pylint-2.13.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="examples"
# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index b9afcbe4e81f..0b7ccadea9aa 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1 +1,2 @@
DIST pymdown-extensions-9.3.tar.gz 1009329 BLAKE2B 6efe25ef0ef81d7e6b494b94e54c41c8e99cab517cadaba09d073996aef4b35c79e88386dd9ccd8199b3c4c6e105a1c428aa4b96069a6d1c44bf0296cd586b7c SHA512 8dec73e94d159b10f644268ed757b3326f1ee5d2a63e8ea806a700898bdfd82542c1791db0d6fcb29deee913276b23bdb5966511e9863eed332ab760d194c5b5
+DIST pymdown-extensions-9.4.gh.tar.gz 1009043 BLAKE2B af5d5af52861b80e859ec11444915613d752cc60ba7a1f179d5dbd242837c4fd5d5ad3d3e66a583c53567fe4feab4a6fbf3f5a96032e57c24185affcd98b0f52 SHA512 8b7b9dcb0d61a63eac1477cb8dbd0917c8e4dd35b98298b6d15ee744fd184747364f5e70de0cfe7959223df77e604f5d195d0d305932e1176c351a1fe1a036cb
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild
new file mode 100644
index 000000000000..0eb6ec6b1098
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/mkdocs-git-revision-date-localized-plugin
+ dev-python/mkdocs-minify-plugin
+ dev-python/mkdocs-material
+ dev-python/pymdown-lexers
+ dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+ https://github.com/facelessuser/pymdown-extensions/
+ https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+ https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ >=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # mkdocs-git-revision-date-localized-plugin needs git repo
+ if use doc; then
+ git init || die
+ git config --global user.email "you@example.com" || die
+ git config --global user.name "Your Name" || die
+ git add . || die
+ git commit -m 'init' || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
index 9b17e2de5fd2..c2f361933d05 100644
--- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
RDEPEND="
>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyparsing/pyparsing-3.0.8.ebuild b/dev-python/pyparsing/pyparsing-3.0.8.ebuild
index 0c8cb9eb70bc..ab92af56d02a 100644
--- a/dev-python/pyparsing/pyparsing-3.0.8.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.0.8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
distutils_enable_tests pytest
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index 4afd4fe116a3..e59e589a1667 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
|| (
diff --git a/dev-python/pypiserver/pypiserver-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
index 1403d44c3a2c..742e9af1674a 100644
--- a/dev-python/pypiserver/pypiserver-1.4.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ZLIB MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 3e21a4a19a62..1009245d53eb 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1 +1,2 @@
DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
+DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
new file mode 100644
index 000000000000..303773b7087e
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="
+ https://github.com/TkTech/pysimdjson/
+ https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+ https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-libs/simdjson:=
+"
+RDEPEND="
+ ${DEPEND}
+"
+BDEPEND="
+ dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # benchmarks aren't run
+ sed -i -e 's:pytest-benchmark::' setup.cfg || die
+ # force regen
+ rm simdjson/csimdjson.cpp || die
+ # unbundle
+ > simdjson/simdjson.cpp || die
+ echo "#include_next " > simdjson/simdjson.h || die
+
+ distutils-r1_src_prepare
+
+ export BUILD_WITH_CYTHON=1
+}
+
+python_compile() {
+ distutils-r1_python_compile --libraries simdjson
+}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 649422dd41fd..193a7045c21b 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,2 +1,2 @@
-DIST pyspnego-0.5.0.tar.gz 325693 BLAKE2B 7674f498624e9b3c463db9ee60e9c5edf84cefd3642c9fe2cf0df58364c96b0643cf962d00edf1a6be9d8452e344e920cc1edec70bc39e8f65a6428204c36328 SHA512 4abb5726f9432366453069d32344b2be2169301cb0a6f96bcaac3f49f807c2ba819ad85a50f7979e920ddf3a4dcd13f6fc868e8d72c3c00cd3b9ffc97692b4c8
DIST pyspnego-0.5.1.tar.gz 325941 BLAKE2B b6acb16ff91dc5c0e4b738d729096e60346e8fc74c153d567f8d766a027b96733a00c6d26104fc9fe871974d92079e89ac899f79b7920ff87fba0475e399ef8f SHA512 d5632783103359d056f2c6597d06b134147705c42a63d52c71c6007542c0fc2a8e8255872944e8153b605fe231d26f80af79f17fd5cb19ffb7b2ee560a931aa5
+DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
diff --git a/dev-python/pyspnego/pyspnego-0.5.0.ebuild b/dev-python/pyspnego/pyspnego-0.5.0.ebuild
deleted file mode 100644
index 261f1db15a3e..000000000000
--- a/dev-python/pyspnego/pyspnego-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="https://pypi.org/project/pyspnego/ https://github.com/jborean93/pyspnego"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
- dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/gssapi[${PYTHON_USEDEP}]
- >=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # https://github.com/jborean93/pyspnego/issues/33
- 'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-False]'
- 'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-True]'
- 'tests/test_auth.py::test_kerberos_auth_ccache[negotiate-False]'
- 'tests/test_auth.py::test_kerberos_auth_env_cache[negotiate-False]'
-)
-
-pkg_postinst() {
- optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
- optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.5.1.ebuild b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
index 27b39859d871..261f1db15a3e 100644
--- a/dev-python/pyspnego/pyspnego-0.5.1.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/pyspnego-0.5.2.ebuild b/dev-python/pyspnego/pyspnego-0.5.2.ebuild
new file mode 100644
index 000000000000..8cd0a2bef5b8
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.5.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+ https://github.com/jborean93/pyspnego/
+ https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+ dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/gssapi[${PYTHON_USEDEP}]
+ >=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+ optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
index dab46bcdc6d0..a2179cb0df58 100644
--- a/dev-python/pystache/metadata.xml
+++ b/dev-python/pystache/metadata.xml
@@ -5,9 +5,6 @@
nerdboy@gentoo.org
Steve Arnold
-
- Updated Python implementation of Mustache templating framework.
-
PennyDreadfulMTG/pystache
diff --git a/dev-python/pystache/pystache-0.6.0.ebuild b/dev-python/pystache/pystache-0.6.0.ebuild
index bf1f4437fd2d..df23e888f31c 100644
--- a/dev-python/pystache/pystache-0.6.0.ebuild
+++ b/dev-python/pystache/pystache-0.6.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
inherit distutils-r1
-DESCRIPTION="Python implementation of Mustache"
+DESCRIPTION="Updated Python implementation of Mustache templating framework"
HOMEPAGE="https://github.com/PennyDreadfulMTG/pystache"
if [[ ${PV} = 9999* ]]; then
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
index 91b4756bcfe8..5292e88d5e64 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.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 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
index 01de23365fa4..c72fa110e0d1 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
RDEPEND="
dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index a1c2731b0fc9..b097924afca5 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1 +1,2 @@
+DIST pytest-helpers-namespace-2021.12.29.gh.tar.gz 51376 BLAKE2B cbc79e6868a18f7174b96e73e3e902ea969d5a361c141e12bf5a67eeb7c93cead61629842f8b8744e58240cd8b85f9864ed95fec7ce048446963592b41bbd7e5 SHA512 82c231ff11a36fce7b16a0ceea51c9306f7e05ca3f9e8cc7cc1c77ac9822f974d1ac893d2bf9b7154bf9593a529193daa041ccaaced6fdd9e38ba4f794f161b0
DIST pytest-helpers-namespace-2021.3.24.gh.tar.gz 25881 BLAKE2B d13e82eebf09b4acb1d8fb9d3609f8814a49bfd0df56f23fe6f3fe3fa1508c4f1ac338b3f75e1e97ae90f71cae548dd100548d23cdbaa6c4bdb76cdb6e3d4a41 SHA512 1914427a4805a168d4067cd5db5663d28e3ff680f612e70a169a7efbc6c2c7ba0e2dc74132595aa70e13b651886bd10a6947e56558edf22b871618c967537073
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
new file mode 100644
index 000000000000..8475898d5ed5
--- /dev/null
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides a helpers pytest namespace"
+HOMEPAGE="
+ https://github.com/saltstack/pytest-helpers-namespace/
+ https://pypi.org/project/pytest-helpers-namespace/
+"
+SRC_URI="
+ https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x PYTEST_PLUGINS=pytest_helpers_namespace.plugin
+ epytest -p pytest_forked --forked
+}
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index b335a63a3c1b..9195da7dff8d 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
index 31b9d6f5b1fa..96b9ecf2c9f2 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
index 8eb86230165a..6355df11d45b 100644
--- a/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/pytest-6[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
index ac9b1f5bd507..82179b729302 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index dffc6b84c0b8..27325f82fb16 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1 @@
-DIST python-dbusmock-0.26.1.tar.gz 87707 BLAKE2B 9f4761ab5f227e78dd5343f3ddd4b83d0494e77d3b381f719890447998baab8096b3bf817259b080dda78619f8407ad532044cb60aaf7a5280459f423754df0f SHA512 dcb46f6dbd17471e2135c0d8fb63cbaecbc9445ae7bf74691abb03b93d5283ab41ea71071ece03870aaac19eaedd546f01c0839116421047f1ac77619f2c73f3
-DIST python-dbusmock-0.27.0.tar.gz 89469 BLAKE2B b6fcdb5ded2b4f50d4c3edafecf028df57c3aae6e2a1e87d78c41f879f495d06ab097be0996b7b1781aebd4235a5ce7c6b58f48f5c74e2d4c2b49a3439ce9cae SHA512 4f3a7326b27d7b86d9a77019c419209077021a88994b8e5ae302686fcaa8b7c7736644ab26d9e3b5a2157634eb56a0b2dbe304a092d93104c94a13a43d53b5a1
DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
deleted file mode 100644
index 73574b585de1..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
- https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- # needed for unittest discovery
- > tests/__init__.py || die
- # linter tests, fragile to newer linter versions
- rm tests/test_code.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
deleted file mode 100644
index 4b29c538cdd6..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
- https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- # needed for unittest discovery
- > tests/__init__.py || die
- # linter tests, fragile to newer linter versions
- rm tests/test_code.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
index 4b29c538cdd6..73574b585de1 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
RDEPEND="
dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/python-docs-3.10.4.ebuild b/dev-python/python-docs/python-docs-3.10.4.ebuild
index db7df46c6ffb..f3341b1efa12 100644
--- a/dev-python/python-docs/python-docs-3.10.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.10.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.12.ebuild b/dev-python/python-docs/python-docs-3.9.12.ebuild
index db7df46c6ffb..50e46bb19d8e 100644
--- a/dev-python/python-docs/python-docs-3.9.12.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.12.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 887d3eed8c67..9dc0ade0f55c 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1 +1,2 @@
DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
+DIST python-email-validator-1.2.0.tar.gz 22603 BLAKE2B cc2364e903cf4f1c3983ad4764a46a317188353899f8cd929c72c60387a25a819405b0cf8253488fa11e4ce9be48df98c64bdc0c3df1664a74c2e6c9c4389e6a SHA512 3c4f87e0992615ae4d1f44e6e0fe9909b43d5810f2aca96129f5ee4dcadac7b4ec5a979dbf6e03f60b8bda2ff0d7cf87f9276c4b4c624e2d036627e2d5d8afad
diff --git a/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild b/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild
new file mode 100644
index 000000000000..3652c882d682
--- /dev/null
+++ b/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A robust email syntax and deliverability validation library"
+HOMEPAGE="
+ https://github.com/JoshData/python-email-validator/
+ https://pypi.org/project/email-validator/
+"
+SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/idna-2.8[${PYTHON_USEDEP}]
+ >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # these tests rely on access to gmail.com
+ tests/test_main.py::test_deliverability_no_records
+ tests/test_main.py::test_deliverability_found
+ tests/test_main.py::test_deliverability_fails
+ tests/test_main.py::test_validate_email__with_caching_resolver
+ tests/test_main.py::test_validate_email__with_configured_resolver
+ # these tests rely on example.com being resolvable
+ tests/test_main.py::test_main_single_good_input
+ tests/test_main.py::test_main_multi_input
+ tests/test_main.py::test_main_input_shim
+)
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 0e0dfe47960d..4e535310cfac 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,4 @@
DIST python-engineio-4.2.1.gh.tar.gz 297657 BLAKE2B 0a634cec9f71a3b8659e5b07cc326fb3d7801c8a834248d6f2ea5a48bcd058f8d0b86c2e43c110ea18ef641e3ace273a2ebd20f350aec9360d38ffe0f32f2778 SHA512 f0ea7cb0a34f49d2e3de58dc1038f41cda099fba0033af7020b9ccacd34fbf44fd1613ef14d4d05013dd99a2d35330769e6c3d2f532556fd39262229e40714f6
DIST python-engineio-4.3.0.gh.tar.gz 299122 BLAKE2B 929b16650aaf4a429e9a1353a994cc87022644bef48c59aac9c448ec32533a7a7360413143159809042915f69c4f0ae0c2a13e5fe2d61b729c09890508107948 SHA512 c34688f1dcaf4a1a02dea03d2746b0b0e089387d4ac55024e783ee2dbafb59ac43437138747b63b0710425601b27e1a10c56df7c57c1ed16ab2f812a773c8ec4
DIST python-engineio-4.3.1.gh.tar.gz 299321 BLAKE2B a5234a12ad4434e0793154569f4c3f7d3c416d6334acf6af6de03336861797a42d6930350944a4ed6cca089daaad731b209878b08c61b29a97793afbcea473ac SHA512 6e00134191ff39e3e2f3f8cd933562be8ee9db1512f6b7d3cc2d52283ee2ea329d942edcde0bbfdfed71348d96c62067c423d666ad32a789eab760b583fc75af
+DIST python-engineio-4.3.2.gh.tar.gz 299722 BLAKE2B 87dece98d72b7b0384e3b9d57062a3eaa7aeb80ac3f2f685d50b8816e122398ffd54da1f4b99a90a1f535e2d0f0d282167a682de022373e6108f7e91f8689aa1 SHA512 59933a0093167042a3873ba1561d2859359a5ad160f6b7b5c19478b1f73d1bd068779942c8bfc44dd5a8d9f155359571298b960bcd217aab341bdfec35bc5b28
diff --git a/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..60800b43a242
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+ https://python-engineio.readthedocs.io/
+ https://github.com/miguelgrinberg/python-engineio/
+ https://pypi.org/project/python-engineio/"
+SRC_URI="
+ https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+# eventlet doesn't yet support Python 3.10, so let's work around it
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/eventlet[${PYTHON_USEDEP}]
+ ' python3_{8,9} )
+
+ dev-python/gevent[${PYTHON_USEDEP}]
+ dev-python/websockets[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_DESELECT=(
+ # Both want websocket (server) which isn't strictly required and fails
+ # because it can't find it. Think it needs right provider depending on
+ # whether it chose gevent/eventlet/werkzeug. Not worth the effort.
+ tests/common/test_server.py::TestServer::test_connect
+ tests/common/test_server.py::TestServer::test_upgrades
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+ dev-python/alabaster
+
+python_test() {
+ if [[ ${EPYTHON} != python3.8 && ${EPYTHON} != python3.9 ]] ; then
+ EPYTEST_IGNORE+=(
+ tests/common/test_async_eventlet.py
+ )
+
+ EPYTEST_DESELECT+=(
+ tests/common/test_server.py::TestServer::test_async_mode_eventlet
+ )
+ fi
+
+ epytest
+}
diff --git a/dev-python/python-engineio/python-engineio-4.3.2.ebuild b/dev-python/python-engineio/python-engineio-4.3.2.ebuild
new file mode 100644
index 000000000000..f11d0aaef405
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+ https://python-engineio.readthedocs.io/
+ https://github.com/miguelgrinberg/python-engineio/
+ https://pypi.org/project/python-engineio/"
+SRC_URI="
+ https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/eventlet[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+ dev-python/alabaster
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 0f09b9ed2047..192ec2fe87ce 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,2 +1 @@
-DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
diff --git a/dev-python/python-evdev/python-evdev-1.4.0.ebuild b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
deleted file mode 100644
index 9dea3a603023..000000000000
--- a/dev-python/python-evdev/python-evdev-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.io/"
-SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-
-distutils_enable_tests pytest
-
-python_compile() {
- distutils-r1_python_compile build_ecodes \
- --evdev-headers \
- "${SYSROOT}/usr/include/linux/input.h:${SYSROOT}/usr/include/linux/input-event-codes.h"
-}
-
-python_test() {
- # test_uinput requires write access to /dev/uinput
- pytest -vv --deselect tests/test_uinput.py ||
- die "tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/python-evdev/python-evdev-1.5.0.ebuild b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
index b24eb9bdeb46..824baf37bc3e 100644
--- a/dev-python/python-evdev/python-evdev-1.5.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 679205cef01e..cdd40fd16ea2 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1 @@
-DIST python-nbxmpp-nbxmpp-2.0.3.tar.bz2 122433 BLAKE2B 9543a93c2ea372fbe8412c410252907eeaa00e2576bbe4a614141d521d03ef997481b482e9990376cd5b8139e5daa01e51f946fd9792fb26bc0084e04f3b1de0 SHA512 6ba1dc045a7f6d761e8d9d5da9f4799aaff96155fa7260c76820bbe9c11d95a11777fe73b9f405ee9e4b93be2167dd575fae4cb880f0690bb6a99d091a5eadfc
-DIST python-nbxmpp-nbxmpp-2.0.4.tar.bz2 122568 BLAKE2B 3ca2213018ee561e9778ca6107e3a55ef6635a1f859d7cec6f08ac7ac6b3e3a7b4dd2dc38e3305fdcfca94b2003aef5525efc2f992b25fe5d5e44090c199fad4 SHA512 52e819019abaec8fb3fdf7c64bc7bf29d94d77d8b3c550fd8c05223eef81e50d8a992fb12b56198f389860f1bd55f915b781ae5a1d66b40bcbe17fec3fa0d540
DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild
deleted file mode 100644
index 9cdea5496534..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-libs/gobject-introspection
- net-libs/libsoup[introspection]
- dev-python/idna[${PYTHON_USEDEP}]
- dev-python/precis-i18n[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild
deleted file mode 100644
index 5e873ec0ca05..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-nbxmpp-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
- dev-libs/gobject-introspection
- net-libs/libsoup[introspection]
- dev-python/idna[${PYTHON_USEDEP}]
- dev-python/precis-i18n[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
index 9130ac17363c..94742b333648 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
RDEPEND="
dev-libs/gobject-introspection
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index f8d03acf9caf..1d39ebf8161d 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1 +1,2 @@
DIST python-slugify-6.1.1.tar.gz 13259 BLAKE2B 2f85061775d9e921bf5679ab47d9a5b4fed2d2e1703aa2717e21c1d43fd1b93ef5d7060151bb4b473cd901aef16d3d905d2ca5004ae7bc61e906464bb52494a2 SHA512 2ffe8420b2f0504c57f42bf20aa0145ae521dab8d1bbefcaff1a815aa04377c7eb48eab929890915a9c9632a5c1cac4d3e7e093dcdfdda59f8ecee1ab787cbb7
+DIST python-slugify-6.1.2.tar.gz 13302 BLAKE2B 600ac1cc37cd0001ca3c08cdccb4655dd3754f7673596eada2dfb6adcb6c190f0e5644bd1cba4debf0fae42ae183b3d81acdcc09270e3ade94076d69ba25895a SHA512 3748c18d469032fc002318fbd5730b96a6f8430ff7b0b1a9afb4c19d4dd8e7528400682fa6b2fcc11ec4230917d7e7f61de290f5b199935d77d5335006af0ffb
diff --git a/dev-python/python-slugify/python-slugify-6.1.2.ebuild b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
new file mode 100644
index 000000000000..8312bf675562
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="
+ https://github.com/un33k/python-slugify/
+ https://pypi.org/project/python-slugify/
+"
+SRC_URI="
+ https://github.com/un33k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-python/text-unidecode[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-systemd/python-systemd-234-r1.ebuild b/dev-python/python-systemd/python-systemd-234-r1.ebuild
deleted file mode 100644
index 8c17ab7f574b..000000000000
--- a/dev-python/python-systemd/python-systemd-234-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2015-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS="no"
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for native access to the systemd facilities"
-HOMEPAGE="https://github.com/systemd/python-systemd"
-SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-
-DEPEND="sys-apps/systemd:0="
-RDEPEND="${DEPEND}
- !sys-apps/systemd[python(-)]
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-py3.10.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile() {
- # https://bugs.gentoo.org/690316
- distutils-r1_python_compile -j1
-}
-
-python_test() {
- pushd "${BUILD_DIR}/lib" > /dev/null || die
- epytest -o cache_dir="${T}"
- popd > /dev/null || die
-}
diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild
index 823b5a85823c..28970956fb37 100644
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ b/dev-python/python-systemd/python-systemd-234-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
DEPEND="sys-apps/systemd:0="
RDEPEND="${DEPEND}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index a7539bdd6512..fa261662598e 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,4 @@
DIST pytools-2022.1.3.tar.gz 68522 BLAKE2B 49223fa3763e40e613708323e755f3cf4df2da4642110742fc9f4dd2275caa171e394023edd62f9cb254e475c9167b49cb9a0d10285d516fb282347c47a919f0 SHA512 d50c4e89714ad7190d2011c3d1c5e572f615c6e1b53d5e4457d784499b796c740f425c53799d74c3376a350eb15591aa6bda64c9458519c0d0aa6d7e98468b33
DIST pytools-2022.1.4.tar.gz 68840 BLAKE2B 27205ec5e4af2f9193c5ca3e2ca33f8511f49105b7252d3fd95006e6eb6086c1650e39050be3cb469b2906ce946144d5c5d5c155380d3e8b62b0af85975cb736 SHA512 feb1d2f10175700d8fea1e531b9f0c78a57f4f1547976ac0c4d2e40b870cba95b99b7484ba2268fb36e62894d074856acfbfeb1219b23011cddb16cea597bb2c
+DIST pytools-2022.1.5.tar.gz 68877 BLAKE2B f25bf60d4bb927f3b1cfb6535704a0ea258240985b2e112baef3505286cc21d9917a4c80ceee04bd9efd916c455dd58c696f92c03d59b056804809a1df26e743 SHA512 85086529cc0d197d97378b9862b84fd2951bfaf1fa3af1d2ff2698d0e9053949c0eb060f9203237a99eb7c7a773ef9eb46e7f503120e607a38a077333faa7c02
+DIST pytools-2022.1.6.tar.gz 68918 BLAKE2B ddbc2b4956aa820c811dd04ea6297455837d388c6aae46b73a934086014aa58633777a2647ea1aa8c13d61f2aa95f36b836d1f98104a926cdfd12402c6456410 SHA512 9b2c2f9e08d71ee5b56e352fff36206276108125174cd977103e59255f0ce180dc9bd00a9ae0e88071b3e60019862c6e72613bc094bfe64d26fa694e7de6685d
diff --git a/dev-python/pytools/pytools-2022.1.5.ebuild b/dev-python/pytools/pytools-2022.1.5.ebuild
new file mode 100644
index 000000000000..3fb4bfc6e6cf
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/
+ https://github.com/inducer/pytools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+ ' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.6.ebuild b/dev-python/pytools/pytools-2022.1.6.ebuild
new file mode 100644
index 000000000000..acc0a57c8b2d
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+ https://mathema.tician.de/software/pytools/
+ https://github.com/inducer/pytools/
+ https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+ ' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/radon/radon-5.1.0-r1.ebuild b/dev-python/radon/radon-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..0597c06cdb0b
--- /dev/null
+++ b/dev-python/radon/radon-5.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/mando[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin the dep
+ sed -i -e '/mando/s:,<0.7::' setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/radon/radon-5.1.0-r2.ebuild b/dev-python/radon/radon-5.1.0-r2.ebuild
new file mode 100644
index 000000000000..ede29bb7c85b
--- /dev/null
+++ b/dev-python/radon/radon-5.1.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="
+ https://radon.readthedocs.io/
+ https://github.com/rubik/radon/
+ https://pypi.org/project/radon/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/mando[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin the dep
+ sed -i -e '/mando/s:,<0.7::' setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/radon/radon-5.1.0.ebuild b/dev-python/radon/radon-5.1.0.ebuild
deleted file mode 100644
index acceb1d69c97..000000000000
--- a/dev-python/radon/radon-5.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
- dev-python/mando[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 595f9cfd91b8..d07d552db0f9 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/readme_renderer/readme_renderer-35.0.ebuild b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
index 004ab4751ef9..5deb5ae1a7c1 100644
--- a/dev-python/readme_renderer/readme_renderer-35.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
RDEPEND="
>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
index c7ba25de7337..5dd5620ca49e 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 7ad0e2ce4715..0a3babe37032 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1 +1,2 @@
DIST regex-2022.3.15.tar.gz 383001 BLAKE2B 459fed91a8996d6191ccd220869cf0c0e793f774552702c9aaec00882f71adae1e7378233811f6885d95b10db963d098a1d4c45aa0887c26d304df85fa9fb124 SHA512 99ef24b28dc5b1ec6a5d670698a98025aff14d082f6c24a3122157d28879f71c3ced2f5d2a3c8c6091609d93b7a500b2882b92b29a8fe1527532dd9f280cd51b
+DIST regex-2022.4.24.tar.gz 383365 BLAKE2B 743a27afa1d504e9653b56d868b076479a476108213137ae7157772d29824204eeb781f5d939debfa8da122e22acbfbea6d8c356b14ad9c1eafca2be5970fdd2 SHA512 2b9e83c7164986eceed5ae0e33aca9075afa022398684bb688064394cfa43f06b0ce72c15fb7ceee55b7793072c7b1d7709513faedce4719f0c406164e9e0593
diff --git a/dev-python/regex/regex-2022.4.24.ebuild b/dev-python/regex/regex-2022.4.24.ebuild
new file mode 100644
index 000000000000..9c61a043a6d8
--- /dev/null
+++ b/dev-python/regex/regex-2022.4.24.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+ https://bitbucket.org/mrabarnett/mrab-regex/
+ https://pypi.org/project/regex/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+ "${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/Features.html )
+ local DOCS=( README.rst docs/*.rst )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/reno-3.5.0.ebuild b/dev-python/reno/reno-3.5.0.ebuild
index 6e2ce449523d..6449033e1620 100644
--- a/dev-python/reno/reno-3.5.0.ebuild
+++ b/dev-python/reno/reno-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
RDEPEND="
dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild
index cde91affc97b..9cfb9219951c 100644
--- a/dev-python/reportlab/reportlab-3.6.9.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
media-libs/freetype
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 04f1c4757361..960b9aff9981 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1 +1,2 @@
DIST requests-cache-0.9.3.gh.tar.gz 1541517 BLAKE2B a6096e8db01ccc7e6afa94ca35460ad79bbc503fe32fb272c3b43bb3344cb4a4e3c6f9240dc8d26a49b2ae4b564de72be22553b40847480487c150b192aa9490 SHA512 d413fbed156bd3fca48db8b153b01a883ee72d62f6e8982d490a5378dc188c19d0b3af5e37e6f47d19ed0ba11b3c0e01489720d56df12afcf1b47088e1541221
+DIST requests-cache-0.9.4.gh.tar.gz 1541821 BLAKE2B 90f3ffe8f4213a47d19c1190f1201bb484473a4ee2fae82dff59c9e80bc8c154739e99f5024aa55b436f9e620d5594441df61e2db44e3cbb381d394c1b6b4a0b SHA512 66023dc8b153070a532f160af58ac2102f6b9d536a0045c4c62ad1d4175f59df6e7db5a25422f5610a2f17049270ad0b63c6023ddddf64235432a63d2cce9b91
diff --git a/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch b/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch
new file mode 100644
index 000000000000..258738158355
--- /dev/null
+++ b/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch
@@ -0,0 +1,150 @@
+From 7917ba0dd12901d88137d3f8b487307eda38d326 Mon Sep 17 00:00:00 2001
+From: Jordan Cook
+Date: Sat, 9 Apr 2022 13:33:32 -0500
+Subject: [PATCH] Add compatibility with cattrs 21.1+, and clean up preconf
+ module a bit
+
+---
+ requests_cache/__init__.py | 2 +-
+ requests_cache/serializers/preconf.py | 89 +++++++++++++++------------
+ 2 files changed, 49 insertions(+), 42 deletions(-)
+
+diff --git a/requests_cache/__init__.py b/requests_cache/__init__.py
+index 87781ba..835586c 100644
+--- a/requests_cache/__init__.py
++++ b/requests_cache/__init__.py
+@@ -17,4 +17,4 @@ try:
+ from .session import *
+ # Log and ignore ImportErrors, if imported outside a virtualenv (e.g., just to check __version__)
+ except ImportError as e:
+- logger.warning(e)
++ logger.warning(e, exc_info=True)
+diff --git a/requests_cache/serializers/preconf.py b/requests_cache/serializers/preconf.py
+index ed19fb4..cb099b8 100644
+--- a/requests_cache/serializers/preconf.py
++++ b/requests_cache/serializers/preconf.py
+@@ -1,3 +1,4 @@
++# flake8: noqa: F841
+ """The ``cattrs`` library includes a number of `pre-configured converters
+ `_ that perform some pre-serialization steps
+ required for specific serialization formats.
+@@ -14,69 +15,75 @@ class that raises an ``ImportError`` at initialization time instead of at import
+ """
+ import pickle
+ from functools import partial
+-
+-from cattr.preconf import bson as bson_preconf
+-from cattr.preconf import json as json_preconf
+-from cattr.preconf import msgpack, orjson, pyyaml, tomlkit, ujson
++from importlib import import_module
+
+ from .._utils import get_placeholder_class
+ from .cattrs import CattrStage
+ from .pipeline import SerializerPipeline, Stage
+
+-base_stage = (
+- CattrStage()
+-) #: Base stage for all serializer pipelines (or standalone dict serializer)
++
++def make_stage(preconf_module: str):
++ """Create a preconf serializer stage from a module name, if dependencies are installed"""
++ try:
++ return CattrStage(import_module(preconf_module).make_converter)
++ except ImportError as e:
++ return get_placeholder_class(e)
++
++
++base_stage = CattrStage() #: Base stage for all serializer pipelines
+ dict_serializer = base_stage #: Partial serializer that unstructures responses into dicts
+-bson_preconf_stage = CattrStage(bson_preconf.make_converter) #: Pre-serialization steps for BSON
+-json_preconf_stage = CattrStage(json_preconf.make_converter) #: Pre-serialization steps for JSON
+-msgpack_preconf_stage = CattrStage(msgpack.make_converter) #: Pre-serialization steps for msgpack
+-orjson_preconf_stage = CattrStage(orjson.make_converter) #: Pre-serialization steps for orjson
+-yaml_preconf_stage = CattrStage(pyyaml.make_converter) #: Pre-serialization steps for YAML
+-toml_preconf_stage = CattrStage(tomlkit.make_converter) #: Pre-serialization steps for TOML
+-ujson_preconf_stage = CattrStage(ujson.make_converter) #: Pre-serialization steps for ultrajson
+-pickle_serializer = SerializerPipeline(
+- [base_stage, pickle], is_binary=True
+-) #: Complete pickle serializer
++pickle_serializer = SerializerPipeline([base_stage, pickle], is_binary=True) #: Pickle serializer
+ utf8_encoder = Stage(dumps=str.encode, loads=lambda x: x.decode()) #: Encode to bytes
++bson_preconf_stage = make_stage('cattr.preconf.bson') #: Pre-serialization steps for BSON
++json_preconf_stage = make_stage('cattr.preconf.json') #: Pre-serialization steps for JSON
++msgpack_preconf_stage = make_stage('cattr.preconf.msgpack') #: Pre-serialization steps for msgpack
++orjson_preconf_stage = make_stage('cattr.preconf.orjson') #: Pre-serialization steps for orjson
++toml_preconf_stage = make_stage('cattr.preconf.tomlkit') #: Pre-serialization steps for TOML
++ujson_preconf_stage = make_stage('cattr.preconf.ujson') #: Pre-serialization steps for ultrajson
++yaml_preconf_stage = make_stage('cattr.preconf.pyyaml') #: Pre-serialization steps for YAML
+
+
+ # Safe pickle serializer
+-try:
++def signer_stage(secret_key=None, salt='requests-cache') -> Stage:
++ """Create a stage that uses ``itsdangerous`` to add a signature to responses on write, and
++ validate that signature with a secret key on read. Can be used in a
++ :py:class:`.SerializerPipeline` in combination with any other serialization steps.
++ """
+ from itsdangerous import Signer
+
+- def signer_stage(secret_key=None, salt='requests-cache') -> Stage:
+- """Create a stage that uses ``itsdangerous`` to add a signature to responses on write, and
+- validate that signature with a secret key on read. Can be used in a
+- :py:class:`.SerializerPipeline` in combination with any other serialization steps.
+- """
+- return Stage(Signer(secret_key=secret_key, salt=salt), dumps='sign', loads='unsign')
+-
+- def safe_pickle_serializer(
+- secret_key=None, salt='requests-cache', **kwargs
+- ) -> SerializerPipeline:
+- """Create a serializer that uses ``pickle`` + ``itsdangerous`` to add a signature to
+- responses on write, and validate that signature with a secret key on read.
+- """
+- return SerializerPipeline(
+- [base_stage, pickle, signer_stage(secret_key, salt)], is_binary=True
+- )
++ return Stage(Signer(secret_key=secret_key, salt=salt), dumps='sign', loads='unsign')
++
++
++def safe_pickle_serializer(secret_key=None, salt='requests-cache', **kwargs) -> SerializerPipeline:
++ """Create a serializer that uses ``pickle`` + ``itsdangerous`` to add a signature to
++ responses on write, and validate that signature with a secret key on read.
++ """
++ return SerializerPipeline([base_stage, pickle, signer_stage(secret_key, salt)], is_binary=True)
++
+
++try:
++ import itsdangerous # noqa: F401
+ except ImportError as e:
+ signer_stage = get_placeholder_class(e)
+ safe_pickle_serializer = get_placeholder_class(e)
+
+
+-# BSON serializer
+-try:
++def _get_bson_functions():
++ """Handle different function names between pymongo's bson and standalone bson"""
+ try:
+- from bson import decode as _bson_loads
+- from bson import encode as _bson_dumps
++ import pymongo # noqa: F401
++
++ return {'dumps': 'encode', 'loads': 'decode'}
+ except ImportError:
+- from bson import dumps as _bson_dumps
+- from bson import loads as _bson_loads
++ return {'dumps': 'dumps', 'loads': 'loads'}
++
++
++# BSON serializer
++try:
++ import bson
+
+ bson_serializer = SerializerPipeline(
+- [bson_preconf_stage, Stage(dumps=_bson_dumps, loads=_bson_loads)], is_binary=True
++ [bson_preconf_stage, Stage(bson, **_get_bson_functions())], is_binary=True
+ ) #: Complete BSON serializer; uses pymongo's ``bson`` if installed, otherwise standalone ``bson`` codec
+ except ImportError as e:
+ bson_serializer = get_placeholder_class(e)
+--
+2.35.1
+
diff --git a/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild b/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..1d237051f1ea
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature
+
+HOMEPAGE="
+ https://pypi.org/project/requests-cache/
+ https://github.com/reclosedev/requests-cache/
+"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+ https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/cattrs[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ >=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/itsdangerous[${PYTHON_USEDEP}]
+ dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/timeout-decorator[${PYTHON_USEDEP}]
+ dev-python/ujson[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cattrs-22.patch
+)
+
+src_prepare() {
+ # unpin the dep
+ sed -i -e '/cattrs/s:\^:>=:' pyproject.toml || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_IGNORE=(
+ # These require extra servers running
+ tests/integration/test_dynamodb.py
+ tests/integration/test_gridfs.py
+ tests/integration/test_mongodb.py
+ tests/integration/test_redis.py
+ )
+ local EPYTEST_DESELECT=(
+ # Requires Internet access
+ tests/integration/test_compat.py::test_version_upgrade
+ )
+
+ local -x USE_PYTEST_HTTPBIN=true
+ epytest
+}
+
+pkg_postinst() {
+ optfeature "redis backend" "dev-python/redis-py"
+ optfeature "MongoDB backend" "dev-python/pymongo"
+
+ optfeature "JSON serialization" "dev-python/ujson"
+ optfeature "YAML serialization" "dev-python/pyyaml"
+ optfeature "signing serialized data" "dev-python/itsdangerous"
+}
diff --git a/dev-python/requests-cache/requests-cache-0.9.3.ebuild b/dev-python/requests-cache/requests-cache-0.9.3.ebuild
deleted file mode 100644
index 46702860b1d5..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
- https://pypi.org/project/requests-cache/
- https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
- https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/cattrs[${PYTHON_USEDEP}]
- >=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- >=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/itsdangerous[${PYTHON_USEDEP}]
- dev-python/pytest-httpbin[${PYTHON_USEDEP}]
- dev-python/requests-mock[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- dev-python/timeout-decorator[${PYTHON_USEDEP}]
- dev-python/ujson[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_IGNORE=(
- # These require extra servers running
- tests/integration/test_dynamodb.py
- tests/integration/test_gridfs.py
- tests/integration/test_mongodb.py
- tests/integration/test_redis.py
- )
- local EPYTEST_DESELECT=(
- # Requires Internet access
- tests/integration/test_compat.py::test_version_upgrade
- )
-
- local -x USE_PYTEST_HTTPBIN=true
- epytest
-}
-
-pkg_postinst() {
- optfeature "redis backend" "dev-python/redis-py"
- optfeature "MongoDB backend" "dev-python/pymongo"
-
- optfeature "JSON serialization" "dev-python/ujson"
- optfeature "YAML serialization" "dev-python/pyyaml"
- optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.9.4.ebuild b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
new file mode 100644
index 000000000000..13d1ae62b521
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature
+
+HOMEPAGE="
+ https://pypi.org/project/requests-cache/
+ https://github.com/reclosedev/requests-cache/
+"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+ https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/cattrs[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ >=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/itsdangerous[${PYTHON_USEDEP}]
+ dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/timeout-decorator[${PYTHON_USEDEP}]
+ dev-python/ujson[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/requests-cache-0.9.3-cattrs-22.patch
+)
+
+src_prepare() {
+ # unpin the dep
+ sed -i -e '/cattrs/s:\^:>=:' pyproject.toml || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_IGNORE=(
+ # These require extra servers running
+ tests/integration/test_dynamodb.py
+ tests/integration/test_gridfs.py
+ tests/integration/test_mongodb.py
+ tests/integration/test_redis.py
+ )
+ local EPYTEST_DESELECT=(
+ # Requires Internet access
+ tests/integration/test_compat.py::test_version_upgrade
+ )
+
+ local -x USE_PYTEST_HTTPBIN=true
+ epytest
+}
+
+pkg_postinst() {
+ optfeature "redis backend" "dev-python/redis-py"
+ optfeature "MongoDB backend" "dev-python/pymongo"
+
+ optfeature "JSON serialization" "dev-python/ujson"
+ optfeature "YAML serialization" "dev-python/pyyaml"
+ optfeature "signing serialized data" "dev-python/itsdangerous"
+}
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index bc009aa6dafa..37c7016402a5 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RDEPEND="/dev/null || die
- einfo "Running ${example_dir} test"
- esetup.py build --build-lib=build/lib
-
- case ${example_dir} in
- html-py-ever)
- pushd test >/dev/null || die
- local -x PYTHONPATH=../build/lib
- ${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
- popd >/dev/null || die
- ;;
- *)
- pushd build/lib >/dev/null || die
- epytest ../../tests
- popd >/dev/null || die
- ;;
- esac
-
- rm -rf build || die
- popd >/dev/null || die
- done
-}
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
new file mode 100644
index 000000000000..cbe6701b0e37
--- /dev/null
+++ b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+CRATES="
+ bitflags-1.3.2
+ byteorder-1.4.3
+ cfg-if-1.0.0
+ convert_case-0.4.0
+ cssparser-0.27.2
+ cssparser-macros-0.6.0
+ derive_more-0.99.17
+ dtoa-0.4.8
+ dtoa-short-0.3.3
+ futf-0.1.5
+ fxhash-0.2.1
+ getrandom-0.1.16
+ html5ever-0.25.1
+ indoc-1.0.4
+ instant-0.1.12
+ itoa-0.4.8
+ kuchiki-0.8.1
+ lazy_static-1.4.0
+ libc-0.2.121
+ lock_api-0.4.6
+ log-0.4.14
+ mac-0.1.1
+ markup5ever-0.10.1
+ matches-0.1.9
+ new_debug_unreachable-1.0.4
+ nodrop-0.1.14
+ once_cell-1.10.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ phf-0.8.0
+ phf_codegen-0.8.0
+ phf_generator-0.8.0
+ phf_macros-0.8.0
+ phf_shared-0.10.0
+ phf_shared-0.8.0
+ ppv-lite86-0.2.16
+ precomputed-hash-0.1.1
+ proc-macro2-1.0.36
+ proc-macro-hack-0.5.19
+ pyo3-0.16.2
+ pyo3-build-config-0.16.2
+ pyo3-ffi-0.16.2
+ pyo3-macros-0.16.2
+ pyo3-macros-backend-0.16.2
+ quote-1.0.16
+ rand-0.7.3
+ rand_chacha-0.2.2
+ rand_core-0.5.1
+ rand_hc-0.2.0
+ rand_pcg-0.2.1
+ redox_syscall-0.2.11
+ rustc_version-0.4.0
+ scopeguard-1.1.0
+ selectors-0.22.0
+ semver-1.0.6
+ serde-1.0.136
+ servo_arc-0.1.1
+ siphasher-0.3.10
+ smallvec-1.8.0
+ stable_deref_trait-1.2.0
+ string_cache-0.8.3
+ string_cache_codegen-0.5.1
+ syn-1.0.89
+ tendril-0.4.3
+ thin-slice-0.1.1
+ unicode-xid-0.2.2
+ unindent-0.1.8
+ utf-8-0.7.6
+ wasi-0.9.0+wasi-snapshot-preview1
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
+HOMEPAGE="
+ https://github.com/PyO3/setuptools-rust/
+ https://pypi.org/project/setuptools-rust/
+"
+SRC_URI="
+ mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+ test? ( $(cargo_crate_uris ${CRATES}) )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/rust
+ =dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ >=dev-python/setuptools_scm-6.3.2[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cffi[${PYTHON_USEDEP}]
+ ' 'python*')
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+src_unpack() {
+ cargo_src_unpack
+}
+
+python_test() {
+ local examples=(
+ html-py-ever
+ namespace_package
+ rust_with_cffi
+ )
+ for example_dir in ${examples[@]}; do
+ pushd examples/${example_dir} >/dev/null || die
+ einfo "Running ${example_dir} test"
+ esetup.py build --build-lib=build/lib
+
+ case ${example_dir} in
+ html-py-ever)
+ pushd test >/dev/null || die
+ local -x PYTHONPATH=../build/lib
+ ${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
+ popd >/dev/null || die
+ ;;
+ *)
+ pushd build/lib >/dev/null || die
+ epytest ../../tests
+ popd >/dev/null || die
+ ;;
+ esac
+
+ rm -rf build || die
+ popd >/dev/null || die
+ done
+}
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
index 812e47a1a262..f970079b552a 100644
--- a/dev-python/setuptools/setuptools-62.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
index 8938c7523a8b..6207e0197458 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/slixmpp/slixmpp-1.8.2.ebuild b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
index a09033bc02fb..edc5f0abb059 100644
--- a/dev-python/slixmpp/slixmpp-1.8.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~riscv"
fi
DEPEND="
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 13064b3ad091..748bc48ea0ba 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index a544af613236..35d024d5085c 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
index b4845899ffc9..31ebe59234ea 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-4.4.0-r1.ebuild b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..43a0b572068c
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+ https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+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 ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+ =dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ =dev-python/jinja-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+ ' python3_{8,9} pypy3)
+ latex? (
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )
+ !dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+ doc? (
+ dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ )
+ test? (
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ virtual/imagemagick-tools[jpeg,png,svg]
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+ "${FILESDIR}/${PN}-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # disable internet access
+ sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+ doc/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+ fi
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+ local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+ local EPYTEST_DESELECT=(
+ # these tests require Internet access
+ tests/test_build_latex.py::test_latex_images
+ tests/test_build_linkcheck.py::test_defaults
+ tests/test_build_linkcheck.py::test_defaults_json
+ tests/test_build_linkcheck.py::test_anchors_ignored
+ tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+ # TODO
+ tests/test_ext_autodoc_autoclass.py::test_classes
+ tests/test_ext_autodoc_autofunction.py::test_classes
+ )
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+ tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+ tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+ tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+ tests/test_ext_autodoc.py::test_automethod_for_builtin
+ tests/test_ext_autodoc.py::test_cython
+ tests/test_ext_autodoc.py::test_partialfunction
+ tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+ tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+ tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+ tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+ tests/test_ext_autodoc_autofunction.py::test_builtin_function
+ tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+ tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+ tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+ tests/test_pycode_parser.py::test_annotated_assignment
+ )
+
+ epytest
+}
diff --git a/dev-python/sphinx/sphinx-4.4.0.ebuild b/dev-python/sphinx/sphinx-4.4.0.ebuild
deleted file mode 100644
index 0bc1915d9cac..000000000000
--- a/dev-python/sphinx/sphinx-4.4.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
- https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-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 ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
- =dev-python/Babel-1.3[${PYTHON_USEDEP}]
- =dev-python/jinja-2.3[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
- >=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
- ' python3_{8,9} pypy3)
- latex? (
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-luatex
- app-text/dvipng
- )"
-BDEPEND="
- doc? (
- dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
- media-gfx/graphviz
- )
- test? (
- dev-python/html5lib[${PYTHON_USEDEP}]
- virtual/imagemagick-tools[jpeg,png,svg]
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-luatex
- app-text/dvipng
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.2.1-doc-link.patch"
- "${FILESDIR}/${PN}-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # disable internet access
- sed -i -e 's:^intersphinx_mapping:disabled_&:' \
- doc/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py build_sphinx
- HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
- fi
-}
-
-python_test() {
- mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
- local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
- local EPYTEST_DESELECT=(
- # these tests require Internet access
- tests/test_build_latex.py::test_latex_images
- tests/test_build_linkcheck.py::test_defaults
- tests/test_build_linkcheck.py::test_defaults_json
- tests/test_build_linkcheck.py::test_anchors_ignored
- tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
- # TODO
- tests/test_ext_autodoc_autoclass.py::test_classes
- tests/test_ext_autodoc_autofunction.py::test_classes
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
- tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
- tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
- tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
- tests/test_ext_autodoc.py::test_automethod_for_builtin
- tests/test_ext_autodoc.py::test_cython
- tests/test_ext_autodoc.py::test_partialfunction
- tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
- tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
- tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
- tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
- tests/test_ext_autodoc_autofunction.py::test_builtin_function
- tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
- tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
- tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
- tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
- tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
- tests/test_pycode_parser.py::test_annotated_assignment
- )
-
- epytest
-}
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..727d541b4499
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+ https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+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 ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+ =dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ =dev-python/jinja-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+ ' python3_{8,9} pypy3)
+ latex? (
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )
+ !dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+ doc? (
+ dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ )
+ test? (
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ virtual/imagemagick-tools[jpeg,png,svg]
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+ "${FILESDIR}/${PN}-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # disable internet access
+ sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+ doc/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+ fi
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+ local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+ local EPYTEST_DESELECT=(
+ # these tests require Internet access
+ tests/test_build_latex.py::test_latex_images
+ tests/test_build_linkcheck.py::test_defaults
+ tests/test_build_linkcheck.py::test_defaults_json
+ tests/test_build_linkcheck.py::test_anchors_ignored
+ tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+ # TODO
+ tests/test_ext_autodoc_autoclass.py::test_classes
+ tests/test_ext_autodoc_autofunction.py::test_classes
+ )
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+ tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+ tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+ tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+ tests/test_ext_autodoc.py::test_automethod_for_builtin
+ tests/test_ext_autodoc.py::test_cython
+ tests/test_ext_autodoc.py::test_partialfunction
+ tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+ tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+ tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+ tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+ tests/test_ext_autodoc_autofunction.py::test_builtin_function
+ tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+ tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+ tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+ tests/test_pycode_parser.py::test_annotated_assignment
+ tests/test_util_inspect.py::test_isattributedescriptor
+ tests/test_util_typing.py::test_stringify_type_hints_pep_585
+ )
+
+ epytest
+}
diff --git a/dev-python/sphinx/sphinx-4.5.0.ebuild b/dev-python/sphinx/sphinx-4.5.0.ebuild
deleted file mode 100644
index 2229e8a7a853..000000000000
--- a/dev-python/sphinx/sphinx-4.5.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
- https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-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 ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
- =dev-python/Babel-1.3[${PYTHON_USEDEP}]
- =dev-python/jinja-2.3[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
- >=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
- ' python3_{8,9} pypy3)
- latex? (
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-luatex
- app-text/dvipng
- )"
-BDEPEND="
- doc? (
- dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
- media-gfx/graphviz
- )
- test? (
- dev-python/html5lib[${PYTHON_USEDEP}]
- virtual/imagemagick-tools[jpeg,png,svg]
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-luatex
- app-text/dvipng
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.2.1-doc-link.patch"
- "${FILESDIR}/${PN}-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # disable internet access
- sed -i -e 's:^intersphinx_mapping:disabled_&:' \
- doc/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py build_sphinx
- HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
- fi
-}
-
-python_test() {
- mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
- local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
- local EPYTEST_DESELECT=(
- # these tests require Internet access
- tests/test_build_latex.py::test_latex_images
- tests/test_build_linkcheck.py::test_defaults
- tests/test_build_linkcheck.py::test_defaults_json
- tests/test_build_linkcheck.py::test_anchors_ignored
- tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
- # TODO
- tests/test_ext_autodoc_autoclass.py::test_classes
- tests/test_ext_autodoc_autofunction.py::test_classes
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
- tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
- tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
- tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
- tests/test_ext_autodoc.py::test_automethod_for_builtin
- tests/test_ext_autodoc.py::test_cython
- tests/test_ext_autodoc.py::test_partialfunction
- tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
- tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
- tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
- tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
- tests/test_ext_autodoc_autofunction.py::test_builtin_function
- tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
- tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
- tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
- tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
- tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
- tests/test_pycode_parser.py::test_annotated_assignment
- tests/test_util_inspect.py::test_isattributedescriptor
- tests/test_util_typing.py::test_stringify_type_hints_pep_585
- )
-
- epytest
-}
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild
deleted file mode 100644
index cea7e192a03b..000000000000
--- a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-apidoc/ https://github.com/sphinx-contrib/apidoc"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-applehelp/metadata.xml b/dev-python/sphinxcontrib-applehelp/metadata.xml
index b13103ba1030..31487ef94bdc 100644
--- a/dev-python/sphinxcontrib-applehelp/metadata.xml
+++ b/dev-python/sphinxcontrib-applehelp/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
sphinxcontrib-applehelp
sphinx-doc/sphinxcontrib-applehelp
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
index 198dbd73c13f..88f0e2e8cdbc 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
deleted file mode 100644
index 235da974ce65..000000000000
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Apple help book"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-applehelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
deleted file mode 100644
index 16dca9b5330d..000000000000
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="sphinx extension to support coroutines in markup"
-HOMEPAGE="https://github.com/aio-libs/sphinxcontrib-asyncio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
- # fix for sphinx >= 4.0
- sed -e 's/PyModulelevel/PyFunction/g' \
- -e 's/PyClassmember/PyClassMethod/g' \
- -i sphinxcontrib/asyncio.py || die
- default
-}
-
-python_install() {
- rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
- distutils-r1_python_install --skip-build
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- # clean up pth files bug #623852
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
index 890f91d5dceb..10933b33651d 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index 3aa28c8d2a8c..6b2af5ac532d 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1 @@
-DIST sphinxcontrib-bibtex-2.3.0.tar.gz 100159 BLAKE2B 96c9ebf48f11354ea3978a053828f9290457aff4fa1f0bb3d9f94bfe6fb5d5463f83bb12004f22bf8e34a517393848482a27d6754c682d25a0de64c3c7d06ecc SHA512 84652cfc7ad19ad5cdc1dba9a8aa7f835c5c95850a8e941067fd79b6b271733a63a1ba457a59e18156737888c2f42350b7fe0cf2d55ea478629b74b00d14f908
-DIST sphinxcontrib-bibtex-2.4.1.tar.gz 108355 BLAKE2B 2ebe53186b7bbf6ef5e09f05e3586b3a2d126978ef87a023f577cb9768621ceea8eaba8be3d03f55d3c7cd0cd7682c598cf141468129866fb7ac9f08ed0e9245 SHA512 9f323379d2626837dc199ac6c63c555eef8a9fa7c1b215f68d5f2c2769ff4027a027c1a46abe9b09aadf87144ddb22e08aaa47838183a82ff0e12fbd91a5334a
DIST sphinxcontrib-bibtex-2.4.2.tar.gz 284061 BLAKE2B 06d9a868da621cca522c45998ce5f28a5aafc501127760c494e9e796d807800cccf3ee0cace7f4b824a00a76e8dd80e77d0ac5e037f2eaebbeec2ce4ea2ead70 SHA512 52d47bf0a20ef13f29b712bbe66cbcb98bd9531b8032a847375ff23180368decc3f89c2323b9ccff77c9bc9fdada63c521a81da6b701533973fcf627c2672e82
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild
deleted file mode 100644
index af2d6449a82a..000000000000
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for BibTeX style citations"
-HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/pybtex[${PYTHON_USEDEP}]
- dev-python/pybtex-docutils[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild
deleted file mode 100644
index 11d9bca95067..000000000000
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for BibTeX style citations"
-HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pybtex[${PYTHON_USEDEP}]
- dev-python/pybtex-docutils[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc
-
-python_prepare_all() {
- # pybtex.plugin.PluginNotFound: plugin pybtex.style.names.last not found
- # This particular style seems to be removed?
- rm test/test_citation.py test/test_footcite.py test/test_style.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 37574458ef74..020f13fd66c7 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,2 +1 @@
DIST sphinxcontrib-blockdiag-2.0.0.gh.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index 7786df3b3319..b212d7d00f0f 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -4,6 +4,7 @@
python@gentoo.org
+
i.tkomiya@gmail.com
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
index 083db9196590..d71321ef67f9 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
deleted file mode 100644
index e7d18a6002f3..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
- >=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/reportlab[${PYTHON_USEDEP}]
- dev-python/sphinx-testing[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests nose
-
-RDEPEND+="
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -i -e /build-base/d setup.cfg || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-devhelp/metadata.xml b/dev-python/sphinxcontrib-devhelp/metadata.xml
index cebcc5dabf24..6baa5f4c3acd 100644
--- a/dev-python/sphinxcontrib-devhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-devhelp/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
sphinxcontrib-devhelp
sphinx-doc/sphinxcontrib-devhelp
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
index 290ecf64f607..2696b213a31f 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
deleted file mode 100644
index b2eae1f99fb8..000000000000
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Devhelp documents"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-devhelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index b5339a0a95fd..51153276219e 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,2 +1,2 @@
DIST sphinxcontrib-doxylink-1.11.1.gh.tar.gz 22087 BLAKE2B 2f59c2cf802f428459eb13dc095dea2422ee37f9fc93ec8ceb4e6d72bbb8d0381651ef348de77aa5362857ebae7ff9a92be0c868575e43cf4e6c3b271b05147a SHA512 5c86771aa064e3e9ffeb04223ff8cb90fe8c6b8ad8749f250a8a866b4204bece6b82388cda3ccefc83901966e97b3093d3d47bc60fbd8c9f84a5b162fd4d8c02
-DIST sphinxcontrib-doxylink-1.11.1.tar.gz 22087 BLAKE2B 2f59c2cf802f428459eb13dc095dea2422ee37f9fc93ec8ceb4e6d72bbb8d0381651ef348de77aa5362857ebae7ff9a92be0c868575e43cf4e6c3b271b05147a SHA512 5c86771aa064e3e9ffeb04223ff8cb90fe8c6b8ad8749f250a8a866b4204bece6b82388cda3ccefc83901966e97b3093d3d47bc60fbd8c9f84a5b162fd4d8c02
+DIST sphinxcontrib-doxylink-1.11.2.gh.tar.gz 22157 BLAKE2B d2c26675b89cdc9b22b1fae09adb935c1d3491b568d3c1dfcfe7c1dbc378ecbacbe1d202f1a77a90afaf9b7bcc9a1320b4cf3e6859bf631be42b636fd90810ea SHA512 6d470a3bddadf1e56b1ab77e366d5636de0d6ef84bad0fbdf57f903a7493f4fbc249ade7e2f41bd1bb24e39a9396b8a440886cb7766832a108caecb533980f5a
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
index c501831c06fa..ec13acaa9c47 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1.ebuild
deleted file mode 100644
index 57540b5b09fa..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
-SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- test? (
- app-doc/doxygen
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/testfixtures[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild
new file mode 100644
index 000000000000..c501831c06fa
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="
+ https://pypi.org/project/sphinxcontrib-doxylink/
+ https://pythonhosted.org/sphinxcontrib-doxylink/
+ https://github.com/sphinx-contrib/doxylink/
+"
+SRC_URI="
+ https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ app-doc/doxygen
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/testfixtures[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_compile() {
+ distutils-r1_python_compile
+ find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+ distutils_write_namespace sphinxcontrib
+ cd "${T}" || die
+ epytest "${S}"/tests
+}
diff --git a/dev-python/sphinxcontrib-htmlhelp/metadata.xml b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
index f8f84742d76a..955dd0da5295 100644
--- a/dev-python/sphinxcontrib-htmlhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
sphinxcontrib-htmlhelp
sphinx-doc/sphinxcontrib-htmlhelp
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
index 7aef514fdcaf..088d060f849c 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
deleted file mode 100644
index b94a7f8825b9..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="https://www.sphinx-doc.org/
- https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- ${PDEPEND}
- dev-python/html5lib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
index d1c4e54e8a66..05b2426f0c28 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/httpdomain-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
deleted file mode 100644
index b95a9459f8da..000000000000
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Sphinx domain for documenting HTTP APIs"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-httpdomain/
- https://github.com/sphinx-contrib/httpdomain"
-SRC_URI="
- https://github.com/sphinx-contrib/httpdomain/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/httpdomain-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/bottle[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-jsmath/metadata.xml b/dev-python/sphinxcontrib-jsmath/metadata.xml
index bed75a549a92..a4a39611e5b7 100644
--- a/dev-python/sphinxcontrib-jsmath/metadata.xml
+++ b/dev-python/sphinxcontrib-jsmath/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
sphinxcontrib-jsmath
sphinx-doc/sphinxcontrib-jsmath
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
deleted file mode 100644
index c4cadff84cb7..000000000000
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-jsmath"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
index ad3b9ad64009..ecdc81c534a3 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
index 4bb91c7f5c95..d4a10d5f3b58 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/-}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
python_compile() {
distutils-r1_python_compile
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
deleted file mode 100644
index 933a7a4250df..000000000000
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Organize changelog directives in Sphinx docs"
-HOMEPAGE="https://github.com/davidism/sphinxcontrib-log-cabinet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/-}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
index f58fad9eb3dd..f0df71c8b01e 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
deleted file mode 100644
index fce5769cc191..000000000000
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="News Feed extension for Sphinx"
-HOMEPAGE="https://github.com/prometheusresearch/sphinxcontrib-newsfeed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
- if use examples; then
- docinto examples
- dodoc -r demo/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
index 7031a7727fa5..c3f2a174bddf 100644
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
deleted file mode 100644
index e5fcb9c56250..000000000000
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI (fka Swagger) spec renderer for Sphinx"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-openapi/
- https://github.com/sphinx-contrib/openapi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/m2r[${PYTHON_USEDEP}]
- dev-python/picobox[${PYTHON_USEDEP}]
- dev-python/deepmerge[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/responses[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
index 9b63ff722c17..1fba49c5cdf4 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
deleted file mode 100644
index 62980c966350..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to include program output"
-HOMEPAGE="
- https://github.com/NextThought/sphinxcontrib-programoutput/
- https://pypi.org/project/sphinxcontrib-programoutput/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-qthelp/metadata.xml b/dev-python/sphinxcontrib-qthelp/metadata.xml
index 0408d3e13226..8a955c3524c1 100644
--- a/dev-python/sphinxcontrib-qthelp/metadata.xml
+++ b/dev-python/sphinxcontrib-qthelp/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
sphinxcontrib-qthelp
sphinx-doc/sphinxcontrib-qthelp
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
index a313cb9d28f0..9aa972a9aefd 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
deleted file mode 100644
index 6699642adf44..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-qthelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
index ddb999ea9ac5..10629ff13dfe 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
PDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
deleted file mode 100644
index a6e047c73b14..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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 ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
index ca1b32a9be2d..5cdd12d99504 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2.ebuild
deleted file mode 100644
index e2437f44cfdb..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- 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
-
-EPYTEST_DESELECT=(
- # requires the git repo
- tests/test_filter.py::test_contributors
-)
-
-# 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_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index eb12c04c91a0..3ef771ad9d2c 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
index 47d812297ed2..009b12470db9 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
RDEPEND="
>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
deleted file mode 100644
index 9fc9cb7ac243..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="https://www.sphinx-doc.org
- https://github.com/sphinx-doc/sphinxcontrib-websupport"
-# pypi tarball is missing templates
-SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-RDEPEND="
- >=dev-python/six-1.5[${PYTHON_USEDEP}]
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
- >=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- ${PDEPEND}
- >=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
- >=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # breaks tests
- sed -i -e '/pkg_resources/d' \
- sphinxcontrib/websupport/__init__.py || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index b0eb5d837d52..5af733c4cae2 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,2 +1 @@
-DIST sphobjinv-2.2.1.tar.gz 1150428 BLAKE2B 13bec53b00d14466aad652fb822ba32156d4ee3141f2df5bf55eaf77d03627c98c48dd142757ac43fe7dbf00716a85ee4c03060dfcf89e1d9aca4cd2589df5b0 SHA512 9247fc38e5d49adab0921f31e4ad1a8b2ca260c7a921b5fb9db7f800ee484335449031b0f51f81149ff71edba6cc93ab14a683ff6cdce2494322d05474e9a2c7
DIST sphobjinv-2.2.2.tar.gz 1188094 BLAKE2B f693254f3746b0e5cb6cc863be381f41d26465eab2e1494c29f30f1a72374e8d03dfa5c433958dfa1dcbaa0a7da1ff454c42da5c09011fa67264c26e3623a302 SHA512 36e7667b071f30d4ca066422b21d298c5691321d813ba6ad9eb7a69cd4107ceb18365ee2f95865fad64ab872428b035661a3f513df2e4aab1124b48f49c7280b
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
deleted file mode 100644
index b701065103ce..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
- https://github.com/bskinn/sphobjinv/
- https://pypi.org/project/sphobjinv/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/attrs-19.2[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
- dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/dictdiffer[${PYTHON_USEDEP}]
- dev-python/pytest-check[${PYTHON_USEDEP}]
- dev-python/pytest-ordering[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- >=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/timeout-decorator[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
- dev-python/sphinx_rtd_theme \
- dev-python/sphinx-issues \
- dev-python/sphinxcontrib-programoutput
-
-src_prepare() {
- # --strict option is deprecated in pytest>6
- sed -i -e '/addopts/d' tox.ini || die
- sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
- # remove bundled deps
- rm -r src/sphobjinv/_vendored || die
- sed -i -e 's:sphobjinv[.]_vendored[.]::' src/sphobjinv/*.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
index fcbe9ae1f403..20d2e6e113d8 100644
--- a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
RDEPEND="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index dbee9b2d4c8c..5da76d79822e 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,3 +3,4 @@ DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5
DIST SQLAlchemy-1.4.32.tar.gz 8077546 BLAKE2B 8eb0b617cdc147da21722f3e9b7c9c0659c9bc02f0530c724a7c8afafa9ea018c0558b58baa0387d84627115d474e87996fe8c7768ac53d55a0c817bc8f167b7 SHA512 e9bc125cb531182c97c9588bc7b87028ec334efe63d81d0bee0e7f74b0ce88ac183236298a05cdac42f3a0241b543528bf6f225d199e4bf6d8199caca63581bd
DIST SQLAlchemy-1.4.34.tar.gz 8133799 BLAKE2B ec8b14bf4df2d9188805bf49aac394d5944e234099bcb9f20cbbb4114c757bee5933d1fd7025e6eda01bf7be6603cae83ff751928783134031ddf1ccf5d36da7 SHA512 c3158dc2c52dd865d98b84ce4cf0adde38300504d5f5ff61f953927baf8f2264d53255f6e83e2ce2f720529f1e8b3e57e684d56a57fd6a0881bd4f1ba10b373f
DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
+DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
index 00bf1bc4a0bc..d49130048380 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
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 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="examples +sqlite test"
BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
new file mode 100644
index 000000000000..00bf1bc4a0bc
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+ https://www.sqlalchemy.org/
+ https://pypi.org/project/SQLAlchemy/
+ https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+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 ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+ test? (
+ $(python_gen_impl_dep sqlite)
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+ # hardcode call counts specific to Python versions
+ test/aaa_profiling
+)
+
+src_prepare() {
+ sed -i -e '/greenlet/d' setup.cfg || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=()
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+ )
+
+ # upstream's test suite is horribly hacky; it relies on disabling
+ # the warnings plugin and turning warnings into errors; this also
+ # means that any DeprecationWarnings from third-party plugins cause
+ # everything to explode
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x PYTEST_PLUGINS=
+ # upstream automagically depends on xdist when it is importable
+ if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+ PYTEST_PLUGINS+=xdist.plugin
+ fi
+ epytest
+}
+
+python_install_all() {
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "asyncio support" dev-python/greenlet
+ optfeature "MySQL support" \
+ dev-python/mysqlclient \
+ dev-python/pymysql \
+ dev-python/mysql-connector-python
+ optfeature "mssql support" dev-python/pymssql
+ optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/statsmodels/statsmodels-0.13.2.ebuild b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
index a74a58302838..ef7142403fe5 100644
--- a/dev-python/statsmodels/statsmodels-0.13.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
DEPEND="
diff --git a/dev-python/stevedore/stevedore-3.4.0.ebuild b/dev-python/stevedore/stevedore-3.4.0.ebuild
index b2cb72704483..fb6171da6fc8 100644
--- a/dev-python/stevedore/stevedore-3.4.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
RDEPEND="
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 4ff87c59a230..75c7863ccd94 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,4 +1 @@
-DIST svg-path-5.0.1.gh.tar.gz 71178 BLAKE2B 3b8c1e30c913aff770d73eb5bbb4ded19363a80015f7e9b4ab63b46d6bdf7866fe800a702d328d571d744fbdadb097e843f89130b50e0d60398b6914d9740c9f SHA512 95a286853f4f5497297ec27e261f1864ce9829fb7caa73c69b9d4d1449463a871ae0a74fa85619bf3cc24cfa329944c9c970c6f89ff6c5c1878473f433aa6bfe
-DIST svg-path-5.1.gh.tar.gz 74165 BLAKE2B 170608b5133902eab77fa03fa042cb4a8b9f7a6c895b5faae567e7d8de574b0de55a68274cd3adbb0cfcbb1b60aec2432529fe5063b40657b0ca5cab59e205fe SHA512 a8812bd9bc5da3f0f2bd34494cb1e64f3a3dc5b34db75e35c89872b7a1caa91062cfc97b5f1b2bbb5f955b70a71052f2962c1d8769d508c945ec553b003869d4
DIST svg-path-6.0.gh.tar.gz 39195 BLAKE2B a2fd54705a1c41057325a8d9f1151ca7393b4caf496157b4860dd8fb9cda05dcf5bdfe0d601b59c3e25a70e2e01042864936dc5e87b45b7a94e03f4861899884 SHA512 3d51b4912786a5d2bb38f1a98b8b7f4dd0b8e62cdd5e899802eff19bb95d43f4f4c278fbb02951e03e32eff031247a92c95699950be775076d24be37bb6ce70f
-DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
diff --git a/dev-python/svg-path/svg-path-4.1.ebuild b/dev-python/svg-path/svg-path-4.1.ebuild
deleted file mode 100644
index 72d70ec923f6..000000000000
--- a/dev-python/svg-path/svg-path-4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="svg.path-${PV}"
-DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="
- https://github.com/regebro/svg.path/archive/${PV}.tar.gz
- -> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/svg-path/svg-path-5.0.1.ebuild b/dev-python/svg-path/svg-path-5.0.1.ebuild
deleted file mode 100644
index c4dc52ae51aa..000000000000
--- a/dev-python/svg-path/svg-path-5.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P="svg.path-${PV}"
-DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="
- https://github.com/regebro/svg.path/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- src/svg/path/tests/test_image.py::ImageTest::test_image
-)
diff --git a/dev-python/svg-path/svg-path-5.1.ebuild b/dev-python/svg-path/svg-path-5.1.ebuild
deleted file mode 100644
index ec9580166a04..000000000000
--- a/dev-python/svg-path/svg-path-5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="svg.path-${PV}"
-DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="
- https://github.com/regebro/svg.path/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- src/svg/path/tests/test_image.py::ImageTest::test_image
-)
diff --git a/dev-python/svg-path/svg-path-6.0.ebuild b/dev-python/svg-path/svg-path-6.0.ebuild
index b5143bdf5530..d34abd9823bc 100644
--- a/dev-python/svg-path/svg-path-6.0.ebuild
+++ b/dev-python/svg-path/svg-path-6.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
BDEPEND="
test? (
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 7064fe48b193..0157bab898e2 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,2 +1 @@
-DIST swagger-spec-validator-2.7.3.tar.gz 21364 BLAKE2B 05e4d3281c112895eff88050f1902161ecd661c77179f9421cd1335a04e759a67480a53858977a5b8ad4b2ad749c8940e01a646960954ee1006b3e75481c5103 SHA512 182e67f6b2a83c61a2ad452614557cfdebf72e30178f3882ba27a55bcbc475c34a02db46ed037065e986ae24970ab398ba7992fbe1e07f7b45cfb5ddb0379759
DIST swagger-spec-validator-2.7.4.gh.tar.gz 47446 BLAKE2B d284bede24477cfc942d094937cec12224535902383779c223899ab7b359ea45427777ebc8d5f264a76696eae6746b619d35824090ae2f87c6acda4ef040b293 SHA512 d65c060f4730413280a188b01cf62d0f2d77fa04461bb60f2711d1806be2e7b8de16c23d952440a838f57acd50294a16114d34eeee988902fb90c099404c7942
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.3.ebuild
deleted file mode 100644
index 6fdf36710cd3..000000000000
--- a/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.3.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_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="validate Swagger specs against Swagger 1.1 or 2.0 specification"
-HOMEPAGE="https://github.com/Yelp/swagger_spec_validator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-# PyPI tarball lacks unit tests
-RESTRICT="test"
-
-RDEPEND="
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tempora/tempora-5.0.0.ebuild b/dev-python/tempora/tempora-5.0.0.ebuild
index 22103eeb7795..edb4eee6b8fe 100644
--- a/dev-python/tempora/tempora-5.0.0.ebuild
+++ b/dev-python/tempora/tempora-5.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 070c89c268dd..d9f7e01a597b 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,4 +1,5 @@
DIST tifffile-2022.3.16.gh.tar.gz 263653 BLAKE2B fcd30e2fd38a12438332badb17e937ab095a8088f9c878b84166a67c7486f436a76d39832df22362f7a74de5da537602da82c982fb4dc0699fba1603adefdcef SHA512 8069a87b241cbb11b3efa8ff679106f2f11ff9045d790fb1612076a60b87791f30afffb55b57d19b70ab4441935f418ad91fb0956ab572890704023e63dea84a
DIST tifffile-2022.3.25.gh.tar.gz 265082 BLAKE2B dd5f3705cb7203fe943b97a5ed5c000b44abf48ec748f38a1468e27e82bd980e4100dd14af5cfd6af5bdee9d0036c5dce37efca1e515f2eb283c0e221150915a SHA512 dc9018991989ca4b89be6f315aaa45ff2fb94c504dd4c1790af1ec68e05a1da85560f5098df2f460b726cea0d4b0e4fc3f12d493dc1a1db8e2cc35d86f547ddf
DIST tifffile-2022.4.22.gh.tar.gz 280049 BLAKE2B d1d45e7a28c83ca52708aea64c5b7fffdab61405bf9aa2f87d1c3ef347e4057f3081e4f5b6df9de70ad35ec3dd9a17f30a763124338549bda0d93207c59bc7b5 SHA512 75488d9f15c98e8f9824ac4e538f7d2d75dbf06479ea1aee0a7f33bca71be0b3beeb32d3e8a4dcf5e09349ff415faff17d20ce312e43c80209d5c78cf8554c50
+DIST tifffile-2022.4.26.gh.tar.gz 283249 BLAKE2B 740cbee481bac327e63e4d574edc8667a7fab7b53311fcba719a8930ee5827fc8fb4888c881e20453c34635211105447fca12e0d3ce6cfcad5f38efc89c35b09 SHA512 f1e38ae821559c2807c6f299eae43255ec8a164119cb1a5ba2bf80b281b83ba7c629504efa2a2d36ef26edf14577dd7234c1c9bba8168503e4298dafe4fbc743
DIST tifffile-2022.4.8.gh.tar.gz 266725 BLAKE2B 3ac30337c1c7f26e32335a6d7756b4bf2d961f1e96badbc4ca8e9e5ee344513c61900d507f4098e4f5181b2c95134d0a74b646ce611cf9d3d3b5cc644ed70809 SHA512 1d12ca48dcc9fd8de5f3aa28cdd64a7735493b957d174f8ae49cb8a918075e6b50d4034ad9507d3b9ddd8ed1c595ec9fdace0986421b1993371cfe045698d578
diff --git a/dev-python/tifffile/tifffile-2022.4.26.ebuild b/dev-python/tifffile/tifffile-2022.4.26.ebuild
new file mode 100644
index 000000000000..c7b39355f0d6
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.4.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+ https://pypi.org/project/tifffile/
+ https://github.com/cgohlke/tifffile/
+ https://www.lfd.uci.edu/~gohlke/
+"
+SRC_URI="
+ https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/dask[${PYTHON_USEDEP}]
+ >=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/xarray[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # Internet
+ tests/test_tifffile.py::test_class_omexml
+ tests/test_tifffile.py::test_class_omexml_fail
+ tests/test_tifffile.py::test_class_omexml_modulo
+ tests/test_tifffile.py::test_class_omexml_attributes
+ tests/test_tifffile.py::test_class_omexml_multiimage
+ tests/test_tifffile.py::test_write_ome
+ tests/test_tifffile.py::test_write_ome_manual
+ # requires tons of free space
+ tests/test_tifffile.py::test_write_3gb
+ tests/test_tifffile.py::test_write_bigtiff
+ 'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/tomli-w/tomli-w-1.0.0-r1.ebuild b/dev-python/tomli-w/tomli-w-1.0.0-r1.ebuild
index 63451645b910..4827d0b294df 100644
--- a/dev-python/tomli-w/tomli-w-1.0.0-r1.ebuild
+++ b/dev-python/tomli-w/tomli-w-1.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="
test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tomli/tomli-2.0.1.ebuild b/dev-python/tomli/tomli-2.0.1.ebuild
index 84bca45c702b..a3ce67d66ee5 100644
--- a/dev-python/tomli/tomli-2.0.1.ebuild
+++ b/dev-python/tomli/tomli-2.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
BDEPEND="
app-arch/unzip"
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index fa5c897f55c6..7ca14cfd3d49 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1 +1,2 @@
DIST trimesh-3.10.8.gh.tar.gz 10741790 BLAKE2B 2cc8573e01395fb95f192cd64370b32d63b3ebd3505008c67fc9530641060b127ff42b8892634bf61fd91dbc37098e0da9fa169199d257a0345494cf9996a764 SHA512 c5cd6a6abcf8b8e6cc157a76607d4db090c574a86450956577d81fff310448bab140007eefc3b2c2cea6873a1ef46eccb18834c1593aca40f3d7868b3ce3992e
+DIST trimesh-3.11.2.gh.tar.gz 10745738 BLAKE2B 59a13c2133f7cb0ad22ca5b03af9e61c4cc1431e8d058566b854240fe0b1e28229c427c69aa16aec8b79f139a0c2a3c5202ce2f6d4750f813325e591e3a671b2 SHA512 f9b3643c221ab3f112d4c5cf07c8cf23c5809d7c0ea733b6cda0efc973a78fb4ebd8be9cd0f52bb65babeb5a3dc448b15b738f3089fffb8a32c1af1b01dc8da0
diff --git a/dev-python/trimesh/trimesh-3.11.2.ebuild b/dev-python/trimesh/trimesh-3.11.2.ebuild
new file mode 100644
index 000000000000..a3816df1ff09
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.11.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+ https://trimsh.org/
+ https://github.com/mikedh/trimesh/
+ https://pypi.org/project/trimesh/
+"
+# No tests in PyPI tarballs
+SRC_URI="
+ https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/colorlog[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/networkx[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycollada[${PYTHON_USEDEP}]
+ dev-python/pyglet[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/svg-path[${PYTHON_USEDEP}]
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ sci-libs/rtree[${PYTHON_USEDEP}]
+ sci-libs/shapely[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+ optfeature_header "${PN} functionality can be extended by installing the following packages:"
+ optfeature "making GUI applications with 3D stuff" dev-python/glooey
+ optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+ optfeature "loading a number of additional mesh formats" dev-python/meshio
+ optfeature "figuring out how much memory we have" dev-python/psutil
+ optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/trio/trio-0.20.0.ebuild b/dev-python/trio/trio-0.20.0.ebuild
index a544993a08dc..fb5db8abf00e 100644
--- a/dev-python/trio/trio-0.20.0.ebuild
+++ b/dev-python/trio/trio-0.20.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/twine-4.0.0.ebuild b/dev-python/twine/twine-4.0.0.ebuild
index 04cf9838a2d1..89a6e7bd4e54 100644
--- a/dev-python/twine/twine-4.0.0.ebuild
+++ b/dev-python/twine/twine-4.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/typed-ast/typed-ast-1.4.3.ebuild b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
index 7dd5e281797a..8322293c42ca 100644
--- a/dev-python/typed-ast/typed-ast-1.4.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/-/_}"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/typed-ast/typed-ast-1.5.3.ebuild b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
index 8a0f2077cd67..bc287c6d0671 100644
--- a/dev-python/typed-ast/typed-ast-1.5.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/-/_}"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
index 8bd7fbfa6492..e5e6b223289c 100644
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0.ebuild
index 2aa659f49c57..dd182c0c4f68 100644
--- a/dev-python/uri_template/uri_template-1.2.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
python_test() {
"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
diff --git a/dev-python/urllib3/urllib3-1.26.9.ebuild b/dev-python/urllib3/urllib3-1.26.9.ebuild
index 767e94c13881..11ae4683d2ad 100644
--- a/dev-python/urllib3/urllib3-1.26.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/watchdog/watchdog-2.1.7.ebuild b/dev-python/watchdog/watchdog-2.1.7.ebuild
index c7201e2d04e8..d740c18d115f 100644
--- a/dev-python/watchdog/watchdog-2.1.7.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/watchfiles/watchfiles-0.13.ebuild b/dev-python/watchfiles/watchfiles-0.13.ebuild
index aa8f8692c222..7e1c999bee90 100644
--- a/dev-python/watchfiles/watchfiles-0.13.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.13.ebuild
@@ -74,7 +74,7 @@ LICENSE="MIT"
# crates
LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
RDEPEND="
=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index bc4b2f4231e7..ea262ed90e45 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1 +1,2 @@
DIST watchfiles-0.8.1.gh.tar.gz 15405 BLAKE2B ea5d6d59b930f00d6b4b8d6236a38dbb2463866246f1ff4cda828a99a7383fac9c47b131417d8f375a105733c7567f32895759a8dc4503f5671b524977e282ed SHA512 2f611786d267ceae5d6e9094400f5dc6eb59a008f047a511b58b329762e63bbcd83a56cc95cca54c8480b1702c160548baa30549e907e6b85c8bf176ba339fb6
+DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
index a0a9c2f56617..2efec4c90eb0 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/watchgod-0.8.2.ebuild b/dev-python/watchgod/watchgod-0.8.2.ebuild
new file mode 100644
index 000000000000..c40e10b7d38a
--- /dev/null
+++ b/dev-python/watchgod/watchgod-0.8.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=watchfiles-${PV}
+DESCRIPTION="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+ https://pypi.org/project/watchgod/
+ https://github.com/samuelcolvin/watchfiles/
+"
+SRC_URI="
+ https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ =dev-python/anyio-3*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-toolbox[${PYTHON_USEDEP}]
+ dev-python/trio[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # increase timeout
+ sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
+ tests/test_watch.py::test_awatch_log
+ )
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ tests/test_watch.py::test_does_not_exist
+ )
+ epytest
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 9d25ab90f0cd..0d9dbfd332f9 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -2,3 +2,4 @@ DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d2
DIST werkzeug-2.0.3.gh.tar.gz 897523 BLAKE2B 1f97a2f7184e8e11bb85722becae7cc032ada38a642a2f925f7b81e89c881011889189999d50dab4591fc2e874aac4ab92b0f1531c211468cf352e31b0b8c8d0 SHA512 a205cd981b3e1b481436e483190427ff3808a5ea80abc616ca08d899d0e6a39893a5cb60adc65c99dcab3af47c24b321c71996d719cb7f224de7942b44b1fd69
DIST werkzeug-2.1.0.gh.tar.gz 833188 BLAKE2B eed6ddc3acec9a69ca983d440d14693750fc0d09cd1f30f66e27267c266ac5a2c81b21cb8d617e8f6fcfb7426bb427c2dc1cafeec92a238424a005d915dffc4f SHA512 acda1e4037e1d525cbd82ed2310ddf55968d14df6656018b910d7200b51569e88cf58957f94f377deb7fe100db03d30016e9dc91e033a298ad54cb34922be30e
DIST werkzeug-2.1.1.gh.tar.gz 833268 BLAKE2B 28d922f99259b606c431b224222fe6474c68f8a11f9910fe9e4eedbdf30d18a101c25490dee205035ea7b3675e644f619a81cbf493c7d5540c6141ff3840d84a SHA512 992b5b0a95db5266d025e06683b04f932def72c3967b2c9903f718c5f2672cf0abadb247cf77029d99b567c9588f5ae03b6b07d566bfd764c738ede53501ba1b
+DIST werkzeug-2.1.2.gh.tar.gz 833667 BLAKE2B e045f566862bfe0f86185cd10aa26bf94a4fc2f7b23173c6a28c9b55d0f239fbba5c66071fab5df6102717b51a1c1fada872e9d9383b9d3b34ab92ffcfd96e59 SHA512 28c4a794a3dbc8423e59244fbcf192b60b53f378444aaaf60330bdd62cec38a4625033b5d72b55613c8b26053a60153ddcb816331ff28ad3ee03bede74d8b1b3
diff --git a/dev-python/werkzeug/werkzeug-2.1.2.ebuild b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
new file mode 100644
index 000000000000..a67e3c314151
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+ https://palletsprojects.com/p/werkzeug/
+ https://pypi.org/project/Werkzeug/
+ https://github.com/pallets/werkzeug/
+"
+SRC_URI="
+ https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+ dev-python/watchdog[${PYTHON_USEDEP}]
+ !alpha? ( !hppa? ( !ia64? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ ) ) )
+ !hppa? ( !ia64? (
+ $(python_gen_cond_dep '
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ ' 'python*')
+ ) )
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=()
+ if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+ EPYTEST_DESELECT+=(
+ "tests/test_serving.py::test_server[https]"
+ tests/test_serving.py::test_ssl_dev_cert
+ tests/test_serving.py::test_ssl_object
+ )
+ fi
+
+ # the default portage tempdir is too long for AF_UNIX sockets
+ local -x TMPDIR=/tmp
+ epytest -p no:django -p no:httpbin tests
+}
diff --git a/dev-python/wheel/wheel-0.37.1-r1.ebuild b/dev-python/wheel/wheel-0.37.1-r1.ebuild
index 214338dbe121..6f72f7970f36 100644
--- a/dev-python/wheel/wheel-0.37.1-r1.ebuild
+++ b/dev-python/wheel/wheel-0.37.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 91d4a8f4ec1e..239bd2c12efe 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1 +1,2 @@
+DIST wstools-0.4.10.gh.tar.gz 204095 BLAKE2B 8d7652729846e991d84bf3c2b64394bf3954ae69cb1ed49ea7822432b965e5cfabd02f8d4ba7caa0cbf9df57def062b085aae75c5d4af1f9be078e2fd8031e0d SHA512 1acd8e62d71c7d330f1e953a0da1956291c5dfb25ff9b8b8799c83feaa4230e384955735b131bab7b430b92ae6c18498927d416d2d1e11fb5c5dad93417c671a
DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
diff --git a/dev-python/wstools/wstools-0.4.10.ebuild b/dev-python/wstools/wstools-0.4.10.ebuild
new file mode 100644
index 000000000000..ae43a5fb3904
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="
+ https://github.com/pycontribs/wstools/
+ https://pypi.org/project/wstools/
+"
+SRC_URI="
+ https://github.com/pycontribs/wstools/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ >=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}/wstools-0.4.8-fix-py3.10.patch"
+)
+
+src_prepare() {
+ # remove the dep on pytest-runner
+ sed -i -e '/setup_requires/d' setup.py || die
+ # disabling xdist breaks random plugins
+ sed -i -e 's@-p no:xdist@@' pytest.ini || die
+ distutils-r1_src_prepare
+ export PBR_VERSION=${PV}
+}
diff --git a/dev-python/zipp/zipp-3.8.0.ebuild b/dev-python/zipp/zipp-3.8.0.ebuild
index e12ba8698422..80ec34f2b596 100644
--- a/dev-python/zipp/zipp-3.8.0.ebuild
+++ b/dev-python/zipp/zipp-3.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
test? (
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
index 2c7f80f081cb..aea2e49928de 100644
--- a/dev-python/zope-component/zope-component-5.0.1.ebuild
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
RDEPEND="
dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
index 6f7d0cddf0b6..8a77b13c2b81 100644
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
BDEPEND="
test? (
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c9ee01f8451d..ae946c142494 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actioncable/actioncable-5.2.6.2.ebuild b/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/actioncable/actioncable-5.2.6.2.ebuild
rename to dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild
deleted file mode 100644
index ce35cc0e8d46..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.6.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/actioncable/actioncable-6.0.4.6.ebuild
rename to dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
diff --git a/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild b/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild
deleted file mode 100644
index 619cfd216a8b..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activesupport-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.1.4.6.ebuild b/dev-ruby/actioncable/actioncable-6.1.4.6.ebuild
deleted file mode 100644
index 77aae4910664..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.4.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activesupport-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
new file mode 100644
index 000000000000..b5ec3e98161d
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/nio4r:2
+ >=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/railties-4.2.0
+ dev-ruby/test-unit:2
+ >=dev-ruby/mocha-0.14.0:0.14
+ )"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
new file mode 100644
index 000000000000..3243972e894c
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/nio4r:2
+ >=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/railties-4.2.0
+ dev-ruby/test-unit:2
+ >=dev-ruby/mocha-0.14.0:0.14
+ )"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 08955a6158be..b170bee280ca 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,10 +1,9 @@
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild
deleted file mode 100644
index c4b746bc96a1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/actionmailbox/actionmailbox-6.0.4.6.ebuild
rename to dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild
deleted file mode 100644
index 71c67a36d450..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
- dev-ruby/sqlite3
- dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
- -e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.4.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.4.6.ebuild
deleted file mode 100644
index e387f1a6cc26..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.4.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
- dev-ruby/sqlite3
- dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
- -e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
new file mode 100644
index 000000000000..5fabeb5d6ccd
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+ dev-ruby/rexml
+ dev-ruby/sqlite3
+ dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+ -e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
new file mode 100644
index 000000000000..f3818bd389e1
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/mail-2.7.1:*
+ dev-ruby/net-imap
+ dev-ruby/net-pop
+ dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+ dev-ruby/propshaft
+ dev-ruby/rexml
+ dev-ruby/sqlite3
+ dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+ -e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+ -e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.6.2.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/actionmailer/actionmailer-5.2.6.2.ebuild
rename to dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild
deleted file mode 100644
index 5c5d6a444fcc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/actionmailer/actionmailer-6.0.4.6.ebuild
rename to dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild
deleted file mode 100644
index 847ea3753e4b..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.4.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.4.6.ebuild
deleted file mode 100644
index 2b16b080cc19..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.4.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
new file mode 100644
index 000000000000..95aa6013c4aa
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+ dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+ # Avoid a test failing only on attachment ordering, since this is a
+ # security release.
+ sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild
new file mode 100644
index 000000000000..75c786bf6d3e
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+ dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+ # Avoid a test failing only on attachment ordering, since this is a
+ # security release.
+ sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actionpack/actionpack-5.2.6.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.6.2.ebuild
deleted file mode 100644
index f33cf17b7909..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.6.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.2
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.0.2:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-2.15
- ~dev-ruby/activemodel-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- sed -e '1i gem "activemodel", "~> 5.2.0"' \
- -e '1i gem "actionview", "~> 5.2.0"' \
- -e '1i gem "railties", "~> 5.2.0"' \
- -i test/abstract_unit.rb || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
- # Avoid broken tests already fixed upstream
- sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
- sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild b/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
new file mode 100644
index 000000000000..6328b72c5add
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.0.2:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-2.15
+ ~dev-ruby/activemodel-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ sed -e '1i gem "activemodel", "~> 5.2.0"' \
+ -e '1i gem "actionview", "~> 5.2.0"' \
+ -e '1i gem "railties", "~> 5.2.0"' \
+ -e '1i gem "psych", "~> 3.0"' \
+ -i test/abstract_unit.rb || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid broken tests already fixed upstream
+ sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
+ sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild
deleted file mode 100644
index ac4da8e160c5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.2
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-3.35.0
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
- # Avoid tests that depend on an old dependency
- rm -f test/dispatch/system_testing/driver_test.rb
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.6.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.6.ebuild
deleted file mode 100644
index 53d984e57fff..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.2
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-3.35.0
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
- # Avoid tests that depend on an old dependency
- rm -f test/dispatch/system_testing/driver_test.rb
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
new file mode 100644
index 000000000000..eec7005b2c02
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-3.35.0
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid tests that depend on an old dependency
+ rm -f test/dispatch/system_testing/driver_test.rb
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild b/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild
deleted file mode 100644
index e5771567378e..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.2
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-2.15
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
- # Avoid tests depending on an unreleased version of selenium-webdriver
- sed -i -e '/define extra capabilities/,/^ end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.4.6.ebuild b/dev-ruby/actionpack/actionpack-6.1.4.6.ebuild
deleted file mode 100644
index f1c324e78586..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.4.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.2
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-2.15
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
- # Avoid tests depending on an unreleased version of selenium-webdriver
- sed -i -e '/define extra capabilities/,/^ end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
new file mode 100644
index 000000000000..8a43d94f6c01
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-2.15
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid tests depending on an unreleased version of selenium-webdriver
+ sed -i -e '/define extra capabilities/,/^ end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
new file mode 100644
index 000000000000..f920a8e063fe
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-2.15
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ dev-ruby/selenium-webdriver:4
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid tests depending on an unreleased version of selenium-webdriver
+ sed -i -e '/define extra capabilities/,/^ end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 08955a6158be..b170bee280ca 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,10 +1,9 @@
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild
deleted file mode 100644
index 6578fa8e6b1a..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.6.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/actiontext/actiontext-6.0.4.6.ebuild
rename to dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
diff --git a/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild b/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild
deleted file mode 100644
index 2f8569204837..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.4.6.ebuild b/dev-ruby/actiontext/actiontext-6.1.4.6.ebuild
deleted file mode 100644
index b644b504cc65..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.4.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/bundler
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
new file mode 100644
index 000000000000..e0c1fe100689
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
new file mode 100644
index 000000000000..8c0fa471c2ba
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/globalid-0.6.0
+ >=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+ dev-ruby/propshaft
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+ -e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/actionview/actionview-5.2.6.2.ebuild b/dev-ruby/actionview/actionview-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/actionview/actionview-5.2.6.2.ebuild
rename to dev-ruby/actionview/actionview-5.2.7.1.ebuild
diff --git a/dev-ruby/actionview/actionview-6.0.4.3.ebuild b/dev-ruby/actionview/actionview-6.0.4.3.ebuild
deleted file mode 100644
index 8e0441011e0a..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/railties-${PV}
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.6.ebuild b/dev-ruby/actionview/actionview-6.0.4.6.ebuild
deleted file mode 100644
index 0de79afe0968..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/railties-${PV}
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.8.ebuild b/dev-ruby/actionview/actionview-6.0.4.8.ebuild
new file mode 100644
index 000000000000..0021524ea0b6
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.4.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+ >=dev-ruby/erubi-1.4:0
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/railties-${PV}
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid tests failing due to missing logger setup in activerecord,
+ # most likely related to test environment setup.
+ #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+ # Fix loading of activerecord integration tests. This avoids loading
+ # activerecord twice and thus redefining constants leading to
+ # failures. Bug #719342
+ sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+ -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+ -i test/active_record_unit.rb || die
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-6.1.4.4.ebuild b/dev-ruby/actionview/actionview-6.1.4.4.ebuild
deleted file mode 100644
index bdb512619eb3..000000000000
--- a/dev-ruby/actionview/actionview-6.1.4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/railties-${PV}
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.4.6.ebuild b/dev-ruby/actionview/actionview-6.1.4.6.ebuild
deleted file mode 100644
index 85b9d4b84d88..000000000000
--- a/dev-ruby/actionview/actionview-6.1.4.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/railties-${PV}
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.5.1.ebuild b/dev-ruby/actionview/actionview-6.1.5.1.ebuild
new file mode 100644
index 000000000000..7beb67cb12f0
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.5.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+ >=dev-ruby/erubi-1.4:0
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/railties-${PV}
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
+
+ # Fix loading of activerecord integration tests. This avoids loading
+ # activerecord twice and thus redefining constants leading to
+ # failures. Bug #719342
+ sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+ -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+ -i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.0.2.4.ebuild b/dev-ruby/actionview/actionview-7.0.2.4.ebuild
new file mode 100644
index 000000000000..c700736654d7
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.0.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+ >=dev-ruby/erubi-1.4:0
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/railties-${PV}
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid tests failing due to missing logger setup in activerecord,
+ # most likely related to test environment setup.
+ #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+ # Fix loading of activerecord integration tests. This avoids loading
+ # activerecord twice and thus redefining constants leading to
+ # failures. Bug #719342
+ sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+ -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+ -i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/activejob/activejob-5.2.6.2.ebuild b/dev-ruby/activejob/activejob-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/activejob/activejob-5.2.6.2.ebuild
rename to dev-ruby/activejob/activejob-5.2.7.1.ebuild
diff --git a/dev-ruby/activejob/activejob-6.0.4.3.ebuild b/dev-ruby/activejob/activejob-6.0.4.3.ebuild
deleted file mode 100644
index 095ae13c2e50..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
- sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.6.ebuild b/dev-ruby/activejob/activejob-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/activejob/activejob-6.0.4.6.ebuild
rename to dev-ruby/activejob/activejob-6.0.4.8.ebuild
diff --git a/dev-ruby/activejob/activejob-6.1.4.4.ebuild b/dev-ruby/activejob/activejob-6.1.4.4.ebuild
deleted file mode 100644
index ba8c187622d6..000000000000
--- a/dev-ruby/activejob/activejob-6.1.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.4.6.ebuild b/dev-ruby/activejob/activejob-6.1.4.6.ebuild
deleted file mode 100644
index a0adaa549825..000000000000
--- a/dev-ruby/activejob/activejob-6.1.4.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.5.1.ebuild b/dev-ruby/activejob/activejob-6.1.5.1.ebuild
new file mode 100644
index 000000000000..ca98657bca3d
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
+
+ # Remove all currently unpackaged queues.
+ sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+ -e 's/delayed_job//' Rakefile || die
+ sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activejob/activejob-7.0.2.4.ebuild b/dev-ruby/activejob/activejob-7.0.2.4.ebuild
new file mode 100644
index 000000000000..4702b811fda4
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.0.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+ # Remove all currently unpackaged queues.
+ sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+ -e 's/delayed_job//' Rakefile || die
+ sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+ rm -f test/cases/delayed_job_adapter_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild b/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild
deleted file mode 100644
index e31ee2cc02d0..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
- sed -i -e '2igem "railties", "~> 5.2.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
new file mode 100644
index 000000000000..36dfba0c1e2f
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+ sed -i -e '2igem "railties", "~> 5.2.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
+}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild
deleted file mode 100644
index 922d14dbfa67..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.3.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
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild
deleted file mode 100644
index c8e9826d1f05..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
new file mode 100644
index 000000000000..4e43fc718e2d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild b/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
deleted file mode 100644
index f41ffdd4078a..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild
deleted file mode 100644
index 621481c37e88..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
new file mode 100644
index 000000000000..72f40d438434
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
new file mode 100644
index 000000000000..ffe12032f8e3
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild b/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild
deleted file mode 100644
index 413d3876552b..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- dev-ruby/arel:9.0
- sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
- mysql? ( dev-ruby/mysql2:0.5 )
- postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionmailer-${PV}
- >=dev-ruby/sqlite3-1.3.6
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' \
- ../Gemfile || die
-
- sed -e '3i gem "activesupport", "~> 5.2.0"' \
- -e '3i gem "activerecord", "~> 5.2.0"' \
- -e '3i gem "activemodel", "~> 5.2.0"' \
- -i test/cases/helper.rb || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single test using mysql dependencies.
- rm test/cases/invalid_connection_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failures due to sqlite explain changes
- rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
new file mode 100644
index 000000000000..42a1a3c55ec4
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ dev-ruby/arel:9.0
+ sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( >=dev-ruby/pg-0.18.0:* )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actionmailer-${PV}
+ >=dev-ruby/sqlite3-1.3.6
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' \
+ ../Gemfile || die
+
+ sed -e '3i gem "activesupport", "~> 5.2.0"' \
+ -e '3i gem "activerecord", "~> 5.2.0"' \
+ -e '3i gem "activemodel", "~> 5.2.0"' \
+ -e '3i gem "psych", "~> 3.0"' \
+ -i test/cases/helper.rb || die
+
+ # Avoid test depending on mysql adapter which we don't support for
+ # this Rails version to simplify our dependencies.
+ rm test/cases/connection_specification/resolver_test.rb || die
+
+ # Avoid single test using mysql dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failures due to sqlite explain changes
+ rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
deleted file mode 100644
index 8c20ff15ef51..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( dev-ruby/mysql2:0.5 )
- postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.4.0
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild
deleted file mode 100644
index 80126b2ba24a..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( dev-ruby/mysql2:0.5 )
- postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.4.0
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
- # Avoid test failing due to sqlite EXPLAIN changes
- rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
new file mode 100644
index 000000000000..dea3e73927bc
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ sqlite? ( >=dev-ruby/sqlite3-1.4 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( dev-ruby/pg:1 )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ >=dev-ruby/sqlite3-1.4.0
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' ../Gemfile || die
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
+
+ # Avoid test depending on mysql adapter which we don't support for
+ # this Rails version to simplify our dependencies.
+ rm test/cases/connection_specification/resolver_test.rb || die
+
+ # Avoid single tests using mysql or postgres dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+ sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+ -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failing related to rubygems
+ sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+
+ # Avoid test failing due to sqlite EXPLAIN changes
+ rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild b/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
deleted file mode 100644
index ba0d4e0cb302..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( dev-ruby/mysql2:0.5 )
- postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.4.0
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
- sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild
deleted file mode 100644
index 0f50c140b541..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( dev-ruby/mysql2:0.5 )
- postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.4.0
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
- sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- # Load correct rails version
- sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' test/cases/helper.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid tests that no longer work with newer sqlite versions
- rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
new file mode 100644
index 000000000000..e6bb299bcd8d
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ sqlite? ( >=dev-ruby/sqlite3-1.4 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ >=dev-ruby/sqlite3-1.4.0
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+ sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' ../Gemfile || die
+
+ # Load correct rails version
+ sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' test/cases/helper.rb || die
+
+ # Avoid single tests using mysql or postgres dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+ sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+ -i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid tests that no longer work with newer sqlite versions
+ rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+ sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failing related to rubygems
+ sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
new file mode 100644
index 000000000000..f59c119d4b8c
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ sqlite? ( >=dev-ruby/sqlite3-1.4 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/benchmark-ips
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ >=dev-ruby/sqlite3-1.4.0
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+ sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' ../Gemfile || die
+
+ # Avoid single tests using mysql or postgres dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+ sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+ -i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failing related to rubygems
+ sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/activestorage/activestorage-5.2.6.2.ebuild b/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/activestorage/activestorage-5.2.6.2.ebuild
rename to dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild
deleted file mode 100644
index 4f45ca8b516b..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/:job/,/end/ s:^:#:' \
- -e '/:test/,/^end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Skip test that has already been updated in later versions upstream
- sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.6.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/activestorage/activestorage-6.0.4.6.ebuild
rename to dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
diff --git a/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild b/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild
deleted file mode 100644
index 97d4734e1c15..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activejob-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- ~dev-ruby/activesupport-${PV}:*
- dev-ruby/marcel:1.0
- >=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.4.6.ebuild b/dev-ruby/activestorage/activestorage-6.1.4.6.ebuild
deleted file mode 100644
index c613c84ed18d..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.4.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activejob-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- ~dev-ruby/activesupport-${PV}:*
- dev-ruby/marcel:1.0
- >=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
- -i ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
new file mode 100644
index 000000000000..102dbabfb7ed
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activejob-${PV}:*
+ ~dev-ruby/activerecord-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/marcel:1.0
+ >=dev-ruby/mini_mime-1.1.0
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/image_processing-1.2:0
+ dev-ruby/test-unit:2
+ dev-ruby/mini_magick
+ dev-ruby/mocha
+ dev-ruby/rake
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+ -e '/dalli/ s/2.7.7/2.7.9/' \
+ -e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
new file mode 100644
index 000000000000..cdac79348cac
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activejob-${PV}:*
+ ~dev-ruby/activerecord-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/marcel:1.0
+ >=dev-ruby/mini_mime-1.1.0
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/image_processing-1.2:0
+ >=dev-ruby/minitest-5.15.0:5
+ dev-ruby/mini_magick
+ dev-ruby/mocha
+ dev-ruby/rake
+ dev-ruby/sprockets-rails
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
+ -e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+ -e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Use mini_magick since vips is not packaged on Gentoo
+ sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
+ # Avoid vips-specific tests
+ sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/activesupport/activesupport-5.2.6.2.ebuild b/dev-ruby/activesupport/activesupport-5.2.6.2.ebuild
deleted file mode 100644
index 840a994edda8..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.6.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild b/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
new file mode 100644
index 000000000000..388b98e624c0
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ dev-ruby/i18n:1
+ >=dev-ruby/tzinfo-1.1:1
+ >=dev-ruby/minitest-5.1:5"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-2.2.1
+ >=dev-ruby/nokogiri-1.4.5
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.0.5:3
+ dev-ruby/rack
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild
deleted file mode 100644
index 2172557e84f9..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.6.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.6.ebuild
deleted file mode 100644
index 50fc1ff5c4cb..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
new file mode 100644
index 000000000000..42d7b05695d0
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ dev-ruby/i18n:1
+ >=dev-ruby/tzinfo-1.1:1
+ >=dev-ruby/minitest-5.1:5
+ >=dev-ruby/zeitwerk-2.2:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-2.2.1
+ >=dev-ruby/nokogiri-1.4.5
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.0.5:3
+ dev-ruby/rack
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild b/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild
deleted file mode 100644
index c6f8f6598edb..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- >=dev-ruby/i18n-1.6:1
- dev-ruby/tzinfo:2
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- dev-ruby/connection_pool
- >=dev-ruby/nokogiri-1.8.1
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.3:3
- dev-ruby/rack
- dev-ruby/rexml
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
- -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
-# sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.4.6.ebuild b/dev-ruby/activesupport/activesupport-6.1.4.6.ebuild
deleted file mode 100644
index cfa49feb955e..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.4.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- >=dev-ruby/i18n-1.6:1
- dev-ruby/tzinfo:2
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- dev-ruby/connection_pool
- >=dev-ruby/nokogiri-1.8.1
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.3:3
- dev-ruby/rack
- dev-ruby/rexml
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
- -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
-# sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
new file mode 100644
index 000000000000..af3f42e0b0bc
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ >=dev-ruby/i18n-1.6:1
+ dev-ruby/tzinfo:2
+ >=dev-ruby/minitest-5.1:5
+ >=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-2.2.1
+ dev-ruby/connection_pool
+ >=dev-ruby/nokogiri-1.8.1
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.3:3
+ dev-ruby/rack
+ dev-ruby/rexml
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
+ -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+# sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
index e5022b82fb44..af3f42e0b0bc 100644
--- a/dev-ruby/activesupport/activesupport-6.1.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
index 578da2a557be..0a0ffb05e4cc 100644
--- a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
new file mode 100644
index 000000000000..0a0ffb05e4cc
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ >=dev-ruby/i18n-1.6:1
+ dev-ruby/tzinfo:2
+ >=dev-ruby/minitest-5.1:5
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-3.0.1
+ dev-ruby/connection_pool
+ >=dev-ruby/nokogiri-1.8.1
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.3:3
+ dev-ruby/rack
+ dev-ruby/rexml
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
+ -e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+ -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/addressable/addressable-2.8.0.ebuild b/dev-ruby/addressable/addressable-2.8.0.ebuild
index 7ecdc7778419..3efb3f9964f3 100644
--- a/dev-ruby/addressable/addressable-2.8.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
diff --git a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
index 01d2565aa336..b00b7bb450c4 100644
--- a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
index e6769e50526d..7299a8a33ad5 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://rubygems.org/gems/blankslate"
IUSE=""
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
all_ruby_prepare() {
# Avoid test failing with rspec 2.x.
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
index 7b1cd5ca9557..923e70130a70 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz ->
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="test"
RUBY_S="${PN}-${COMMIT_ID}"
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
index 4e6cb7eb5ab8..da62092ea524 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
index 96c12330dc93..7b7c8267d620 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/mperham/connection_pool"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
index ad34d2ef45ba..ceb3834dd8c9 100644
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/dalli/dalli-3.2.1.ebuild b/dev-ruby/dalli/dalli-3.2.1.ebuild
index cef16dff0e59..5e81e1c95fd8 100644
--- a/dev-ruby/dalli/dalli-3.2.1.ebuild
+++ b/dev-ruby/dalli/dalli-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
IUSE=""
DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index dcc7ab1c61ba..ebdf1437cf9a 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
index 74f94884b3af..d1a2dd2adadf 100644
--- a/dev-ruby/ffi/ffi-1.15.5.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
IUSE=""
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND+=" dev-libs/libffi:="
DEPEND+=" dev-libs/libffi:="
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index e2e7858320e6..9cc8470a3269 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,5 +1,2 @@
-DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-DIST globalid-0.5.1.tar.gz 18978 BLAKE2B bf13df8d8a5ce21f85c5bec3c5d0b690ceea94a51b0fbfe9bcb7dd9fe55d8abf2c5a36589147a72b6a68d1263afa130a2acff7fbe0075599e6a67fc416ac20a9 SHA512 998478876781b70cadb6c6ce0624443033f6e29ce9cb7ce145f5e3f288b7998267c63aa1b43ce0d3f7c5fc378d7e148ee11b9d88b63665fa951efb1cc72ad93e
-DIST globalid-0.5.2.tar.gz 19137 BLAKE2B 8e01b965b396aa04149f83b30066ae99a50970fb2de97c99e09c422f4ccd59325bd7697de6a0873d3876cee9e1ead7ff0715233eaa3abf03b10cc1ed7168e4af SHA512 4954b9f558048eb143d4a9d1b041dc438f5852779340e11d93840e540f1c030714da2412e9eb2777d3eaafc887cc94c43ffabdc0060cc809a033e7e6352fb4a6
DIST globalid-0.6.0.tar.gz 20908 BLAKE2B 764d25ffb216ad73098c86aaa0ebbef412e6e97ff36beb0ad780e2613e41ed1404b1c93c27332cb3f85d29c774f243bf77caa44c179433057e92320acb8bf838 SHA512 5adc8035a10942318825c348dde8cc988255962b00d96df0f1aa7eebfa316e2637a7f5c79af559661c02837b0690e5e9c4a8cc3f4ee58ac75a6b180397485e0f
DIST globalid-1.0.0.tar.gz 20916 BLAKE2B 4e932269cce13d319bb44ee8da878fd94d95a82badf67a8f3aa7f5c2064a401e9aaa743cbd763305de65dea242c4e8316c742a8c24e3f1a06b30a799578372f1 SHA512 228c672aa2934a726677e11a90124767f302910791153b68024aa8b44921f2ed1444903ac592c46240f19c9dae25c170405ac2a21fc269c573b066d4cd34b04d
diff --git a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch b/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
deleted file mode 100644
index 7cd1c627daf2..000000000000
--- a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1aec708b98d8657ef241d02813960e8af8ebd952 Mon Sep 17 00:00:00 2001
-From: Eugene Kenny
-Date: Sun, 26 Apr 2020 17:35:41 +0100
-Subject: [PATCH] Require time core extension for 1.year
-
-Since 39ab83a43a64b339739c6e8c7ab24bb1325204ed this file uses `1.year`
-without requiring the Active Support core extension that defines it.
----
- lib/global_id/railtie.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/global_id/railtie.rb b/lib/global_id/railtie.rb
-index edc90d8..096c20b 100644
---- a/lib/global_id/railtie.rb
-+++ b/lib/global_id/railtie.rb
-@@ -5,6 +5,7 @@
- require 'global_id'
- require 'active_support'
- require 'active_support/core_ext/string/inflections'
-+require 'active_support/core_ext/integer/time'
-
- class GlobalID
- # = GlobalID Railtie
diff --git a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
deleted file mode 100644
index 556a7328ac76..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-integer-time.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
- rm -f Gemfile.lock || die
-
- sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-0.5.1.ebuild b/dev-ruby/globalid/globalid-0.5.1.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
- rm -f Gemfile.lock || die
-
- sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-0.5.2.ebuild b/dev-ruby/globalid/globalid-0.5.2.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
- rm -f Gemfile.lock || die
-
- sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
index 17c165a2b331..c685e133c73d 100644
--- a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
+++ b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
index 7aa3f9dd4494..1a982f64b21d 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
index 59e73b3c8893..10f24aec7838 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/sparklemotion/http-cookie"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
index 02735b703690..aca18120372a 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/i18n/i18n-1.10.0.ebuild b/dev-ruby/i18n/i18n-1.10.0.ebuild
index 068a9b8b2368..9d9b20d46e46 100644
--- a/dev-ruby/i18n/i18n-1.10.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
index 1d86cd5f578d..9d2d02b18b6d 100644
--- a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/kramdown/kramdown-2.3.2.ebuild b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
index c54e4a8f1d41..d6208fd4678a 100644
--- a/dev-ruby/kramdown/kramdown-2.3.2.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kramdown.gettalong.org/"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
IUSE="latex"
LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
diff --git a/dev-ruby/listen/listen-3.7.1.ebuild b/dev-ruby/listen/listen-3.7.1.ebuild
index 51354f670a70..197291eb53d7 100644
--- a/dev-ruby/listen/listen-3.7.1.ebuild
+++ b/dev-ruby/listen/listen-3.7.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
# Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
index a0cabf56bc89..f5687ce1e7e2 100644
--- a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="highlight test"
ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
index f426efc3f79b..4d13ce281c09 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 12e14be77449..8b186f5d4907 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,4 +15,4 @@ IUSE=""
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
index 8f246b00ff9a..90a4f5d4c728 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/mime-types/mime-types-2.99.3.ebuild b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
index 951d9ca4509f..95fcf9162b30 100644
--- a/dev-ruby/mime-types/mime-types-2.99.3.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
LICENSE="MIT Artistic GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/mime-types/mime-types-3.4.1.ebuild b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
index bb89a8724c19..17b3349718af 100644
--- a/dev-ruby/mime-types/mime-types-3.4.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
index 0f487e76c3ec..b8e9915d0b46 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
index a89099b526a8..a25a05bd6946 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index bf4c2f18502e..7d7211c354a8 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 6c87e7aa1a51..a2422721a0a1 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
index a28b6f30328d..818d07782b26 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
each_ruby_test() {
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
index dde5ef977c2c..02400cea194b 100644
--- a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
LICENSE="MIT"
SLOT="0.14"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
index d95ad4cf3f1f..eb549c40a41f 100644
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
index f81917340b73..57e334d3f8b6 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extremely mynymal test framework"
HOMEPAGE="https://github.com/mynyml/nanotest"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
index c16fa9c3a1cf..7091a701d5b4 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calculate the differences between two XML/HTML documents"
HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/open4/open4-1.3.4-r1.ebuild b/dev-ruby/open4/open4-1.3.4-r1.ebuild
index 7dac8efca189..ffd5d310e28d 100644
--- a/dev-ruby/open4/open4-1.3.4-r1.ebuild
+++ b/dev-ruby/open4/open4-1.3.4-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
index e9bde838ad48..6fc6d370faeb 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
HOMEPAGE="https://github.com/rcairo/pkg-config"
LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
SLOT="0"
IUSE="test"
diff --git a/dev-ruby/pry/pry-0.14.1.ebuild b/dev-ruby/pry/pry-0.14.1.ebuild
index 2b8ea409e63c..d9c8a0b35d3d 100644
--- a/dev-ruby/pry/pry-0.14.1.ebuild
+++ b/dev-ruby/pry/pry-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
SLOT="ruby19"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
ruby_add_rdepend "
>=dev-ruby/coderay-1.1:0
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
index 895513d49c29..6e5e7ae7e961 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
IUSE=""
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
index cf9a1b081a02..4b2f4a17bf90 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
IUSE=""
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index 7e7da1710ca1..72c0528cc4dd 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index b27b5f91faf6..70139b2b2df2 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.gem 6656 BLAKE2B 0dc3dd914c1f1e011a01d466d74cf356ed6e65be62559672688881b0a2b624218437bedc6e1da903751d065f1ae19bd74819d88371c1a87ef3ed40749d75ef63 SHA512 ff0e4e3f2e0d655341fa17efb724a895292377dd3f3ccdc684674d9bdaeb908c5a8458cb8133df80d6d4db2a422a5e48d61aa187ea4824fb996907190893d094
DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
+DIST rails-5.2.7.1.gem 6656 BLAKE2B 0c7da4951ac22518ede6f502bef9c7a13925c27792a97d00e9fecbb1186732e7fc728db6f8c4155a4842c32ece7a9927540e047c3f009828eb8ca3107b29dc3c SHA512 a251d8086c850e04b9e686cc9a7532872c3d81d28ed675c163c9a6bd1a8deae9474512b53216415937b2422d5461cd66220edf8225860a49bc6546923fb0da38
DIST rails-5.2.7.gem 6656 BLAKE2B 40f06a155497cf5357e38b0390ca75f790dfff4a15966981c8f8dd937d182915b68bca1d6b581f09bb6df8133e931f5fd63df835d8bd4db993f17607e653fa02 SHA512 07ec5fb36d16134e029712f958c80a59f381ddee3ecb3a7ffe3cb50097dd11cd87ac1f29825f5f748092568e7756ee42b75fd0ba7b5c83e40faba54e7bc1ce01
DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
-DIST rails-6.0.4.3.gem 6656 BLAKE2B cbe3062a6d7042955757fd58686d2de4d26a1b1023dbd48606247bb2ba189d50808c43f84e2dc198c06e6a5b5fe1c93ec8d9c13bb90ca157d55f2b4c97cc4a16 SHA512 8e0168b1b86a4884130d55f592b88a52c0644b607533f1e5b46f4713132b5f72618aa1f1f0107cd5e22fa9dd2ed0a6cd3f36cb9a947790548e8e4025f507e475
DIST rails-6.0.4.4.gem 6656 BLAKE2B 5a86f542a1030653fdb8d9ac994199b32ce4ab19e62c04e6c11bf66ecdf870654a31b312a3b75b8ac1df7b5f6dea7e423873f8f79030dbc7777d369c3c88eb86 SHA512 369a49d6c8371f7216f030ef9a69679bb3676267b4ecb524f8bf06e89f03a28dd0ab981c4cc9498f002bb95874b3661aa3ec923c64c30cc521a77d33352b57a9
-DIST rails-6.0.4.6.gem 6656 BLAKE2B bd091cf2e9a85438fefddb8d86e481dd519c45d9cf4a5567a75c318a6c14177e561b361ab35ec3fc41b8f2af99d0d74a4e5a505141d79c168721f21eea4ae9c2 SHA512 6361436cd5b697f4765182c942cde965cf44319b023a3cc04a8ee195cf2b4643e90d15febd9a497bd2716aa727ff0513a5530f54b93a151fe010e3828d6bbdf6
DIST rails-6.0.4.7.gem 6656 BLAKE2B 69c921093a9b0fdd13fa50afacf36bd6ac9230c5aee83b30864b1a9d3754699f6cbb7c89c6d38de475371c1608e398f12144b9649b3eae2ef3cfecdbf3c21cf0 SHA512 6b88dc394ec180053feddd4e8b3eb83152ae2af5418c8a9ba5cc53739320689157dcd2f63333ab44206c035a1fa249cd008f9545d579e73d18423653501af7d0
-DIST rails-6.1.4.4.gem 6656 BLAKE2B 13e90724226d4e125c1dba361ff31fa15e1d268417266e5f843c81fab91634a036140b5e45c1925c6f2b1cba63f06fffb8069dc9457eacb05cd5a932ae983fb9 SHA512 4c7086277c9882c6797a877c37d1e920035d772008413ecfa1b2570bd5b7f62081347bbadca10dbac747a6b1380463ac72d16b09698e7217064c39ca84683741
-DIST rails-6.1.4.6.gem 6656 BLAKE2B bebf4ae87ec8617fd4aaf480fd7a274a285bc5ab6928b957333b8e49d19364f77a006838767f2f608a316be7d2a443dafae8e22e9ef48afbc98b9b8fb5cedc08 SHA512 11057f84ab3138c2e3b69cc8a7e9193be2449d71863474cf2bfdd7ab34eb5e38bd6f8f132377efa62b60e825d8a4d591b2a267323363ad5fce5d83f08e22a24c
+DIST rails-6.0.4.8.gem 6656 BLAKE2B b4a755b32538a52d00a5e51729382c32c553eb5104c842b359c9ea069f630b1f6656375c32348c893696e63317f42db2c8efdf28ed20e7d33b3f7dacd63b3d2f SHA512 46cc2868a11f8407a63bdbeafdc4fb550b7d447d9c529dea8cca8da0b4f9848c1b4bcd8dd80999be22d86e05da8cadb6d5e7bdc4351f0f7458b3f6014d9f7689
+DIST rails-6.1.5.1.gem 6656 BLAKE2B 1f050c2c98bafdfe4c70c8581488336efb81e7a93bd86a2a996a6342aa6643e7360eb00d6455939d9412dd5bda3b3cd6770d14b66cb2f00812be4eb950a968aa SHA512 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
DIST rails-6.1.5.gem 6656 BLAKE2B 23cf302daac889afc51fd9a3619cb229843adc91e8b1ff79531758e1d58ed009baa6fb86f04b124146475c7030754365d88b37aea1333cc002a8162182f4c3dc SHA512 f7cf72733a8662a750f3fa3d5fe00209db24109d029b7743e8f73833db5c63cb5a59a99c5711997e543f79c0ffb802f7a84a165d7ab7ea93afff9a564eecaa48
DIST rails-7.0.2.2.gem 6656 BLAKE2B 03d726703ed8c9403326b779a84ff8af171636e686a81a92c064156fd014f00f681cca844b5eeb696c6343bf83e72b9d7e2c43237c3d7639e4dd960140b3337f SHA512 475562e77a702eef88b9300a682db04be6f2a6c6beeaab737d41cdc326f80276efc0283e8ef7c2edaedad1d21ea38098af2c5b1f944bfa6be934edb00fc56df5
DIST rails-7.0.2.3.gem 6656 BLAKE2B 84e016d03df001149f16524dcb5e8372a7e7548eb4b8fd1419d3ec44b39809fcbc26d704c95e5934bcc6c49d57c37114d5a1f16fd93fa929956685ce5caa8dd2 SHA512 8a9cd26ad1ac42928ac9ae9d00579e29f9559aff6dd44f57eb7fbefc06ad4aed320b946aa448c0cdfacd6afc8fbc78cacef031c8d0ca6b657c9a07af359943df
+DIST rails-7.0.2.4.gem 6656 BLAKE2B fb38071f7968361cf08e3332b536e3abdd0ad9730374c19b8322d3c9d688b777c5ccf92d1312336f9cfdcf7765894c44247b5073466dfd073319aef951162ae6 SHA512 18c77aa5ee62b31b0e44a65cbdf99b64b40634ecde72b22601912ce24d7ad0bcf364ef5f8e69fb974802b4e5c1027dfd61664ba5eb8e196f53d4b244eaba5210
diff --git a/dev-ruby/rails/rails-5.2.6.2.ebuild b/dev-ruby/rails/rails-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/rails/rails-5.2.6.2.ebuild
rename to dev-ruby/rails/rails-5.2.7.1.ebuild
diff --git a/dev-ruby/rails/rails-6.0.4.3.ebuild b/dev-ruby/rails/rails-6.0.4.3.ebuild
deleted file mode 100644
index 045971c6e442..000000000000
--- a/dev-ruby/rails/rails-6.0.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.3:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.6.ebuild b/dev-ruby/rails/rails-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/rails/rails-6.0.4.6.ebuild
rename to dev-ruby/rails/rails-6.0.4.8.ebuild
diff --git a/dev-ruby/rails/rails-6.1.4.4.ebuild b/dev-ruby/rails/rails-6.1.4.4.ebuild
deleted file mode 100644
index 7cd0e97185ec..000000000000
--- a/dev-ruby/rails/rails-6.1.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.15.0:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.4.6.ebuild b/dev-ruby/rails/rails-6.1.4.6.ebuild
deleted file mode 100644
index 27b1d5ff015a..000000000000
--- a/dev-ruby/rails/rails-6.1.4.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.15.0:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.5.1.ebuild b/dev-ruby/rails/rails-6.1.5.1.ebuild
new file mode 100644
index 000000000000..5330bc6f88eb
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+ ~dev-ruby/actioncable-${PV}
+ ~dev-ruby/actionmailbox-${PV}
+ ~dev-ruby/actionmailer-${PV}
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actiontext-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/bundler-1.15.0:*
+ >=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/rails/rails-7.0.2.4.ebuild b/dev-ruby/rails/rails-7.0.2.4.ebuild
new file mode 100644
index 000000000000..b9ff7fecd2b5
--- /dev/null
+++ b/dev-ruby/rails/rails-7.0.2.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+ ~dev-ruby/actioncable-${PV}
+ ~dev-ruby/actionmailbox-${PV}
+ ~dev-ruby/actionmailer-${PV}
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actiontext-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/bundler-1.15.0:*
+ >=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index b4927870c08e..37df039398ca 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,13 +1,12 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
diff --git a/dev-ruby/railties/railties-5.2.6.2.ebuild b/dev-ruby/railties/railties-5.2.7.1.ebuild
similarity index 100%
rename from dev-ruby/railties/railties-5.2.6.2.ebuild
rename to dev-ruby/railties/railties-5.2.7.1.ebuild
diff --git a/dev-ruby/railties/railties-6.0.4.3.ebuild b/dev-ruby/railties/railties-6.0.4.3.ebuild
deleted file mode 100644
index a9385fe2d7c5..000000000000
--- a/dev-ruby/railties/railties-6.0.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- dev-ruby/thor:1
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.4.6.ebuild b/dev-ruby/railties/railties-6.0.4.8.ebuild
similarity index 100%
rename from dev-ruby/railties/railties-6.0.4.6.ebuild
rename to dev-ruby/railties/railties-6.0.4.8.ebuild
diff --git a/dev-ruby/railties/railties-6.1.4.4.ebuild b/dev-ruby/railties/railties-6.1.4.4.ebuild
deleted file mode 100644
index 32dd8c456b56..000000000000
--- a/dev-ruby/railties/railties-6.1.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- dev-ruby/thor:1
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.4.6.ebuild b/dev-ruby/railties/railties-6.1.4.6.ebuild
deleted file mode 100644
index a36038e9bbe8..000000000000
--- a/dev-ruby/railties/railties-6.1.4.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- dev-ruby/thor:1
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.5.1.ebuild b/dev-ruby/railties/railties-6.1.5.1.ebuild
new file mode 100644
index 000000000000..cae1535049d0
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.5.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionpack-${PV}
+ dev-ruby/thor:1
+ >=dev-ruby/rake-0.8.7
+ dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/mocha:0.14
+ )"
+
+all_ruby_prepare() {
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+ sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+ elog "To select between slots of rails, use:"
+ elog "\teselect rails"
+
+ eselect rails update
+}
+
+pkg_postrm() {
+ eselect rails update
+}
diff --git a/dev-ruby/railties/railties-7.0.2.4.ebuild b/dev-ruby/railties/railties-7.0.2.4.ebuild
new file mode 100644
index 000000000000..d49f8cb3826e
--- /dev/null
+++ b/dev-ruby/railties/railties-7.0.2.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionpack-${PV}
+ dev-ruby/thor:1
+ >=dev-ruby/rake-12.2
+ dev-ruby/method_source
+ >=dev-ruby/zeitwerk-2.5:2
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/mocha:0.14
+ )"
+
+all_ruby_prepare() {
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+ sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+ elog "To select between slots of rails, use:"
+ elog "\teselect rails"
+
+ eselect rails update
+}
+
+pkg_postrm() {
+ eselect rails update
+}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index 22087f9dcd20..9842e58050d2 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
index a47d25ece867..df2316ab35f4 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
index ee35650b4c1a..56f0828759b1 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index b379c5bd5ba6..25bab88a4a46 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -3,3 +3,4 @@ DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9
DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
DIST regexp_parser-2.2.1.tar.gz 90169 BLAKE2B dcfa392bc5dc9e08816b3a2e401744c775a8a5c60067c410d195d60ef155eba287b31243e70677f018e3d751b371a8878933a5e34c4bd5b00cef3bf1b266c00a SHA512 a3a6fbd36e980eaf5f14d0c98c2680aed700b01c7941fbc4e406e14992e432b3ce1510a8be9ef7964ddf0ab85c55b556206cdea36a336de98e6956942b4ff726
DIST regexp_parser-2.3.0.tar.gz 92100 BLAKE2B d3d5315e4643e118f559cdfdc6f30c5fe2104298d4b0d297b4cc0b4cadcbd4b97fbc92eb454b9ca00c917e67d0099d8c50a747d76d51806506c8cc93d0e4d02e SHA512 d297d475897586d78c6678edb77077c2d562e59483b036f65ef1a550c2f2c28b9fc3c96b2a98d5726b58d2a061d6c65b72a48c1e1b3e2a5b7c3ea01543d22746
+DIST regexp_parser-2.3.1.tar.gz 92120 BLAKE2B e4dc8d3d38a260be0d21812703380af418ea6b87c1fff66048111e2d5295b04589cf3d838f3e9eb330f300c7b49c8ccb18867c6fac41e55c0c623cc0206d2c85 SHA512 3f2502afaaeeffe6738c0fa83717f93af22de8704a1ce3cfdae910be287a6bbbab5dcd80d9ce7fb840acabea8d55a0cb06bca1696820f5e568b75c96360c3895
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
new file mode 100644
index 000000000000..6f59b303702a
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
+ test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+ ${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/rouge/rouge-3.28.0.ebuild b/dev-ruby/rouge/rouge-3.28.0.ebuild
index 05bd8b392661..f5df182ee440 100644
--- a/dev-ruby/rouge/rouge-3.28.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.28.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
index 51f075f4fe16..d1b1cae2f539 100644
--- a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 97de31002333..3ec5d83eb04a 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,3 +3,4 @@ DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aa
DIST rspec-rails-5.0.2.tar.gz 156991 BLAKE2B a1700fad43ed2eb441d95307fd14fe8c0f96c51edaaddaa13a94b6c740711ddb96c9c7058051c1160746111e52c56a5685808532795aa0e32cab2f91b287b6fc SHA512 c2154f0cac634ead0109daf0e91782e9c770783104d3b2a4b0e097d46f8a9ebb49fe993733a7a3f6c4e3d037d5ab25f424cf8e3386a161172fb8c68e731b076e
DIST rspec-rails-5.0.3.tar.gz 156964 BLAKE2B 3f47428f887044acc2f4b374f6aaf135d44f2015b66ae5caa2a1f46923921ca2f96de47c7fc8faec951c15d8a18ee7efbf12fb80798e279784c70e3c31c09838 SHA512 3732c35603e5fe16deed1404c6ab0814cfaa6922da74befe31e3e2b23ba78f4de8316862894057f37b9d0aa79838d21d7028e1cbc592b8ef79de17f25bc81ea5
DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
+DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
new file mode 100644
index 000000000000..93617fc028c1
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ || ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
+ || ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
+ || ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+ >=dev-ruby/rspec-3.10:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+ >=dev-ruby/capybara-2.2.0
+ >=dev-ruby/ammeter-1.1.5
+ ~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+ # Remove .rspec options to avoid dependency on newer rspec when
+ # bootstrapping.
+ echo "--require spec_helper" > .rspec || die
+
+ # Avoid bundler-specific specs.
+ rm -f spec/sanity_check_spec.rb || die
+
+ # Avoid broken controller generator specs for now.
+ rm -fr spec/generators/rspec || die
+
+ # Test with a compatible rails version
+ sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+ # Fix gemspec.
+ sed -e 's/git ls-files --/find */' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
index 4bf7c58607fc..c683a3db28ac 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
index c377c03af5da..43c4580b3a0a 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
inherit ruby-ng
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
index 0fb1c2d24411..2cb56fd60c1d 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..8d40212427f6
--- /dev/null
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface to libshout2"
+HOMEPAGE="https://github.com/niko/ruby-shout"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND+=" >=media-libs/libshout-2.0"
+DEPEND+=" >=media-libs/libshout-2.0"
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
index 62fded4f986e..0a566cbe514e 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
index 27ad1c4a5216..70b45d16c9b6 100644
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
+++ b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
index 07ceff39bcd6..5fbb80651185 100644
--- a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
+++ b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="listen-${PV}"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~x86"
IUSE="test"
PATCHES=( "${FILESDIR}/listen-3.1.5-ruby26.patch" )
diff --git a/dev-ruby/sass/sass-3.4.25-r1.ebuild b/dev-ruby/sass/sass-3.4.25-r1.ebuild
index ccaf73aaab68..3634caea5444 100644
--- a/dev-ruby/sass/sass-3.4.25-r1.ebuild
+++ b/dev-ruby/sass/sass-3.4.25-r1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and m
HOMEPAGE="http://sass-lang.com/"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux"
SLOT="$(get_version_component_range 1-2)"
IUSE=""
diff --git a/dev-ruby/sass/sass-3.7.4.ebuild b/dev-ruby/sass/sass-3.7.4.ebuild
index df1782a9f2e6..e48a893ec96c 100644
--- a/dev-ruby/sass/sass-3.7.4.ebuild
+++ b/dev-ruby/sass/sass-3.7.4.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-sass-${PV}"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~x86 ~amd64-linux"
SLOT="$(ver_cut 1-2)"
IUSE=""
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
index 11edf3357612..601a5e10750e 100644
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc test"
ruby_add_bdepend "test? ( dev-ruby/test-unit:2
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
index a31d3bb3e9ed..ec95df7f6d42 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
index 7bccc2350d69..0224314087a3 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
# tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
index 6eb50ff9f0c3..e1bf5c7abf8f 100644
--- a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
# This now more or less a meta-gem and it only contains features for
diff --git a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
index e03217216203..50c2d61426e1 100644
--- a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/rsl/stringex"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
# we could rely on activerecord[sqlite3], but since we do not remove the
diff --git a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
index cb869ba31cfa..5728af528d19 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
@@ -15,6 +15,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
HOMEPAGE="https://github.com/postmodern/tdiff"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 52d600b75fdf..39192b16958f 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -20,7 +20,7 @@ RUBY_S="svenfuchs-test_declarative-*"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
diff --git a/dev-ruby/thor/thor-1.2.1.ebuild b/dev-ruby/thor/thor-1.2.1.ebuild
index 34dccdc26911..0797829eb6d9 100644
--- a/dev-ruby/thor/thor-1.2.1.ebuild
+++ b/dev-ruby/thor/thor-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="doc"
USE_RUBY="ruby26 ruby27" ruby_add_bdepend "
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
index 4ecc8bd939ef..a90db6ac5b9f 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/timecop/timecop-0.9.5.ebuild b/dev-ruby/timecop/timecop-0.9.5.ebuild
index debfad270072..3c520669e9af 100644
--- a/dev-ruby/timecop/timecop-0.9.5.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
# Missing testdep activesupport
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 199edd766974..a57f8b88d939 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 22b829c941a4..db757a27fa9c 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
index 28110c65bfdb..5f7ee12e112e 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
index d608bfe170a4..d3c052e4b8fe 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "
diff --git a/dev-ruby/unindent/unindent-1.0-r1.ebuild b/dev-ruby/unindent/unindent-1.0-r1.ebuild
index c04f8e39c75d..a0d98bf91c29 100644
--- a/dev-ruby/unindent/unindent-1.0-r1.ebuild
+++ b/dev-ruby/unindent/unindent-1.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Ruby method to unindent strings"
HOMEPAGE="https://github.com/mynyml/unindent"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index dfaa9b33e9e3..8774917de52c 100644
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
LICENSE="GPL-2"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/yard/yard-0.9.27.ebuild b/dev-ruby/yard/yard-0.9.27.ebuild
index 7b006c35f664..15fdb9edeb19 100644
--- a/dev-ruby/yard/yard-0.9.27.ebuild
+++ b/dev-ruby/yard/yard-0.9.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "=dev-ruby/webrick-1.7*"
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
index 246ee24343a9..acd5bf80bfd0 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 6615567a32fb..4e31554fd6de 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index b96e0c79bbf7..81a481316027 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1 +1,2 @@
DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
+DIST chez-9.5.8.tar.gz 35487100 BLAKE2B 6c5467f812788166aded14ce38ec2935bb890f2386f3ea7ec29a97c6a3d9aa37f26960e44aa6acd6b3954e45dfc4eaff4fc7db1dd77b231fb380a1dac7349be4 SHA512 80a4e9f61ddb254bef1a249af1d32f918df88390946fbe6eeb62c3510c760bf899285be1aba70eda9b54bcb0c6fef3fe7deace648993cd9cece2d08cf0ade9c0
diff --git a/dev-scheme/chez/chez-9.5.8.ebuild b/dev-scheme/chez/chez-9.5.8.ebuild
new file mode 100644
index 000000000000..9b650e16a29b
--- /dev/null
+++ b/dev-scheme/chez/chez-9.5.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CSV="csv${PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A programming language based on R6RS"
+HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
+SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${CSV}"
+
+# Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
+# Nanopass (MIT), stex (MIT), and zlib (ZLIB).
+LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="X examples ncurses threads"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ X? ( x11-libs/libX11 )
+ ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ tc-export AR CC CXX LD RANLIB
+
+ default
+
+ if use ncurses ; then
+ local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\""
+ sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g" configure || die
+ fi
+
+ # Remove -Werror
+ sed -i "/^C = /s|-Werror||g" c/Mf-* || die
+}
+
+src_configure() {
+ local myconfargs=(
+ $(usex threads '--threads' '')
+ $(usex ncurses '' '--disable-curses')
+ $(usex X '' '--disable-x11')
+ --installprefix="/usr"
+ --installbin="/usr/bin"
+ --installlib="/usr/$(get_libdir)"
+ --installman="/usr/share/man"
+ --installschemename=chezscheme
+ --installpetitename=chezscheme-petite
+ --installscriptname=chezscheme-script
+ --nogzip-man-pages
+ )
+ sh ./configure "${myconfargs[@]}" || die
+}
+
+src_install() {
+ # TempRoot == DESTDIR
+ emake TempRoot="${D}" install
+
+ if ! use examples; then
+ rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
+ fi
+
+ einstalldocs
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b9e79c73a5f3..747c4b629d34 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index 249262b4d477..371c1d927b6d 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="tk"
DEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6631faae2e49..709d95c6d39d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index 487b7c0a673c..7675d9a4eeeb 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1 +1,2 @@
DIST ROPgadget-6.6.tar.gz 9349424 BLAKE2B b1f1e5fbc76329f64122e65161ab188e9f7260c4e43d5e92e0e43cd4ebbf27ae281c32bd49790a363ff1d10360a1cda1846310054c249ab40279063a735654e6 SHA512 bf636a264975c95676e5bb6223d0cf04885699eeaf691c6c93a1ac8c1bc44f95323207660a57a58f44163f8c07156567daa73755b35a13cff5d27aee01ec4fb6
+DIST ROPgadget-6.7.tar.gz 9348558 BLAKE2B 004f28993e3567b8bf78853c83b60fa17ff7dc8eb82867eabec33aee247283938ed522883bcf62a11f27a70fa10c4afbdd2636d613770bc8fa0ee7dd3667e859 SHA512 81bebafc1ba9cb18e017487395dacdaae044d6f1383604a0183b41d2210651c9a6870755f741cd7a3e2dc38ee5c004b0aeac52cc1082fa352c06c0598ac7e87b
diff --git a/dev-util/ROPgadget/ROPgadget-6.7.ebuild b/dev-util/ROPgadget/ROPgadget-6.7.ebuild
new file mode 100644
index 000000000000..776ffc4f5af6
--- /dev/null
+++ b/dev-util/ROPgadget/ROPgadget-6.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
+HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
+else
+ SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+"
+
+src_test() {
+ pushd test-suite-binaries || die
+ ./test.sh || die
+ popd || die
+}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index d9b5d5e7a0dc..1a2b49cac930 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -1,9 +1,9 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
+
+ chewi@gentoo.org
+ James Le Cuirot
+
+ conikost@gentoo.org
+ Conrad Kostecki
+