diff --git a/Manifest.files.gz b/Manifest.files.gz
index 751139db22e1..1750246c1ed2 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 f24a9884bdbc..ead657c25330 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/snapserver/metadata.xml b/acct-group/snapserver/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/acct-group/snapserver/metadata.xml
+++ b/acct-group/snapserver/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b8363fefaa8f..38b69909812e 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/snapclient/metadata.xml b/acct-user/snapclient/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/acct-user/snapclient/metadata.xml
+++ b/acct-user/snapclient/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/acct-user/snapserver/metadata.xml b/acct-user/snapserver/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/acct-user/snapserver/metadata.xml
+++ b/acct-user/snapserver/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 6ccc5382e529..c2a7f3fc26d4 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
similarity index 100%
rename from app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a1168da23a72..a5eac8ac8e98 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 15cfff2d944d..af8a5152faad 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -7,4 +7,6 @@ DIST awscli-1.20.27.tar.gz 2058499 BLAKE2B b8de3aaad76bf957b1aa4dec114fcc13650f0
DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b
DIST awscli-1.20.29.tar.gz 2058922 BLAKE2B e0455b2d5475a1d070d0b97f5e321f884ad7d9f9627e36c2ac7eb61b69d0aeed35845906f03acf4c2c5202f6bd3c019693e4bcd02454a454282862949e4eceeb SHA512 67412b3a7445effde508548ec0030f304f0374b7a1dcc851a2205c01321e8e30d939b09cac85f10a51f2e9b47caca30303bd2916c4e10fc494eb599bc3ff783d
DIST awscli-1.20.30.tar.gz 2066899 BLAKE2B 47a111849b14e9cdc24a8fb117711195bee5a7ea73eff2778dcb0f1e0600e04b86f78e1424082f22f655b0c85a3382c2587f495013795126830ace0a4e6a6a72 SHA512 00965738a2dd1faf0331b8b1473969a9e8a4a4ad68e6bb1d0383077494da38a9244a732ae9093eee853b6b6246ff611b6a4f1809d7d2ebda31931eb1fec79148
+DIST awscli-1.20.31.tar.gz 2067614 BLAKE2B 28c268f89f733dcf3db18f83abaa312ab25b082f8a2a628889c113d60b54c054d500a5e202724af58801e02cbff74041b0409c3f9d86dda7eea446ec763a69d9 SHA512 5530250de3c0b744bd0df1d2cabc7affa75bc8504dd0b92c0854bc02a96cc8222ef710f3fa2b5ee586da04f4cd4abffd58e5e663a002acc31d106ae479fb0c38
+DIST awscli-1.20.32.tar.gz 2068048 BLAKE2B 396aee12287bad95e825159a4352e3ac259a9e572b593384244fdaa7a9e632cac9fe2115584dcc23cd6feefc6c4f7e6ae5eb1a2a9e7c18c7ac0c750f725204ac SHA512 e46c3e5fc9572ee9d3b4dc186f98801a207b2d9d8d8edfa44676710bf8b175044a7900ef95779cdaf439fc0b492ac933948dd0cc9b0def316468412b50996bc3
DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
diff --git a/app-admin/awscli/awscli-1.20.31.ebuild b/app-admin/awscli/awscli-1.20.31.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.31.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+ "${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+ distutils_install_for_testing
+ # integration tests require AWS credentials and Internet access
+ nosetests -v tests/{functional,unit} ||
+ die "Tests failed for ${EPYTHON}"
+}
+
+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.20.32.ebuild b/app-admin/awscli/awscli-1.20.32.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.32.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+ "${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+ distutils_install_for_testing
+ # integration tests require AWS credentials and Internet access
+ nosetests -v tests/{functional,unit} ||
+ die "Tests failed for ${EPYTHON}"
+}
+
+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/gixy/metadata.xml b/app-admin/gixy/metadata.xml
index aca54e70bbf2..a8df410a1ef5 100644
--- a/app-admin/gixy/metadata.xml
+++ b/app-admin/gixy/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
yandex/gixy
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
index 7a0eee93c891..9c2ef5eedea9 100644
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="systemd"
DEPEND="
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
index 5bc31accd637..c6fe92daae4a 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
IUSE="gnome-keyring policykit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 5677aeb246e9..476bd22f64ef 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -704,6 +704,8 @@ DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.4.mod 207 BLAKE2B c6fa7bea22c9783
DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.4.zip 270223 BLAKE2B 3170068408fa5019989d40c1b107f8ae83c471e59797d2355f370f64b46cafb9ff88593538e61ef43daf8bcbf7a38ba38cd15fe520898852e261b620f43b894f SHA512 5ed82db9b28cccb81c4146b5651e6ce2378d6f4717f298240d5e42fdb0274958f448c473d54ff319522807b3adf9dad1db53109e1cba1f8d050d766ee565b93e
DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.zip 271139 BLAKE2B ef90f8609bb0443989de9b36f4d520a53666b06eade0f08dd04d4d5f13dd898846172d07085a177b7ffe1add1f7f44e71ec51852cd8a056cca4470e5ab0eab4f SHA512 ce93478d87524ae930da15e29487ad354597979036b75c482f49d3fed7ebbc5d536437e14a76790c4b432ec89ee6752d5d3b22a711e004e4a9d8d6a2fb844fbe
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.1.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.1.zip 271812 BLAKE2B 96ab1f9578f626972359708165f8215bb7b6bfb5a762a6eee22dd10b8bce42533ae6ab5326851373fe69b53d0ea6be1ffd177109b4125fc62f0027ceb94c0e44 SHA512 75f96493bd89df1d7b8642025af1a4a78e5b787166fc01103d7670f9097a7a703d0018de84414451929b79f054a1b480edf50056c7d447d9356d09007929d38b
DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.mod 128 BLAKE2B 8aaf551c3afef3baeb7382d33ae0c2467b31bb567b5131d5b0302175b94d2d70a1390eb3f51c4cb7ee4357eb84142bb85c4306e210a9150b828971e3f93d5ac8 SHA512 1695d6effa440673a8c8a6f64b8931c8d6ff3401c4a8020bcb8f899dd6498951cd8fef233fe353e3d32cd59f5db7e3085839f67a5d142e0d3fc0e7772d64c799
DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.zip 11821 BLAKE2B 49f42fbdf99c028d1d8be23c5649652509ea302aa05708552e891557c11d9716b864804cc1234ec785c383c03e435b077b80b105172c766f7df4dea56a507ebd SHA512 8cc0a553b7bb7a8d3d08f23ac1531e4f6458c96d84aa2816722304410c6e977f5150603f58f0d4865664fa10d0159f434a160cc674896b1329fc765ef5bf24da
DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
@@ -1151,3 +1153,4 @@ DIST terraform-0.15.5.tar.gz 2885932 BLAKE2B 997ae485ff395d2174ef2265559cff43215
DIST terraform-1.0.1.tar.gz 2881426 BLAKE2B 8602e053c5ca23fe9dacd3517cdad8aefe88abbe0780dc9a430307e05697395c8c34e845bedcccb5547d721791954585295a2af909892c34346be0f3a3cc20f9 SHA512 9909aa0802d2c4a77d138f4415e7d588a6bd450d0bba3adda695877f51bd41a7b9584c42291d41fbdc20fc1788c1f2bde54417c40e8c824ac4854b8670450c67
DIST terraform-1.0.3.tar.gz 2886412 BLAKE2B 748e7e9438f6f3a80f87dd03cb7319cf5c84383261951f964fbcb5349bef8a508c38581cb9b18ae0e6279829ffc9f36c377a5cd05d45ed11f257beee437b8de0 SHA512 037d1a42a79b1e441245f28c5548245ddf5f5000510563508fb1e2503563dc4b27d1451ad25afd3cdb18bc004e83cc692101fd90f51c3e4e836905fd7e0cadcb
DIST terraform-1.0.4.tar.gz 2889019 BLAKE2B 7134dc80c1e76c3dbd1586c7708c0448cb15ae74034356f726f139e5ab0dd610f09626d38f644c3afc8223a5590aed4451c788958bbf35b6fc7127ac241a3653 SHA512 8a9a311109271dcd72e44868de37a25536e35642c04dac86d76932722e7304a42da4e924fc175d046e27cee1522d9d35ee00a21aff3c4757eee47a4fd44be33f
+DIST terraform-1.0.5.tar.gz 2890185 BLAKE2B 7033f0c96e7cf37341345faa02f2741dd5f56924b370d4359d59c33ab6929a4d0819072eb1ae829c82301558f3b6ef7e3a088a8295d1728ca7fa6bce6758bc4a SHA512 47d978b2c57c8d5ad2667da3610e2085987763f4cf82dd3ee152357fde8bc6531b30b5aaa4c367e25496a086b02f328dea475729ea9d50e11e1946cc8ad0dd6b
diff --git a/app-admin/terraform/terraform-1.0.5.ebuild b/app-admin/terraform/terraform-1.0.5.ebuild
new file mode 100644
index 000000000000..835b9b4b74ee
--- /dev/null
+++ b/app-admin/terraform/terraform-1.0.5.ebuild
@@ -0,0 +1,1085 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_SUM=(
+ "cloud.google.com/go v0.26.0/go.mod"
+ "cloud.google.com/go v0.34.0/go.mod"
+ "cloud.google.com/go v0.38.0/go.mod"
+ "cloud.google.com/go v0.44.1/go.mod"
+ "cloud.google.com/go v0.44.2/go.mod"
+ "cloud.google.com/go v0.45.1/go.mod"
+ "cloud.google.com/go v0.46.3/go.mod"
+ "cloud.google.com/go v0.50.0/go.mod"
+ "cloud.google.com/go v0.52.0/go.mod"
+ "cloud.google.com/go v0.53.0/go.mod"
+ "cloud.google.com/go v0.54.0/go.mod"
+ "cloud.google.com/go v0.56.0/go.mod"
+ "cloud.google.com/go v0.57.0/go.mod"
+ "cloud.google.com/go v0.62.0/go.mod"
+ "cloud.google.com/go v0.65.0/go.mod"
+ "cloud.google.com/go v0.72.0/go.mod"
+ "cloud.google.com/go v0.74.0/go.mod"
+ "cloud.google.com/go v0.78.0/go.mod"
+ "cloud.google.com/go v0.79.0"
+ "cloud.google.com/go v0.79.0/go.mod"
+ "cloud.google.com/go/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/bigquery v1.3.0/go.mod"
+ "cloud.google.com/go/bigquery v1.4.0/go.mod"
+ "cloud.google.com/go/bigquery v1.5.0/go.mod"
+ "cloud.google.com/go/bigquery v1.7.0/go.mod"
+ "cloud.google.com/go/bigquery v1.8.0/go.mod"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "cloud.google.com/go/datastore v1.1.0/go.mod"
+ "cloud.google.com/go/pubsub v1.0.1/go.mod"
+ "cloud.google.com/go/pubsub v1.1.0/go.mod"
+ "cloud.google.com/go/pubsub v1.2.0/go.mod"
+ "cloud.google.com/go/pubsub v1.3.1/go.mod"
+ "cloud.google.com/go/storage v1.0.0/go.mod"
+ "cloud.google.com/go/storage v1.5.0/go.mod"
+ "cloud.google.com/go/storage v1.6.0/go.mod"
+ "cloud.google.com/go/storage v1.8.0/go.mod"
+ "cloud.google.com/go/storage v1.10.0"
+ "cloud.google.com/go/storage v1.10.0/go.mod"
+ "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+ "github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+ "github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod"
+ "github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod"
+ "github.com/Azure/azure-sdk-for-go v52.5.0+incompatible"
+ "github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod"
+ "github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+ "github.com/Azure/go-autorest v14.2.0+incompatible"
+ "github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.11.10/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.11.18"
+ "github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.13"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+ "github.com/Azure/go-autorest/autorest/date v0.3.0"
+ "github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+ "github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+ "github.com/Azure/go-autorest/autorest/to v0.4.0"
+ "github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/validation v0.3.1"
+ "github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+ "github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+ "github.com/Azure/go-autorest/logger v0.2.1"
+ "github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+ "github.com/Azure/go-autorest/tracing v0.6.0"
+ "github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+ "github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+ "github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+ "github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+ "github.com/BurntSushi/toml v0.3.1/go.mod"
+ "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+ "github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+ "github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+ "github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
+ "github.com/Masterminds/goutils v1.1.0"
+ "github.com/Masterminds/goutils v1.1.0/go.mod"
+ "github.com/Masterminds/semver v1.5.0"
+ "github.com/Masterminds/semver v1.5.0/go.mod"
+ "github.com/Masterminds/sprig v2.22.0+incompatible"
+ "github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+ "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+ "github.com/PuerkitoBio/purell v1.0.0/go.mod"
+ "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+ "github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+ "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+ "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+ "github.com/agext/levenshtein v1.2.1/go.mod"
+ "github.com/agext/levenshtein v1.2.2"
+ "github.com/agext/levenshtein v1.2.2/go.mod"
+ "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+ "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+ "github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+ "github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+ "github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+ "github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+ "github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+ "github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+ "github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+ "github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+ "github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+ "github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+ "github.com/apparentlymart/go-cidr v1.1.0"
+ "github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+ "github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+ "github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+ "github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+ "github.com/apparentlymart/go-shquot v0.0.1"
+ "github.com/apparentlymart/go-shquot v0.0.1/go.mod"
+ "github.com/apparentlymart/go-textseg v1.0.0"
+ "github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+ "github.com/apparentlymart/go-textseg/v13 v13.0.0"
+ "github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
+ "github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+ "github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+ "github.com/apparentlymart/go-versions v1.0.1"
+ "github.com/apparentlymart/go-versions v1.0.1/go.mod"
+ "github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+ "github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+ "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+ "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+ "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+ "github.com/armon/go-radix v1.0.0"
+ "github.com/armon/go-radix v1.0.0/go.mod"
+ "github.com/aws/aws-sdk-go v1.15.78/go.mod"
+ "github.com/aws/aws-sdk-go v1.31.9/go.mod"
+ "github.com/aws/aws-sdk-go v1.37.0"
+ "github.com/aws/aws-sdk-go v1.37.0/go.mod"
+ "github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+ "github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+ "github.com/beorn7/perks v1.0.0"
+ "github.com/beorn7/perks v1.0.0/go.mod"
+ "github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+ "github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+ "github.com/bgentry/speakeasy v0.1.0"
+ "github.com/bgentry/speakeasy v0.1.0/go.mod"
+ "github.com/bmatcuk/doublestar v1.1.5"
+ "github.com/bmatcuk/doublestar v1.1.5/go.mod"
+ "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+ "github.com/cheggaaa/pb v1.0.27/go.mod"
+ "github.com/chzyer/logex v1.1.10"
+ "github.com/chzyer/logex v1.1.10/go.mod"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+ "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+ "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+ "github.com/client9/misspell v0.3.4/go.mod"
+ "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+ "github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+ "github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+ "github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+ "github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+ "github.com/coreos/go-semver v0.2.0"
+ "github.com/coreos/go-semver v0.2.0/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+ "github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+ "github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+ "github.com/creack/pty v1.1.11/go.mod"
+ "github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+ "github.com/davecgh/go-spew v1.1.0/go.mod"
+ "github.com/davecgh/go-spew v1.1.1"
+ "github.com/davecgh/go-spew v1.1.1/go.mod"
+ "github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+ "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+ "github.com/dimchansky/utfbom v1.1.0/go.mod"
+ "github.com/dimchansky/utfbom v1.1.1"
+ "github.com/dimchansky/utfbom v1.1.1/go.mod"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+ "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+ "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+ "github.com/dylanmei/iso8601 v0.1.0"
+ "github.com/dylanmei/iso8601 v0.1.0/go.mod"
+ "github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+ "github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+ "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+ "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+ "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+ "github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+ "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+ "github.com/fatih/color v1.7.0"
+ "github.com/fatih/color v1.7.0/go.mod"
+ "github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+ "github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+ "github.com/fsnotify/fsnotify v1.4.7/go.mod"
+ "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+ "github.com/ghodss/yaml v1.0.0/go.mod"
+ "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+ "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+ "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+ "github.com/go-kit/kit v0.8.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.3.0/go.mod"
+ "github.com/go-logr/logr v0.1.0/go.mod"
+ "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+ "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+ "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+ "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+ "github.com/go-sql-driver/mysql v1.5.0/go.mod"
+ "github.com/go-stack/stack v1.8.0/go.mod"
+ "github.com/go-test/deep v1.0.1/go.mod"
+ "github.com/go-test/deep v1.0.3"
+ "github.com/go-test/deep v1.0.3/go.mod"
+ "github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+ "github.com/gofrs/uuid v3.3.0+incompatible"
+ "github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+ "github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+ "github.com/gogo/protobuf v1.1.1/go.mod"
+ "github.com/gogo/protobuf v1.2.1/go.mod"
+ "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+ "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+ "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+ "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+ "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+ "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+ "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+ "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+ "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+ "github.com/golang/mock v1.1.1/go.mod"
+ "github.com/golang/mock v1.2.0/go.mod"
+ "github.com/golang/mock v1.3.1/go.mod"
+ "github.com/golang/mock v1.4.0/go.mod"
+ "github.com/golang/mock v1.4.1/go.mod"
+ "github.com/golang/mock v1.4.3/go.mod"
+ "github.com/golang/mock v1.4.4"
+ "github.com/golang/mock v1.4.4/go.mod"
+ "github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+ "github.com/golang/protobuf v1.1.0/go.mod"
+ "github.com/golang/protobuf v1.2.0/go.mod"
+ "github.com/golang/protobuf v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.3.2/go.mod"
+ "github.com/golang/protobuf v1.3.3/go.mod"
+ "github.com/golang/protobuf v1.3.4/go.mod"
+ "github.com/golang/protobuf v1.3.5/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+ "github.com/golang/protobuf v1.4.0/go.mod"
+ "github.com/golang/protobuf v1.4.1/go.mod"
+ "github.com/golang/protobuf v1.4.2/go.mod"
+ "github.com/golang/protobuf v1.4.3"
+ "github.com/golang/protobuf v1.4.3/go.mod"
+ "github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+ "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+ "github.com/google/btree v1.0.0"
+ "github.com/google/btree v1.0.0/go.mod"
+ "github.com/google/go-cmp v0.2.0/go.mod"
+ "github.com/google/go-cmp v0.3.0/go.mod"
+ "github.com/google/go-cmp v0.3.1/go.mod"
+ "github.com/google/go-cmp v0.4.0/go.mod"
+ "github.com/google/go-cmp v0.4.1/go.mod"
+ "github.com/google/go-cmp v0.5.0/go.mod"
+ "github.com/google/go-cmp v0.5.1/go.mod"
+ "github.com/google/go-cmp v0.5.2/go.mod"
+ "github.com/google/go-cmp v0.5.3/go.mod"
+ "github.com/google/go-cmp v0.5.4/go.mod"
+ "github.com/google/go-cmp v0.5.5"
+ "github.com/google/go-cmp v0.5.5/go.mod"
+ "github.com/google/go-querystring v1.0.0"
+ "github.com/google/go-querystring v1.0.0/go.mod"
+ "github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+ "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+ "github.com/google/gofuzz v1.0.0"
+ "github.com/google/gofuzz v1.0.0/go.mod"
+ "github.com/google/martian v2.1.0+incompatible"
+ "github.com/google/martian v2.1.0+incompatible/go.mod"
+ "github.com/google/martian/v3 v3.0.0/go.mod"
+ "github.com/google/martian/v3 v3.1.0"
+ "github.com/google/martian/v3 v3.1.0/go.mod"
+ "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+ "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+ "github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+ "github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+ "github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+ "github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+ "github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+ "github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+ "github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+ "github.com/google/renameio v0.1.0/go.mod"
+ "github.com/google/uuid v1.0.0/go.mod"
+ "github.com/google/uuid v1.1.1/go.mod"
+ "github.com/google/uuid v1.1.2/go.mod"
+ "github.com/google/uuid v1.2.0"
+ "github.com/google/uuid v1.2.0/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.5"
+ "github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+ "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+ "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+ "github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+ "github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+ "github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+ "github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+ "github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+ "github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+ "github.com/gorilla/websocket v1.4.2"
+ "github.com/gorilla/websocket v1.4.2/go.mod"
+ "github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+ "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+ "github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+ "github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+ "github.com/hashicorp/aws-sdk-go-base v0.6.0"
+ "github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+ "github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+ "github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/errwrap v1.1.0"
+ "github.com/hashicorp/errwrap v1.1.0/go.mod"
+ "github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+ "github.com/hashicorp/go-azure-helpers v0.14.0"
+ "github.com/hashicorp/go-azure-helpers v0.14.0/go.mod"
+ "github.com/hashicorp/go-checkpoint v0.5.0"
+ "github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+ "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+ "github.com/hashicorp/go-cleanhttp v0.5.1"
+ "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+ "github.com/hashicorp/go-getter v1.5.2"
+ "github.com/hashicorp/go-getter v1.5.2/go.mod"
+ "github.com/hashicorp/go-hclog v0.14.1/go.mod"
+ "github.com/hashicorp/go-hclog v0.15.0"
+ "github.com/hashicorp/go-hclog v0.15.0/go.mod"
+ "github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+ "github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+ "github.com/hashicorp/go-msgpack v0.5.4"
+ "github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+ "github.com/hashicorp/go-multierror v1.0.0/go.mod"
+ "github.com/hashicorp/go-multierror v1.1.1"
+ "github.com/hashicorp/go-multierror v1.1.1/go.mod"
+ "github.com/hashicorp/go-plugin v1.4.1"
+ "github.com/hashicorp/go-plugin v1.4.1/go.mod"
+ "github.com/hashicorp/go-retryablehttp v0.5.2"
+ "github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+ "github.com/hashicorp/go-rootcerts v1.0.0"
+ "github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+ "github.com/hashicorp/go-safetemp v1.0.0"
+ "github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+ "github.com/hashicorp/go-slug v0.4.1"
+ "github.com/hashicorp/go-slug v0.4.1/go.mod"
+ "github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+ "github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+ "github.com/hashicorp/go-tfe v0.15.0"
+ "github.com/hashicorp/go-tfe v0.15.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.1"
+ "github.com/hashicorp/go-uuid v1.0.1/go.mod"
+ "github.com/hashicorp/go-version v1.0.0/go.mod"
+ "github.com/hashicorp/go-version v1.1.0/go.mod"
+ "github.com/hashicorp/go-version v1.2.0/go.mod"
+ "github.com/hashicorp/go-version v1.2.1"
+ "github.com/hashicorp/go-version v1.2.1/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.0/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.1"
+ "github.com/hashicorp/golang-lru v0.5.1/go.mod"
+ "github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+ "github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+ "github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+ "github.com/hashicorp/hcl/v2 v2.10.1"
+ "github.com/hashicorp/hcl/v2 v2.10.1/go.mod"
+ "github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3"
+ "github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3/go.mod"
+ "github.com/hashicorp/memberlist v0.1.0"
+ "github.com/hashicorp/memberlist v0.1.0/go.mod"
+ "github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+ "github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+ "github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2"
+ "github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2/go.mod"
+ "github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
+ "github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
+ "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+ "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+ "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+ "github.com/hpcloud/tail v1.0.0/go.mod"
+ "github.com/huandu/xstrings v1.3.2"
+ "github.com/huandu/xstrings v1.3.2/go.mod"
+ "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+ "github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+ "github.com/imdario/mergo v0.3.5/go.mod"
+ "github.com/imdario/mergo v0.3.11"
+ "github.com/imdario/mergo v0.3.11/go.mod"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+ "github.com/jhump/protoreflect v1.6.0"
+ "github.com/jhump/protoreflect v1.6.0/go.mod"
+ "github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+ "github.com/jmespath/go-jmespath v0.3.0/go.mod"
+ "github.com/jmespath/go-jmespath v0.4.0"
+ "github.com/jmespath/go-jmespath v0.4.0/go.mod"
+ "github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+ "github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+ "github.com/jonboulle/clockwork v0.1.0"
+ "github.com/jonboulle/clockwork v0.1.0/go.mod"
+ "github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+ "github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+ "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+ "github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+ "github.com/json-iterator/go v1.1.6/go.mod"
+ "github.com/json-iterator/go v1.1.7"
+ "github.com/json-iterator/go v1.1.7/go.mod"
+ "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+ "github.com/jstemmer/go-junit-report v0.9.1"
+ "github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+ "github.com/jtolds/gls v4.2.1+incompatible"
+ "github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+ "github.com/julienschmidt/httprouter v1.2.0/go.mod"
+ "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+ "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+ "github.com/kisielk/errcheck v1.1.0/go.mod"
+ "github.com/kisielk/errcheck v1.2.0/go.mod"
+ "github.com/kisielk/gotool v1.0.0/go.mod"
+ "github.com/klauspost/compress v1.11.2"
+ "github.com/klauspost/compress v1.11.2/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+ "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+ "github.com/kr/pretty v0.1.0"
+ "github.com/kr/pretty v0.1.0/go.mod"
+ "github.com/kr/pty v1.1.1/go.mod"
+ "github.com/kr/text v0.1.0"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+ "github.com/kylelemons/godebug v1.1.0"
+ "github.com/kylelemons/godebug v1.1.0/go.mod"
+ "github.com/lib/pq v1.8.0"
+ "github.com/lib/pq v1.8.0/go.mod"
+ "github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+ "github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+ "github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+ "github.com/likexian/gokit v0.20.15"
+ "github.com/likexian/gokit v0.20.15/go.mod"
+ "github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+ "github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+ "github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+ "github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+ "github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+ "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+ "github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+ "github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+ "github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+ "github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+ "github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+ "github.com/mattn/go-colorable v0.0.9/go.mod"
+ "github.com/mattn/go-colorable v0.1.4"
+ "github.com/mattn/go-colorable v0.1.4/go.mod"
+ "github.com/mattn/go-isatty v0.0.3/go.mod"
+ "github.com/mattn/go-isatty v0.0.4/go.mod"
+ "github.com/mattn/go-isatty v0.0.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.10/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-runewidth v0.0.2/go.mod"
+ "github.com/mattn/go-runewidth v0.0.4/go.mod"
+ "github.com/mattn/go-shellwords v1.0.4"
+ "github.com/mattn/go-shellwords v1.0.4/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/miekg/dns v1.0.8"
+ "github.com/miekg/dns v1.0.8/go.mod"
+ "github.com/mitchellh/cli v1.1.2"
+ "github.com/mitchellh/cli v1.1.2/go.mod"
+ "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+ "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+ "github.com/mitchellh/copystructure v1.0.0"
+ "github.com/mitchellh/copystructure v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+ "github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+ "github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+ "github.com/mitchellh/go-testing-interface v1.0.0"
+ "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+ "github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+ "github.com/mitchellh/go-wordwrap v1.0.0"
+ "github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+ "github.com/mitchellh/gox v1.0.1"
+ "github.com/mitchellh/gox v1.0.1/go.mod"
+ "github.com/mitchellh/iochan v1.0.0"
+ "github.com/mitchellh/iochan v1.0.0/go.mod"
+ "github.com/mitchellh/mapstructure v1.1.2"
+ "github.com/mitchellh/mapstructure v1.1.2/go.mod"
+ "github.com/mitchellh/panicwrap v1.0.0"
+ "github.com/mitchellh/panicwrap v1.0.0/go.mod"
+ "github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+ "github.com/mitchellh/reflectwalk v1.0.1"
+ "github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+ "github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+ "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+ "github.com/modern-go/reflect2 v1.0.1"
+ "github.com/modern-go/reflect2 v1.0.1/go.mod"
+ "github.com/mozillazg/go-httpheader v0.2.1"
+ "github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+ "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+ "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+ "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+ "github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+ "github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+ "github.com/oklog/run v1.0.0"
+ "github.com/oklog/run v1.0.0/go.mod"
+ "github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+ "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+ "github.com/onsi/ginkgo v1.6.0/go.mod"
+ "github.com/onsi/ginkgo v1.8.0/go.mod"
+ "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+ "github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+ "github.com/onsi/gomega v1.5.0/go.mod"
+ "github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+ "github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+ "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+ "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+ "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+ "github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23"
+ "github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23/go.mod"
+ "github.com/pkg/errors v0.8.0/go.mod"
+ "github.com/pkg/errors v0.9.1"
+ "github.com/pkg/errors v0.9.1/go.mod"
+ "github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/posener/complete v1.1.1/go.mod"
+ "github.com/posener/complete v1.2.1"
+ "github.com/posener/complete v1.2.1/go.mod"
+ "github.com/prometheus/client_golang v0.9.1/go.mod"
+ "github.com/prometheus/client_golang v1.0.0"
+ "github.com/prometheus/client_golang v1.0.0/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+ "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+ "github.com/prometheus/common v0.4.1"
+ "github.com/prometheus/common v0.4.1/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.2"
+ "github.com/prometheus/procfs v0.0.2/go.mod"
+ "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+ "github.com/rogpeppe/go-internal v1.3.0/go.mod"
+ "github.com/satori/go.uuid v1.2.0"
+ "github.com/satori/go.uuid v1.2.0/go.mod"
+ "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+ "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+ "github.com/sergi/go-diff v1.0.0"
+ "github.com/sergi/go-diff v1.0.0/go.mod"
+ "github.com/sirupsen/logrus v1.2.0/go.mod"
+ "github.com/sirupsen/logrus v1.4.2"
+ "github.com/sirupsen/logrus v1.4.2/go.mod"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+ "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+ "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+ "github.com/soheilhy/cmux v0.1.4"
+ "github.com/soheilhy/cmux v0.1.4/go.mod"
+ "github.com/spf13/afero v1.2.2"
+ "github.com/spf13/afero v1.2.2/go.mod"
+ "github.com/spf13/cobra v0.0.3/go.mod"
+ "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+ "github.com/spf13/pflag v1.0.1/go.mod"
+ "github.com/spf13/pflag v1.0.2/go.mod"
+ "github.com/spf13/pflag v1.0.3"
+ "github.com/spf13/pflag v1.0.3/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+ "github.com/stretchr/testify v1.2.2/go.mod"
+ "github.com/stretchr/testify v1.3.0/go.mod"
+ "github.com/stretchr/testify v1.4.0/go.mod"
+ "github.com/stretchr/testify v1.5.1/go.mod"
+ "github.com/stretchr/testify v1.6.1"
+ "github.com/stretchr/testify v1.6.1/go.mod"
+ "github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+ "github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+ "github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+ "github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+ "github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966"
+ "github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod"
+ "github.com/tombuildsstuff/giovanni v0.15.1"
+ "github.com/tombuildsstuff/giovanni v0.15.1/go.mod"
+ "github.com/ulikunitz/xz v0.5.8"
+ "github.com/ulikunitz/xz v0.5.8/go.mod"
+ "github.com/urfave/cli v1.20.0/go.mod"
+ "github.com/vmihailenco/msgpack v3.3.3+incompatible"
+ "github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+ "github.com/vmihailenco/msgpack/v4 v4.3.12"
+ "github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+ "github.com/vmihailenco/tagparser v0.1.1"
+ "github.com/vmihailenco/tagparser v0.1.1/go.mod"
+ "github.com/xanzy/ssh-agent v0.2.1"
+ "github.com/xanzy/ssh-agent v0.2.1/go.mod"
+ "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+ "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+ "github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+ "github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+ "github.com/yuin/goldmark v1.1.25/go.mod"
+ "github.com/yuin/goldmark v1.1.27/go.mod"
+ "github.com/yuin/goldmark v1.1.32/go.mod"
+ "github.com/yuin/goldmark v1.2.1/go.mod"
+ "github.com/zclconf/go-cty v1.0.0/go.mod"
+ "github.com/zclconf/go-cty v1.1.0/go.mod"
+ "github.com/zclconf/go-cty v1.2.0/go.mod"
+ "github.com/zclconf/go-cty v1.8.0/go.mod"
+ "github.com/zclconf/go-cty v1.9.1"
+ "github.com/zclconf/go-cty v1.9.1/go.mod"
+ "github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b"
+ "github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
+ "github.com/zclconf/go-cty-yaml v1.0.2"
+ "github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+ "go.etcd.io/bbolt v1.3.3"
+ "go.etcd.io/bbolt v1.3.3/go.mod"
+ "go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace"
+ "go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0/go.mod"
+ "go.opencensus.io v0.22.2/go.mod"
+ "go.opencensus.io v0.22.3/go.mod"
+ "go.opencensus.io v0.22.4/go.mod"
+ "go.opencensus.io v0.22.5/go.mod"
+ "go.opencensus.io v0.23.0"
+ "go.opencensus.io v0.23.0/go.mod"
+ "go.uber.org/atomic v1.3.2"
+ "go.uber.org/atomic v1.3.2/go.mod"
+ "go.uber.org/multierr v1.1.0"
+ "go.uber.org/multierr v1.1.0/go.mod"
+ "go.uber.org/zap v1.10.0"
+ "go.uber.org/zap v1.10.0/go.mod"
+ "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+ "golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+ "golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+ "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+ "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+ "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+ "golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+ "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+ "golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+ "golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+ "golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+ "golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+ "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+ "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+ "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+ "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+ "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+ "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+ "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+ "golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+ "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+ "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+ "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+ "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+ "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+ "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+ "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+ "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+ "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+ "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+ "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+ "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+ "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+ "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+ "golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5"
+ "golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+ "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+ "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+ "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+ "golang.org/x/mod v0.1.0/go.mod"
+ "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+ "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+ "golang.org/x/mod v0.2.0/go.mod"
+ "golang.org/x/mod v0.3.0/go.mod"
+ "golang.org/x/mod v0.4.0/go.mod"
+ "golang.org/x/mod v0.4.1/go.mod"
+ "golang.org/x/mod v0.4.2"
+ "golang.org/x/mod v0.4.2/go.mod"
+ "golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+ "golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+ "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+ "golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+ "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+ "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+ "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+ "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+ "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+ "golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+ "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+ "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+ "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+ "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+ "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+ "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+ "golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+ "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+ "golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
+ "golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+ "golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+ "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+ "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+ "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+ "golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+ "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+ "golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+ "golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+ "golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+ "golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+ "golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+ "golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+ "golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+ "golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+ "golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+ "golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+ "golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+ "golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+ "golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+ "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+ "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84"
+ "golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+ "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+ "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+ "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+ "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+ "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+ "golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+ "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+ "golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+ "golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+ "golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+ "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+ "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+ "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+ "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+ "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+ "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+ "golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+ "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+ "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+ "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+ "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+ "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+ "golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+ "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+ "golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+ "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+ "golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+ "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+ "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+ "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+ "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+ "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+ "golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+ "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+ "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+ "golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+ "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+ "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+ "golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+ "golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+ "golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+ "golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+ "golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+ "golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+ "golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+ "golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+ "golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+ "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+ "golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+ "golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+ "golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+ "golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+ "golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+ "golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+ "golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57"
+ "golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+ "golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+ "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+ "golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
+ "golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+ "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+ "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+ "golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/text v0.3.3/go.mod"
+ "golang.org/x/text v0.3.4/go.mod"
+ "golang.org/x/text v0.3.5"
+ "golang.org/x/text v0.3.5/go.mod"
+ "golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+ "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+ "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+ "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+ "golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+ "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+ "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+ "golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+ "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+ "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+ "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+ "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+ "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+ "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+ "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+ "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+ "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+ "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+ "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+ "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+ "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+ "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+ "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+ "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+ "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+ "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+ "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+ "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+ "golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+ "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+ "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+ "golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+ "golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+ "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+ "golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+ "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+ "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+ "golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+ "golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+ "golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+ "golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+ "golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+ "golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+ "golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+ "golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+ "golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+ "golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+ "golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+ "golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+ "golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+ "golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+ "golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+ "golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+ "golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+ "golang.org/x/tools v0.1.0"
+ "golang.org/x/tools v0.1.0/go.mod"
+ "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+ "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+ "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+ "google.golang.org/api v0.4.0/go.mod"
+ "google.golang.org/api v0.7.0/go.mod"
+ "google.golang.org/api v0.8.0/go.mod"
+ "google.golang.org/api v0.9.0/go.mod"
+ "google.golang.org/api v0.13.0/go.mod"
+ "google.golang.org/api v0.14.0/go.mod"
+ "google.golang.org/api v0.15.0/go.mod"
+ "google.golang.org/api v0.17.0/go.mod"
+ "google.golang.org/api v0.18.0/go.mod"
+ "google.golang.org/api v0.19.0/go.mod"
+ "google.golang.org/api v0.20.0/go.mod"
+ "google.golang.org/api v0.22.0/go.mod"
+ "google.golang.org/api v0.24.0/go.mod"
+ "google.golang.org/api v0.28.0/go.mod"
+ "google.golang.org/api v0.29.0/go.mod"
+ "google.golang.org/api v0.30.0/go.mod"
+ "google.golang.org/api v0.35.0/go.mod"
+ "google.golang.org/api v0.36.0/go.mod"
+ "google.golang.org/api v0.40.0/go.mod"
+ "google.golang.org/api v0.41.0/go.mod"
+ "google.golang.org/api v0.44.0-impersonate-preview"
+ "google.golang.org/api v0.44.0-impersonate-preview/go.mod"
+ "google.golang.org/appengine v1.1.0/go.mod"
+ "google.golang.org/appengine v1.4.0/go.mod"
+ "google.golang.org/appengine v1.5.0/go.mod"
+ "google.golang.org/appengine v1.6.1/go.mod"
+ "google.golang.org/appengine v1.6.5/go.mod"
+ "google.golang.org/appengine v1.6.6/go.mod"
+ "google.golang.org/appengine v1.6.7"
+ "google.golang.org/appengine v1.6.7/go.mod"
+ "google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
+ "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+ "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+ "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+ "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+ "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+ "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+ "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+ "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+ "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+ "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+ "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+ "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+ "google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+ "google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+ "google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+ "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+ "google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+ "google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+ "google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+ "google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+ "google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+ "google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+ "google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+ "google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+ "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+ "google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+ "google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+ "google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+ "google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+ "google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+ "google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+ "google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+ "google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+ "google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+ "google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+ "google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+ "google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+ "google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6"
+ "google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+ "google.golang.org/grpc v1.8.0/go.mod"
+ "google.golang.org/grpc v1.19.0/go.mod"
+ "google.golang.org/grpc v1.20.1/go.mod"
+ "google.golang.org/grpc v1.21.1/go.mod"
+ "google.golang.org/grpc v1.23.0/go.mod"
+ "google.golang.org/grpc v1.25.1/go.mod"
+ "google.golang.org/grpc v1.26.0/go.mod"
+ "google.golang.org/grpc v1.27.0/go.mod"
+ "google.golang.org/grpc v1.27.1"
+ "google.golang.org/grpc v1.27.1/go.mod"
+ "google.golang.org/grpc v1.28.0/go.mod"
+ "google.golang.org/grpc v1.29.1/go.mod"
+ "google.golang.org/grpc v1.30.0/go.mod"
+ "google.golang.org/grpc v1.31.0/go.mod"
+ "google.golang.org/grpc v1.31.1/go.mod"
+ "google.golang.org/grpc v1.33.2/go.mod"
+ "google.golang.org/grpc v1.34.0/go.mod"
+ "google.golang.org/grpc v1.35.0/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+ "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+ "google.golang.org/protobuf v1.21.0/go.mod"
+ "google.golang.org/protobuf v1.22.0/go.mod"
+ "google.golang.org/protobuf v1.23.0/go.mod"
+ "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+ "google.golang.org/protobuf v1.24.0/go.mod"
+ "google.golang.org/protobuf v1.25.0"
+ "google.golang.org/protobuf v1.25.0/go.mod"
+ "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+ "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+ "gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+ "gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+ "gopkg.in/errgo.v2 v2.1.0/go.mod"
+ "gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+ "gopkg.in/inf.v0 v0.9.0"
+ "gopkg.in/inf.v0 v0.9.0/go.mod"
+ "gopkg.in/ini.v1 v1.42.0"
+ "gopkg.in/ini.v1 v1.42.0/go.mod"
+ "gopkg.in/resty.v1 v1.12.0/go.mod"
+ "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+ "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.1/go.mod"
+ "gopkg.in/yaml.v2 v2.2.2/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.8/go.mod"
+ "gopkg.in/yaml.v2 v2.3.0"
+ "gopkg.in/yaml.v2 v2.3.0/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+ "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+ "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+ "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+ "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+ "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+ "honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+ "honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+ "honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+ "k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+ "k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+ "k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+ "k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+ "k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+ "k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+ "k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+ "k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+ "k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+ "k8s.io/klog v0.3.1/go.mod"
+ "k8s.io/klog v0.4.0"
+ "k8s.io/klog v0.4.0/go.mod"
+ "k8s.io/klog/v2 v2.0.0/go.mod"
+ "k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+ "k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+ "k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+ "k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+ "k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
+ "rsc.io/binaryregexp v0.2.0/go.mod"
+ "rsc.io/quote/v3 v3.1.0/go.mod"
+ "rsc.io/sampler v1.3.0/go.mod"
+ "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+ "sigs.k8s.io/yaml v1.1.0"
+ "sigs.k8s.io/yaml v1.1.0/go.mod"
+ )
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+ go build -o "bin/${PN}" . || die
+}
+
+src_install() {
+ dobin bin/terraform
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "If you would like to install shell completions please run:"
+ elog " terraform -install-autocomplete"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 394273bc92ac..be0f936ca403 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
index aa09c033b7e3..5a8aac17c318 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
@@ -15,7 +15,7 @@ IUSE="gtk gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=app-arch/libarchive-3.4.0
diff --git a/app-arch/libarchive/libarchive-3.5.2.ebuild b/app-arch/libarchive/libarchive-3.5.2.ebuild
index a097e9919a94..7411931bf5e9 100644
--- a/app-arch/libarchive/libarchive-3.5.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
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 ~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 kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
RDEPEND="
diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild
index da3fe8961c8c..c815d95ab68c 100644
--- a/app-arch/zstd/zstd-1.4.9.ebuild
+++ b/app-arch/zstd/zstd-1.4.9.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 ~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="lz4 static-libs +threads"
RDEPEND="app-arch/xz-utils
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 2b351efbbddb..9487946983b9 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild b/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
index f78476d70b64..898963e02dd1 100644
--- a/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
IUSE="debug"
PATCHES=(
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0298129e1bdc..7ac48364077c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 007c834756f4..dfa7e184c067 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
martijnvanbrummelen/nwipe
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild
index a4d067978175..1b6a9bf475c8 100644
--- a/app-crypt/pesign/pesign-113.ebuild
+++ b/app-crypt/pesign/pesign-113.ebuild
@@ -21,10 +21,11 @@ RDEPEND="
sys-apps/util-linux
sys-libs/efivar
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ sys-boot/gnu-efi
+"
BDEPEND="
sys-apps/help2man
- sys-boot/gnu-efi
virtual/pkgconfig
"
diff --git a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
index a5213875ce93..90e78ab84267 100644
--- a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
@@ -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 ~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="
@@ -30,7 +30,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- gtk? ( app-crypt/gcr )
+ gtk? ( app-crypt/gcr[gtk] )
"
BDEPEND="
sys-devel/gettext
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
index 698ea26d5635..d01517b45c97 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="doc +fapi gcrypt +openssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
deleted file mode 100644
index 3e17a8aa9a91..000000000000
--- a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/doc/Makefile b/doc/Makefile
-index 7c9a643..f88c209 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -3,15 +3,11 @@ TOPDIR=..
- BUILD=..
- endif
-
--DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
-+DELFILES=xca*.html changelog.html database_schema.html
-
--doc: xca.1.gz xca.html changelog.html database_schema.html
-+doc: xca.1 xca.html changelog.html database_schema.html
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.html: xca.sgml
- rm -f xca*.html
- echo 'The documentation for XCA can be viewed online at: http://hohnstaedt.de/documentation.' > $@
-@@ -23,7 +19,7 @@ install: $(doc)
- $(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir)
- $(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir)
- install -m 755 -d $(destdir)$(mandir)/man1
-- install -m 644 *.1.gz $(destdir)/$(mandir)/man1
-+ install -m 644 *.1 $(destdir)/$(mandir)/man1
-
- app: xca.html
- mkdir -p $(APPDIR)/Resources
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 914861528414..8172ed3caafc 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 9fa342620a7a..9269546102b3 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,3 +1,4 @@
DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
DIST free42-nologo-3.0.3.tgz 7443713 BLAKE2B dd9db670aa463343387e66a2ad56f212463c0b02135cb489e8937eb434fa0431228f6120ade8000f357f92a384f5f5bdf53d07fe1d14eb0ad2f81be269a075b8 SHA512 fc5c9520c04eabd5978cc4e8a9e237107605775cf94a4bc3877fedf19d3b94c0c4ee59db9a6a423cf1747ab3e63e479860f3da5968606414824df5b986eba3a1
DIST free42-nologo-3.0.5.tgz 7445153 BLAKE2B dc9ded017b4fa80f0c59c7f59715b00dd23a5b35441f220cd392c3aa1393a132226ab640c3ab049a142ace561de19a6d43904efeaf5bfc37d4fa4fc0174f97f8 SHA512 2e7a3d8808f5dd6568b6abd9a04750726fe6d79eeb9b4cee4f1bec00be6a6156cbc6d6e1c6ccc258ef49d16c22293b50f8a6bdbe7c1b401fffb01afac9ae657a
+DIST free42-nologo-3.0.6.tgz 7449542 BLAKE2B 4b7f69c45e16f412247cd8f7b8e0c958124191c19633e4003a78e150236aa53b4853a63c5227e7f3d13301c30ec60202ad08b7048b67cbacb67906511955ef21 SHA512 dec50856ae1732aaf8f556e642e2ccaec81b00991118536ed67865540afcfd04604e13ac28e255c92869d044d0d3634c742f4e2c745427a2a323814be2415142
diff --git a/app-emulation/free42/free42-3.0.6.ebuild b/app-emulation/free42/free42-3.0.6.ebuild
new file mode 100644
index 000000000000..d25a89b2d1c4
--- /dev/null
+++ b/app-emulation/free42/free42-3.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+ "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+ default
+}
+
+src_compile() {
+ local myconf
+ use alsa && myconf="AUDIO_ALSA=yes"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+ emake -C gtk clean
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+ default
+ dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/sen/metadata.xml b/app-emulation/sen/metadata.xml
index b6ab49948eb6..6798684ab783 100644
--- a/app-emulation/sen/metadata.xml
+++ b/app-emulation/sen/metadata.xml
@@ -1,18 +1,7 @@
-
- nelo@wallus.de
- Nelo-Thara Wallus
-
-
- polynomial-c@gentoo.org
- Lars Wendler
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
TomasTomecek/sen
sen
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2c8e0069ed11..e0a7148a96c2 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,9 +1,9 @@
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
-DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d63471980794238862fab23f06433ecb6adbdd204de49b61f33e7600020d9b3156889709bcd58810f2f332ee890cbb17bd03 SHA512 d92f4e8e3cc81e9ede21135f35679d1b2de07bf75f4fd3878551cae74cdf5165c62573fd9e143458535565e21e8888f7f61cc413fdcef24f8958ac2de366a10a
+DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c
DIST wine-staging-6.14.tar.gz 9658088 BLAKE2B d64bc0476b3d46b9ba812c956bb1eab1e4c3ec0dbd2145ae1f38c95ebd9b7151222e375690c1bd601f3416f362e50ea3f670e9940977005dc67623de22e82485 SHA512 5b4db5c1af316c8e18e2e318152a44e45521dd939e3a341dd533e819263109237c4fd0e25ee2b23bb7cc75f4c4afd7d8900b23d83f955e4ff56ee5fe7aa84fd0
DIST wine-staging-6.15.tar.gz 9654539 BLAKE2B 943cebf79bfe906a9dde42cfae13443059d89cd8996a2d25fad685796605a3a45b05f960c9dfb05d968ed919a23b273ecc56aa4fcd98cc38dcc45c22813d830e SHA512 652e8319e4a06f64b7e4c05a139194b6b7189777632d26d79a3160447339cc5a93b42d810d8379eb7821485ccbbe8cd8e16e09e5223886027fae2f7737b8a115
+DIST wine-staging-6.16.tar.gz 9655388 BLAKE2B 50feca959b0ff9056ed9e6f81f3dd11350391f30e4048ee6e4d4e5feaa837e31b580c22e63b6213fc77d866b362eb7922fd2c076bd9b6675abfe591a178a2d9c SHA512 2789200466adaae2f4fa4afcbb6aa88619748e69a2cb39c1ac957b408c8021e2cbac7ad0b1f2e295cd87640f494e173739df076743ec0606e4b13e83d0ac2824
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.16.ebuild
similarity index 98%
rename from app-emulation/wine-staging/wine-staging-6.12.ebuild
rename to app-emulation/wine-staging/wine-staging-6.16.ebuild
index 5ee92b570653..1b3a52f79703 100644
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.16.ebuild
@@ -28,7 +28,7 @@ else
fi
S="${WORKDIR}/${MY_P}"
-STAGING_P="wine-staging-${MY_PV}.1"
+STAGING_P="wine-staging-${MY_PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
GWP_V="20200523"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
@@ -43,7 +43,7 @@ if [[ ${MY_PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.1.tar.gz -> ${STAGING_P}.tar.gz )"
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -96,7 +96,6 @@ COMMON_DEPEND="
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
@@ -134,7 +133,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:6.2.0 )
+ mono? ( app-emulation/wine-mono:6.3.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -172,7 +171,6 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
- "${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
)
PATCHES_BIN=()
@@ -572,7 +570,7 @@ multilib_src_install_all() {
plocale_for_each_locale add_locale_docs
einstalldocs
- find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 380873062317..35bcbf162a2b 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,7 +1,7 @@
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
+DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
index f233885c99eb..a639f2cd4e39 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 x86"
+ KEYWORDS="-* amd64 x86"
fi
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild
similarity index 99%
rename from app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild
index abcc1fe86364..7b3156ca675a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
@@ -110,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:6.2.0 )
+ mono? ( app-emulation/wine-mono:6.3.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -144,7 +143,6 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
- "${FILESDIR}/wine-vanilla-6.12-winegcc-equals-args.patch" #800809
)
PATCHES_BIN=()
@@ -493,7 +491,7 @@ multilib_src_install_all() {
plocale_for_each_locale add_locale_docs
einstalldocs
- find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 0e90059e5f16..23eabc5f7daf 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,2 +1,3 @@
DIST winetricks-20210206.tar.gz 690837 BLAKE2B a1d068e9659f6b176873af49994f1e0ca884eaa1ac9b8f5dd6d7abe79a2b8b827a2334efa7862547b17cca5bcfc285ce2d65ac0e5736cddcc777d4df2dbc7af9 SHA512 57f2ce5fe531eb6ee9a578ca565fadf5ef2e6e1379abee640ee9dc0d6000c92ce983c7507002bc6ace613d6d0dd03260ede11f7bf267adf19eb67900a0449f58
+DIST winetricks-20210825.tar.gz 689728 BLAKE2B 32fc9639f215180e03c79d55359c7aa005c005ed6a3a21916de7172dc541994a786b64f8323034b3e43e0619569b39f79dc98830546db1d684badf96cdb898c4 SHA512 b9eb61a0bfe4001cb23f41f3b4707333be81660372347b5e8fe887fe1e2278bd5e2b91e0c5ddd73010652902a8985f0e253792c8769216de397ca75fac8b0c81
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
diff --git a/app-emulation/winetricks/winetricks-20210825.ebuild b/app-emulation/winetricks/winetricks-20210825.ebuild
new file mode 100644
index 000000000000..89dcbb57c973
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20210825.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+wtg="winetricks-gentoo-2012.11.24"
+
+SRC_URI="${SRC_URI}
+ gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+ kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
+
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/bashate
+ dev-util/checkbashisms
+ || (
+ dev-util/shellcheck-bin
+ dev-util/shellcheck
+ )
+ )
+"
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-arch/cabextract
+ app-arch/p7zip
+ app-arch/unzip
+ net-misc/wget
+ virtual/wine
+ x11-misc/xdg-utils
+ gtk? ( gnome-extra/zenity )
+ kde? ( kde-apps/kdialog )
+ rar? ( app-arch/unrar )
+"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+ if [[ ${PV} == "99999999" ]]; then
+ git-r3_src_unpack
+
+ if use gtk || use kde; then
+ unpack ${wtg}.tar.bz2
+ fi
+
+ else
+ default
+ fi
+}
+
+src_test() {
+ ./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+ default
+
+ if ! use gtk && ! use kde; then
+ rm -r "${ED}"/usr/share/applications || die
+ rm -r "${ED}"/usr/share/icons || die
+ fi
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index ff1176797fe9..7cfaa4102a1f 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild
index 3ff3114139a4..8dc15b63e917 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
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 a1a0257189ca..a88d776c25e6 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2.ebuild
@@ -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 ~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-renpy/Manifest b/app-eselect/eselect-renpy/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild b/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild
deleted file mode 100644
index 1f7c3d96da07..000000000000
--- a/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Manages renpy symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- app-eselect/eselect-lib-bin-symlink
- ! "${WORKDIR}"/renpy.eselect || die
- eapply_user
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins renpy.eselect
-}
-
-pkg_preinst() { :; }
-
-pkg_postinst() { :; }
diff --git a/app-eselect/eselect-renpy/files/renpy.eselect-0.7 b/app-eselect/eselect-renpy/files/renpy.eselect-0.7
deleted file mode 100644
index 67199267bc57..000000000000
--- a/app-eselect/eselect-renpy/files/renpy.eselect-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage default renpy version"
-MAINTAINER="bircoph@gentoo.org"
-VERSION="0.7"
-
-SYMLINK_PATH="@BINDIR@/renpy"
-SYMLINK_TARGETS=( renpy-6.99 )
-SYMLINK_DESCRIPTION='default renpy'
-SYMLINK_CRUCIAL=1
-
-inherit bin-symlink
-
diff --git a/app-eselect/eselect-renpy/metadata.xml b/app-eselect/eselect-renpy/metadata.xml
deleted file mode 100644
index bc881dba500a..000000000000
--- a/app-eselect/eselect-renpy/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- bircoph@gentoo.org
- Andrew Savchenko
-
-
-
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3b075d70de24..db203cbff740 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index cccf13fccfe0..a5ee3abc37f6 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
+DIST ibus-anthy-1.5.12.tar.gz 825323 BLAKE2B 4d81a5885e4ad6cfc7a10ecb61bf998a76c24049e58841f84ed31f45a8ab5e91cfd2c60be3a66008f97317047487bedcf956b9126fa17602c6f8a29950687b84 SHA512 6950a2865e4753831f8918f4a5926571bc8304454b6368662ef56a6fb11a60f0675e3d589108ebfd38cb5d193f7b61053a10baa6dad23adad67b3b3fc58760e8
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
index 26c60f321884..5c0306fb49f8 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
similarity index 94%
rename from app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
rename to app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
index 211a9f814861..553ff6d1baf3 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-
PYTHON_COMPAT=( python3_{8,9} )
+
inherit gnome2-utils python-single-r1 xdg
DESCRIPTION="Japanese Anthy engine for IBus"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -24,8 +24,7 @@ RDEPEND="${PYTHON_DEPS}
')
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
- virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
sys-devel/gettext"
src_prepare() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f0453f267920..ed9a0b522627 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
similarity index 94%
rename from app-misc/sphinx/sphinx-2.2.11-r2.ebuild
rename to app-misc/sphinx/sphinx-2.2.11-r4.ebuild
index 9b55c9c47208..0c4666a146d4 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
@@ -22,12 +22,12 @@ IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
RDEPEND="
- mysql? ( dev-db/mysql-connector-c )
- mariadb? ( dev-db/mariadb-connector-c )
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:= )
postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
- stemmer? ( dev-libs/snowball-stemmer )
+ re2? ( dev-libs/re2:= )
+ stemmer? ( dev-libs/snowball-stemmer:= )
xml? ( dev-libs/expat )
virtual/libiconv"
diff --git a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
similarity index 95%
rename from app-misc/sphinx/sphinx-2.2.11-r3.ebuild
rename to app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 5ee036e63750..66f738edfe48 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -20,11 +20,11 @@ IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
RDEPEND="
- mysql? ( dev-db/mysql-connector-c )
- mariadb? ( dev-db/mariadb-connector-c )
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:= )
postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
xml? ( dev-libs/expat )
virtual/libiconv"
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
index c11b348c2830..d31f7eee5c72 100644
--- a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
RDEPEND="
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-2.3.5.ebuild
rename to app-misc/tracker/tracker-2.3.5-r1.ebuild
index 0c98fe546103..075fe61e41e7 100644
--- a/app-misc/tracker/tracker-2.3.5.ebuild
+++ b/app-misc/tracker/tracker-2.3.5-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
>=dev-libs/libxml2-2.7
>=dev-db/sqlite-3.20.0
networkmanager? ( >=net-misc/networkmanager-0.8 )
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
sys-apps/util-linux
"
DEPEND="${RDEPEND}"
diff --git a/app-misc/tracker/tracker-2.3.6.ebuild b/app-misc/tracker/tracker-2.3.6-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-2.3.6.ebuild
rename to app-misc/tracker/tracker-2.3.6-r1.ebuild
index 66c91276a490..4d53b8b4e6de 100644
--- a/app-misc/tracker/tracker-2.3.6.ebuild
+++ b/app-misc/tracker/tracker-2.3.6-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
>=dev-libs/libxml2-2.7
>=dev-db/sqlite-3.20.0
networkmanager? ( >=net-misc/networkmanager-0.8 )
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
sys-apps/util-linux
"
DEPEND="${RDEPEND}"
diff --git a/app-misc/tracker/tracker-3.1.2.ebuild b/app-misc/tracker/tracker-3.1.2-r1.ebuild
similarity index 95%
rename from app-misc/tracker/tracker-3.1.2.ebuild
rename to app-misc/tracker/tracker-3.1.2-r1.ebuild
index 8b0fe7d06283..1c0b8e6d0acb 100644
--- a/app-misc/tracker/tracker-3.1.2.ebuild
+++ b/app-misc/tracker/tracker-3.1.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +miners stemmer test"
RESTRICT="!test? ( test )"
@@ -27,7 +27,7 @@ RDEPEND="
>=net-libs/libsoup-2.40.1:2.4
>=dev-libs/libxml2-2.7
>=dev-db/sqlite-3.29.0
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
"
DEPEND="${RDEPEND}"
BDEPEND="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 609abf55ab57..716de09893e8 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/skrooge/skrooge-2.26.1.ebuild b/app-office/skrooge/skrooge-2.26.1.ebuild
index b169e5038dcf..b6a539031f7f 100644
--- a/app-office/skrooge/skrooge-2.26.1.ebuild
+++ b/app-office/skrooge/skrooge-2.26.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 94a9dfccaebe..06b8793867ce 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 6344aa49022c..1070f6bb4e06 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1 +1,2 @@
DIST elt-patches-20201205.tar.xz 39240 BLAKE2B aa2e2377f0d0cba14f38c59664174d066eff04c9d2a71346c998c4324987fbce25cfd91b79e8e40bde0d81bf7d3c43126bffd0a6b0b219aaad11f4f9f22abde4 SHA512 67e199f060e2c93e01b7a7809f52c0a18d82e86f1b1eb34b965c2acd24e5538a874b820028e363d3002cf58b43c2fe3376ae28d2bef0ca81feabb90c83ae47c2
+DIST elt-patches-20210827.tar.xz 39264 BLAKE2B 271565e4ab906374ca30f69f5ebc8c14cbda5c176b7d54de4315adf83c12111cab4d04254f5bbbc13cf6bc701ba8a940def98e3a983d199ca6aedfe82a280682 SHA512 bf7d50df82e6335879ba4e130817bce67c4e63c55e2ac7249fa35b60f6b73290f857562433477907283b41b137bf12ee254b5bea20f8eebf173c6584d74f5e49
diff --git a/app-portage/elt-patches/elt-patches-20210827.ebuild b/app-portage/elt-patches/elt-patches-20210827.ebuild
new file mode 100644
index 000000000000..bc94d8304da6
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20210827.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+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"
+
+RDEPEND="sys-apps/gentoo-functions"
+BDEPEND="app-arch/xz-utils"
+
+src_compile() {
+ emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
+}
diff --git a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
index 7637b8439253..a4a8c6a5377a 100644
--- a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
@@ -33,7 +33,7 @@ pkg_postinst() {
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
elog "the example bashrc directly by creating a symlink:"
elog
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
elog
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
fi
diff --git a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild
index c8f5f248d61c..1152e307b338 100644
--- a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild
@@ -36,7 +36,7 @@ pkg_postinst() {
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
elog "the example bashrc directly by creating a symlink:"
elog
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
elog
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
fi
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 94f757693e21..0af26d4a3147 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -25,7 +25,12 @@ RDEPEND="
BDEPEND="test? ( ${RDEPEND} )"
src_configure() {
- meson_src_configure -Ddocdir=${PF}
+ local emesonargs=(
+ -Ddocdir=${PF}
+ -Deprefix="${EPREFIX}"
+ $(meson_use test)
+ )
+ meson_src_configure
}
pkg_postinst() {
@@ -36,7 +41,7 @@ pkg_postinst() {
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
elog "the example bashrc directly by creating a symlink:"
elog
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
elog
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
fi
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 21d12a169082..608f2fde4947 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1 @@
-DIST nattka-0.2.13.tar.gz 93917 BLAKE2B 48e5245234d0ef0fd47353bac0d971d6187f59d94c0fb58f4cce160ee28f847a8fb32f8399af3148daaac299b32b590899de716dee1ee9cf107b1efe2451189f SHA512 0d3428cb3b5dee3fcdc29b9d22b5c05d626d26060fcd5518f789493fc68e51762edf9162a9b5b19c6c08fb9cb9c0e350faa41d96c53bd924b50475176140ccdb
-DIST nattka-0.2.14.tar.gz 93925 BLAKE2B 2fa31e8b4ea8aa74d2af52e5a410288715495997c328c5415a65200a077a385eacb3050e593c778194f2e519fd28d2273679d822e0be55b815e19ff38882dfe3 SHA512 28e24576606813d56c8e37cdd203960a67394893b819d846595a03fd222f6ed2fd319bc5d650f229bf7a8979d3823f28de82a87e3bb76fdaf49e9e02dbf62ac5
-DIST nattka-0.2.18.tar.gz 94668 BLAKE2B 02e656eb079b76d0eea87093e9c58b57d29b53954d9301da42eef301373c742a06f80432831cfe27b6765f83420bf37d726933e8424ed842cd80b8fae6242c04 SHA512 fb4abbedbf50dab754721585ea6c50a0e220deb83e005a4e34215f9a66536ff131aa0bb4f2e25854c853f4aab4cdce7137e909d79f609f3e4b2a9964be5bfc57
DIST nattka-0.2.19.tar.gz 93800 BLAKE2B 65efff2454cdb24f3b71dc5713adbf3bda3976ed958622f7adec14e3708a53531aac6801e838fd21346ce02974fa79bcb82c3f4d2a6555095fa8d81db9ad2992 SHA512 7508a78fa774a9229caa573426839ec84210e9a2d38b7ca9cd47d857b9922b946e9e31fadf946f001565ce6dc65103bca8af58935d7eb2fcf32da423345ce61a
diff --git a/app-portage/nattka/nattka-0.2.13.ebuild b/app-portage/nattka/nattka-0.2.13.ebuild
deleted file mode 100644
index 5e140d0ba09c..000000000000
--- a/app-portage/nattka/nattka-0.2.13.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.2.14.ebuild b/app-portage/nattka/nattka-0.2.14.ebuild
deleted file mode 100644
index 75261fa77b65..000000000000
--- a/app-portage/nattka/nattka-0.2.14.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.2.18.ebuild b/app-portage/nattka/nattka-0.2.18.ebuild
deleted file mode 100644
index 75261fa77b65..000000000000
--- a/app-portage/nattka/nattka-0.2.18.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.2.19.ebuild b/app-portage/nattka/nattka-0.2.19.ebuild
index 75261fa77b65..5e140d0ba09c 100644
--- a/app-portage/nattka/nattka-0.2.19.ebuild
+++ b/app-portage/nattka/nattka-0.2.19.ebuild
@@ -12,7 +12,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-text/Manifest.gz b/app-text/Manifest.gz
index 0196d012c302..51eb34e7eeea 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/calibre-5.25.0.ebuild b/app-text/calibre/calibre-5.25.0-r1.ebuild
similarity index 99%
rename from app-text/calibre/calibre-5.25.0.ebuild
rename to app-text/calibre/calibre-5.25.0-r1.ebuild
index a10b4359bcb4..419397284072 100644
--- a/app-text/calibre/calibre-5.25.0.ebuild
+++ b/app-text/calibre/calibre-5.25.0-r1.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
>=dev-libs/dbus-glib-0.106
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
>=sys-apps/dbus-1.10.8
$(python_gen_cond_dep '
>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index 484d0e72473a..db8c331274e9 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 7a5f39aa232e..595d263abfd1 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
index 11d4bb473a0c..d64fa8636548 100644
--- a/app-text/evince/evince-40.4.ebuild
+++ b/app-text/evince/evince-40.4.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
index f754d7d1f1f6..8228c7822e6f 100644
--- a/app-text/gspell/gspell-1.9.1.ebuild
+++ b/app-text/gspell/gspell-1.9.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 5989f5c08519..3ee204c953f5 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1 +1,2 @@
DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
+DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d
diff --git a/app-text/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.7.0.ebuild
new file mode 100644
index 000000000000..b89d5b65020f
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-${P}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( ChangeLog.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+ local std loc all_locales=()
+
+ ebegin "Looking for new locales"
+ for std in "${all_stds[@]}"; do
+ pushd "${std}" >/dev/null || die
+ for loc in *.po; do
+ all_locales+=( "${loc%.po}" )
+ done
+ popd >/dev/null
+ done
+
+ all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+ if [[ ${PLOCALES} != "${all_locales}" ]]; then
+ eend 1
+ eerror "There are changes in locales! This ebuild should be updated to:"
+ eerror "PLOCALES=\"${all_locales}\""
+ die "Update PLOCALES in the ebuild"
+ else
+ eend 0
+ fi
+}
+
+src_prepare() {
+ default
+
+ local std loc mylinguas
+ local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+ check_existing_locales
+
+ # Modify the Makefiles so they only install requested locales.
+ for std in "${all_stds[@]}"; do
+ einfo "Preparing ${std} ..."
+ pushd "${std}" >/dev/null || die
+ mylinguas=()
+ for loc in *.po; do
+ if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+ mylinguas+=( "${loc}" )
+ fi
+ done
+
+ sed \
+ -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+ -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+ -i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+ popd >/dev/null
+ done
+}
diff --git a/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch b/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch
deleted file mode 100644
index c52e4c0957ef..000000000000
--- a/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://github.com/wofr06/lesspipe/commit/428062937e99f5a5da5c5f94fecba5b13557d973.patch
-
-Dropped ChangeLog + README hunks, but not weeded out the tiny MP4 change.
-
-From 428062937e99f5a5da5c5f94fecba5b13557d973 Mon Sep 17 00:00:00 2001
-From: wf
-Date: Sun, 8 Aug 2021 21:26:17 +0200
-Subject: [PATCH] make all tests in the test suite work
-
----
- lesspipe.sh | 6 +++---
- lesspipe.sh.in | 6 +++---
- 4 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/lesspipe.sh b/lesspipe.sh
-index 0bf3cb9..22c10b2 100755
---- a/lesspipe.sh
-+++ b/lesspipe.sh
-@@ -54,7 +54,7 @@ filecmd() {
- TMPDIR=${TMPDIR:-/tmp}
- sep=: # file name separator
- altsep== # alternate separator character
--if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then
-+if [[ -e "$1" && "$1" = *$sep* ]]; then
- sep=$altsep
- xxx="${1%=}"
- set "$xxx"
-@@ -773,7 +773,7 @@ isfinal() {
- elif [[ "$PARSEHTML" = yes && "$1" = *HTML$NOL_A_P* ]]; then
- msg "append $sep to filename to view the HTML source"
- parsehtml "$2"
-- elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then
-+ elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then
- if [[ "$PARSEHTML" = yes ]]; then
- msg "append $sep to filename to view the PDF source"
- istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml -
-@@ -952,7 +952,7 @@ isfinal() {
- elif [[ "$1" = *mp3* ]] && cmd_exist id3v2; then
- msg "append $sep to filename to view the raw data"
- istemp "id3v2 --list" "$2"
-- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
-+ elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
- msg "append $sep to filename to view the raw data"
- mediainfo --Full "$2"
- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist exiftool; then
-diff --git a/lesspipe.sh.in b/lesspipe.sh.in
-index 8819dad..a099a84 100755
---- a/lesspipe.sh.in
-+++ b/lesspipe.sh.in
-@@ -56,7 +56,7 @@ TMPDIR=${TMPDIR:-/tmp}
- sep=: # file name separator
- altsep== # alternate separator character
- # if the separator is part of the file name then altsep is used
--if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then
-+if [[ -e "$1" && "$1" = *$sep* ]]; then
- sep=$altsep
- xxx="${1%=}"
- set "$xxx"
-@@ -942,7 +942,7 @@ isfinal() {
- msg "append $sep to filename to view the HTML source"
- parsehtml "$2"
- #ifdef pdftotext
-- elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then
-+ elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then
- if [[ "$PARSEHTML" = yes ]]; then
- msg "append $sep to filename to view the PDF source"
- istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml -
-@@ -1202,7 +1202,7 @@ isfinal() {
- mp3info "$2"
- #endif
- #ifdef mediainfo
-- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
-+ elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
- msg "append $sep to filename to view the raw data"
- mediainfo --Full "$2"
- #ifdef exiftool
diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2.ebuild
index 4ed7f9aa4718..f92890236f9c 100644
--- a/app-text/libgxps/libgxps-0.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="gtk-doc +introspection jpeg lcms tiff"
RDEPEND="
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index beb6199c9642..0266650c7a4e 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,47 +1,2 @@
-DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
-DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
-DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
-DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
-DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
-DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
-DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
-DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
-DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
-DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
-DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
-DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
-DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
-DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
-DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
-DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
-DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
-DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
-DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
-DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
-DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
-DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
-DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
-DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
-DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
-DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
-DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
-DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
-DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
-DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
-DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
-DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
-DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
-DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
-DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
-DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
-DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
DIST tesseract-5.0.0_beta20210815.tar.gz 1914265 BLAKE2B eadefb46a84fcc73d3da7a1780d1e0669840183266176021871e57ca55c79e9b56a78334414732b9024ae911cee522069c3170bf71af877c46c1ffae37c88b3f SHA512 4b78af9119c35d783e47523b41ee8bbf63913f8c122e94b6e6538a4cbab8e751df9f00f3a50d48e8a7beb948c6b23794e2481721696bf3e0f284de8aa6e9e8e7
-DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
-DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
-DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
-DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
-DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
deleted file mode 100644
index d6250d66c056..000000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli
-Date: Fri, 27 Jan 2017 12:02:54 +0100
-Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
-
----
- viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
-
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+ LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+ DWORD threadid;
-+ HANDLE newthread = CreateThread(
-+ NULL, // default security attributes
-+ 0, // use default stack size
-+ f, // thread function
-+ arg, // argument to thread function
-+ 0, // use default creation flags
-+ &threadid); // returns the thread identifier
-+#else
-+ pthread_t helper;
-+ pthread_attr_t attr;
-+ pthread_attr_init(&attr);
-+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+ pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
-
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
-
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
-- LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-- DWORD threadid;
-- HANDLE newthread = CreateThread(
-- NULL, // default security attributes
-- 0, // use default stack size
-- f, // thread function
-- arg, // argument to thread function
-- 0, // use default creation flags
-- &threadid); // returns the thread identifier
--#else
-- pthread_t helper;
-- pthread_attr_t attr;
-- pthread_attr_init(&attr);
-- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-- pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
- mutex_send_->Lock();
---
-2.12.0
-
diff --git a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
deleted file mode 100644
index ad1f0f3df208..000000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am 2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am 2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- com/google/scrollview/ScrollView.class
-
- SCROLLVIEW_LIBS = \
-- piccolo2d-core-3.0.jar \
-- piccolo2d-extras-3.0.jar
-+ /usr/share/piccolo2d/lib/piccolo2d.jar
-
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
-
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- $(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am 2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am 2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
-
- libtesseract_viewer_la_SOURCES = \
- scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 8a74de4013f4..6bc9c8ca0db6 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -17,9 +17,6 @@
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
deleted file mode 100644
index d237b25cfbfd..000000000000
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
- l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
- l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
- l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
- l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
- l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
- ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
- l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
- ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
- l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
- l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
- l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
- l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
- l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
- l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
- l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
- l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
- l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
- l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
- l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
- l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
- l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
- l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
- l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
- l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
- l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
- l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
- l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
- l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
- ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
- l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
- l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
- l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
- l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
- l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
- l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
- l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
- l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
- l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
- l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- scrollview? (
- >=dev-java/piccolo2d-3.0:0
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )
- scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
- scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
- "${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
-src_prepare() {
- default
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable opencl)
- $(use_enable scrollview graphics)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
- find "${ED}" -name '*.la' -delete || die
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins testing/eurotext.tif testing/phototest.tif
- fi
-
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
- use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
deleted file mode 100644
index ac660c1f07d3..000000000000
--- a/app-text/tesseract/tesseract-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
-
-COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl[${MULTILIB_USEDEP}]
- media-libs/tiff:0=[${MULTILIB_USEDEP}]
- media-libs/leptonica:=[tiff]
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-RDEPEND="${COMMON_DEPEND}
- || (
- >=app-text/tessdata_fast-4.0.0
- >=app-text/tessdata_best-4.0.0
- >=app-text/tessdata_legacy-4.0.0
- )"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- doc? ( app-doc/doxygen )"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- # scrollview disabled for now, see bug #686944
- local myeconfargs=(
- --enable-shared
- --disable-graphics
- $(use_enable opencl)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- default
- if multilib_is_native_abi; then
- use doc && emake doc
- use training && emake training
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
- if use doc; then
- HTML_DOCS=( doc/html/. )
- fi
- einstalldocs
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
- fi
- emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild b/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
index 0b194b123b8d..0cd624612031 100644
--- a/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
+++ b/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
@@ -11,8 +11,8 @@ BETA_PV=$(ver_rs 3-4 "-")
SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${BETA_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 566b3cbb2b3a..4b33ac9a3592 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 9d013fae80bf..abf01dfad4f1 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1 +1,2 @@
DIST gentoo-syntax-20210716.tar.bz2 18872 BLAKE2B faef2f356331c8560cb8e8014ad1a32a299f94fe8d05be499955cb78f1537f85abe44864b782df34244c3e606443b2146bd58a55047b23d327a548a436e818dc SHA512 f1a374fb5cf05563ea8cafa2209c9e8ba62bc072cac99202f486c3f7412cbb63432a33830e285ba706f8f73ee7f7bfd4e0b30bfad6feee1643e862b86495b82e
+DIST gentoo-syntax-20210828.tar.bz2 18872 BLAKE2B bd3e152718b921aef8ce93e2d3e66d6195ab01801ea60987f62f9cb541fb726c2d552b6ec341943c1ca0e0cc1419c1cb75266e653b8bc958c8103855688f3d54 SHA512 e148c42b3e3281780d4f23ff1e464ba3c8404b3a4ba566a1a685c8364b6dd174830b489d5c7b561c3e30375fd9f510cfbf56d92f81c3f8fec8ab792ab48aa62a
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
new file mode 100644
index 000000000000..72f25ef766b6
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+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/${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"
+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/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
index 7dd20ae4fcd5..3b06797c2685 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
LICENSE="vim"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index db9de2cfd46e..5afa18241413 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
index 9dbe74b38688..ddf446bf81f9 100644
--- a/dev-cpp/aixlog/metadata.xml
+++ b/dev-cpp/aixlog/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-cpp/popl/metadata.xml b/dev-cpp/popl/metadata.xml
index f8460c972b8a..ebdd4ab67ba1 100644
--- a/dev-cpp/popl/metadata.xml
+++ b/dev-cpp/popl/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index 4d034ae1f843..c032dbd97ffa 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
sparsehash/sparsehash
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 09c102ae9ce7..e9e23208518d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index a2dd2c71b29a..73ca328b0351 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="!dev-db/tinycdb"
RDEPEND="${DEPEND}"
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 526775f840ff..ccab97d2dad3 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,6 +1,2 @@
-DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
-DIST LMDB_0.9.24.tar.gz 143916 BLAKE2B f075ec5f4dfb77685188229e20f12c4febe8295c7d35ed15c3db492b68af68cc7f76741078e9bb524d2c38587839f542e964af1e5d6d984bb28bd602caabbb8d SHA512 c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1
-DIST openldap-LMDB_0.9.26.tar.gz 144029 BLAKE2B 07fe81cdaed7a402aaf485a2aa41d12c2c8cc8813d39d5304d8a1f5c8920f4695021eb586b4366a5f55010284227c7ac16487a8799c60f251ea97cd745b1261a SHA512 d7826f6d1a3144feb71eef65f843e8bcddf6cec384014bab3fc1d32a7f1b9316bcbb5b3a915b166cbdae2ffbd15f14b4eb783acd7eddbd2e321607f750efe94d
-DIST openldap-LMDB_0.9.27.tar.gz 144104 BLAKE2B 76b7b66ca455f61f71b7c010de0b5437d02a245a5129184cf45bf5684a745888c88012fb73a219076b6c47adfda0804e6c7f603e4631c98034c01efda99ad3a9 SHA512 a27c0d26c801b172f3c207666940f86ecaae9d223843b72823d064f0ea0629a855150d049cb143981783710d3ca791c7f0f65df9d91732b2709e6107af403854
DIST openldap-LMDB_0.9.28.tar.gz 144520 BLAKE2B 3466da1ffde7350056fb3b16fc0068d78139c578fdf79cd6456ca0d98e2d7b3d899849ae42a7224335a4680e52b5f0feb2c4233eaf00ee3d9ee648ae10c3114a SHA512 0cdf9a2ce35617a3135cde96491fbbb73be9362de2b94d23eda44b65ce48362ff9dbdfe921c3255ed486aceb385fcb62b81f560b1037476f4741291b29ba0dce
DIST openldap-LMDB_0.9.29.tar.gz 144545 BLAKE2B b7e55e4fa03e878a95b8f7c583684727a81d51a3acf2ec064d8fe26475bf9ffe4dddf16c2bccbda901b94b7c8d57f41fa63f7c09bcab46401bd000958a5b87b3 SHA512 b41ba5b139375d23617a79f4d322399df55745c5a4a63159ddbe0f1ded4707f0eb7f71acf3d1a4928f8fcab30a7b5db17e3e165441a61ec1dbd29f8d9efa65d1
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
deleted file mode 100644
index a3f04ec4d48c..000000000000
--- a/dev-db/lmdb/lmdb-0.9.23.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="https://symas.com/lmdb/technical/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
-
-src_prepare() {
- eapply_user
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
- # posix_memalign isn't available before 10.6, but on OSX
- # malloc is always aligned for any addressable type
- sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
- fi
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local soname="-Wl,-soname,liblmdb$(get_libname 0)"
- [[ ${CHOST} == *-darwin* ]] && \
- soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
- sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
- -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
- -e "s!^AR.*!AR = $(tc-getAR)!" \
- -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
- -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
- -e "/^libdir/s!lib\$!$(get_libdir)!" \
- -e "s!shared!shared ${soname}!" \
- "Makefile" || die
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fdatasync lives in -lrt on Solaris 10
- [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
- fi
-}
-
-multilib_src_compile() {
- emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
- "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
- dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${FILESDIR}/lmdb.pc"
- sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
- -e "s!@prefix@!${EPREFIX}/usr!g" \
- -e "s!@libdir@!$(get_libdir)!" \
- "${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
-
- if ! use static-libs; then
- rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
- fi
-}
diff --git a/dev-db/lmdb/lmdb-0.9.24.ebuild b/dev-db/lmdb/lmdb-0.9.24.ebuild
deleted file mode 100644
index 47e317b2c8a7..000000000000
--- a/dev-db/lmdb/lmdb-0.9.24.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-MY_P="${PN^^}_${PV}"
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="https://symas.com/lmdb/technical/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/${MY_P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_P}/libraries/liblmdb"
-
-src_prepare() {
- default
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
- # posix_memalign isn't available before 10.6, but on OSX
- # malloc is always aligned for any addressable type
- sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
- fi
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local soname="-Wl,-soname,liblmdb$(get_libname 0)"
- [[ ${CHOST} == *-darwin* ]] && \
- soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
- sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
- -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
- -e "s!^AR.*!AR = $(tc-getAR)!" \
- -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
- -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
- -e "/^libdir/s!lib\$!$(get_libdir)!" \
- -e "s!shared!shared ${soname}!" \
- "Makefile" || die
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fdatasync lives in -lrt on Solaris 10
- [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
- fi
-}
-
-multilib_src_compile() {
- emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
- "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
- dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${FILESDIR}/lmdb.pc"
- sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
- -e "s!@prefix@!${EPREFIX}/usr!g" \
- -e "s!@libdir@!$(get_libdir)!" \
- "${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
-
- if ! use static-libs; then
- rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
- fi
-}
diff --git a/dev-db/lmdb/lmdb-0.9.26.ebuild b/dev-db/lmdb/lmdb-0.9.26.ebuild
deleted file mode 100644
index 610df78af69d..000000000000
--- a/dev-db/lmdb/lmdb-0.9.26.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
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-MY_P="${PN^^}_${PV}"
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="https://symas.com/lmdb/technical/"
-SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-${MY_P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb"
-
-src_prepare() {
- default
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
- # posix_memalign isn't available before 10.6, but on OSX
- # malloc is always aligned for any addressable type
- sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
- fi
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local soname="-Wl,-soname,liblmdb$(get_libname 0)"
- if [[ ${CHOST} == *-darwin* ]] ; then
- soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
- replace-flags -O[123456789] -O1
- fi
- sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
- -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
- -e "s!^AR.*!AR = $(tc-getAR)!" \
- -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
- -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
- -e "/^libdir/s!lib\$!$(get_libdir)!" \
- -e "s!shared!shared ${soname}!" \
- "Makefile" || die
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fdatasync lives in -lrt on Solaris 10
- [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
- fi
-}
-
-multilib_src_compile() {
- emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
- "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
- dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${FILESDIR}/lmdb.pc"
- sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
- -e "s!@prefix@!${EPREFIX}/usr!g" \
- -e "s!@libdir@!$(get_libdir)!" \
- "${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
-
- if ! use static-libs; then
- rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
- fi
-}
diff --git a/dev-db/lmdb/lmdb-0.9.27.ebuild b/dev-db/lmdb/lmdb-0.9.27.ebuild
deleted file mode 100644
index 610df78af69d..000000000000
--- a/dev-db/lmdb/lmdb-0.9.27.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
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-MY_P="${PN^^}_${PV}"
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="https://symas.com/lmdb/technical/"
-SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-${MY_P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb"
-
-src_prepare() {
- default
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
- # posix_memalign isn't available before 10.6, but on OSX
- # malloc is always aligned for any addressable type
- sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
- fi
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local soname="-Wl,-soname,liblmdb$(get_libname 0)"
- if [[ ${CHOST} == *-darwin* ]] ; then
- soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
- replace-flags -O[123456789] -O1
- fi
- sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
- -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
- -e "s!^AR.*!AR = $(tc-getAR)!" \
- -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
- -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
- -e "/^libdir/s!lib\$!$(get_libdir)!" \
- -e "s!shared!shared ${soname}!" \
- "Makefile" || die
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fdatasync lives in -lrt on Solaris 10
- [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
- fi
-}
-
-multilib_src_compile() {
- emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
- "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
- dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${FILESDIR}/lmdb.pc"
- sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
- -e "s!@prefix@!${EPREFIX}/usr!g" \
- -e "s!@libdir@!$(get_libdir)!" \
- "${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
-
- if ! use static-libs; then
- rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
- fi
-}
diff --git a/dev-db/lmdb/lmdb-0.9.29.ebuild b/dev-db/lmdb/lmdb-0.9.29.ebuild
index 74b511a5c9d2..638f04abd994 100644
--- a/dev-db/lmdb/lmdb-0.9.29.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-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="static-libs"
DEPEND=""
diff --git a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
deleted file mode 100644
index 85d378f8232c..000000000000
--- a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
-
---- a/sql/wsrep_sst.cc
-+++ b/sql/wsrep_sst.cc
-@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method,
- return arg.err;
- }
-
-+/* return true if character can be a part of a filename */
-+static bool filename_char(int const c)
-+{
-+ return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
-+}
-+
-+/* return true if character can be a part of an address string */
-+static bool address_char(int const c)
-+{
-+ return filename_char(c) ||
-+ (c == ':') || (c == '[') || (c == ']') || (c == '/');
-+}
-+
-+static bool check_request_str(const char* const str,
-+ bool (*check) (int c))
-+{
-+ for (size_t i(0); str[i] != '\0'; ++i)
-+ {
-+ if (!check(str[i]))
-+ {
-+ WSREP_WARN("Illegal character in state transfer request: %i (%c).",
-+ str[i], str[i]);
-+ return true;
-+ }
-+ }
-+
-+ return false;
-+}
-+
- wsrep_cb_status_t wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx,
- const void* msg, size_t msg_len,
- const wsrep_gtid_t* current_gtid,
- const char* state, size_t state_len,
- bool bypass)
- {
-- /* This will be reset when sync callback is called.
-- * Should we set wsrep_ready to FALSE here too? */
--
-- wsrep_config_state->set(WSREP_MEMBER_DONOR);
--
- const char* method = (char*)msg;
- size_t method_len = strlen (method);
-+
-+ if (check_request_str(method, filename_char))
-+ {
-+ WSREP_ERROR("Bad SST method name. SST canceled.");
-+ return WSREP_CB_FAILURE;
-+ }
-+
- const char* data = method + method_len + 1;
-
-+ if (check_request_str(data, address_char))
-+ {
-+ WSREP_ERROR("Bad SST address string. SST canceled.");
-+ return WSREP_CB_FAILURE;
-+ }
-+
- char uuid_str[37];
- wsrep_uuid_print (¤t_gtid->uuid, uuid_str, sizeof(uuid_str));
-
-+ /* This will be reset when sync callback is called.
-+ * Should we set wsrep_ready to FALSE here too? */
-+ wsrep_config_state->set(WSREP_MEMBER_DONOR);
-+
- wsp::env env(NULL);
- if (env.error())
- {
diff --git a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
deleted file mode 100644
index 9658669c6e61..000000000000
--- a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
-
---- a/sql/wsrep_sst.cc
-+++ b/sql/wsrep_sst.cc
-@@ -1822,6 +1822,35 @@ static int sst_donate_other (const char* method,
- return arg.err;
- }
-
-+/* return true if character can be a part of a filename */
-+static bool filename_char(int const c)
-+{
-+ return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
-+}
-+
-+/* return true if character can be a part of an address string */
-+static bool address_char(int const c)
-+{
-+ return filename_char(c) ||
-+ (c == ':') || (c == '[') || (c == ']') || (c == '/');
-+}
-+
-+static bool check_request_str(const char* const str,
-+ bool (*check) (int c))
-+{
-+ for (size_t i(0); str[i] != '\0'; ++i)
-+ {
-+ if (!check(str[i]))
-+ {
-+ WSREP_WARN("Illegal character in state transfer request: %i (%c).",
-+ str[i], str[i]);
-+ return true;
-+ }
-+ }
-+
-+ return false;
-+}
-+
- int wsrep_sst_donate(const std::string& msg,
- const wsrep::gtid& current_gtid,
- const bool bypass)
-@@ -1833,8 +1862,21 @@ int wsrep_sst_donate(const std::string& msg,
-
- const char* method= msg.data();
- size_t method_len= strlen (method);
-+
-+ if (check_request_str(method, filename_char))
-+ {
-+ WSREP_ERROR("Bad SST method name. SST canceled.");
-+ return WSREP_CB_FAILURE;
-+ }
-+
- const char* data= method + method_len + 1;
-
-+ if (check_request_str(data, address_char))
-+ {
-+ WSREP_ERROR("Bad SST address string. SST canceled.");
-+ return WSREP_CB_FAILURE;
-+ }
-+
- wsp::env env(NULL);
- if (env.error())
- {
diff --git a/dev-db/mongodb/mongodb-4.2.11.ebuild b/dev-db/mongodb/mongodb-4.2.11-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-4.2.11.ebuild
rename to dev-db/mongodb/mongodb-4.2.11-r1.ebuild
index 48f015bc5d9f..40b5d5a7463b 100644
--- a/dev-db/mongodb/mongodb-4.2.11.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.11-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/mongodb/mongodb-4.2.15.ebuild b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-4.2.15.ebuild
rename to dev-db/mongodb/mongodb-4.2.15-r1.ebuild
index 8d8aba1df780..3002335b9c77 100644
--- a/dev-db/mongodb/mongodb-4.2.15.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/mongodb/mongodb-4.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-4.4.1.ebuild
rename to dev-db/mongodb/mongodb-4.4.1-r1.ebuild
index 15407a2446fa..907b1897e85b 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/mongodb/mongodb-4.4.4.ebuild b/dev-db/mongodb/mongodb-4.4.4-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-4.4.4.ebuild
rename to dev-db/mongodb/mongodb-4.4.4-r1.ebuild
index 0640079cfd65..2cb15168015d 100644
--- a/dev-db/mongodb/mongodb-4.4.4.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.4-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/mongodb/mongodb-4.4.8.ebuild b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-4.4.8.ebuild
rename to dev-db/mongodb/mongodb-4.4.8-r1.ebuild
index 714abb8c3b8d..dc16e9d2e44c 100644
--- a/dev-db/mongodb/mongodb-4.4.8.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/mongodb/mongodb-5.0.2.ebuild b/dev-db/mongodb/mongodb-5.0.2-r1.ebuild
similarity index 98%
rename from dev-db/mongodb/mongodb-5.0.2.ebuild
rename to dev-db/mongodb/mongodb-5.0.2-r1.ebuild
index a2ee4340b7f1..70c31271f576 100644
--- a/dev-db/mongodb/mongodb-5.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.2-r1.ebuild
@@ -30,12 +30,12 @@ RESTRICT="test"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3
+ >=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
+ app-arch/zstd:=
+ dev-libs/snowball-stemmer:=
net-libs/libpcap
>=sys-libs/zlib-1.2.11:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 4dea25618d51..82b5a8303b78 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-db/postgresql/files/postgresql.service-9.2 b/dev-db/postgresql/files/postgresql.service-9.2
deleted file mode 100644
index 20ed27a10f29..000000000000
--- a/dev-db/postgresql/files/postgresql.service-9.2
+++ /dev/null
@@ -1,51 +0,0 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades. If you want to customize, the
-# best way is to create file
-# "/etc/systemd/system/postgresql-@SLOT@.service.d/*.conf"
-# containing your changes
-
-# For example, if you want to change the server's port number to 5433,
-# create a file named
-# "/etc/systemd/system/postgresql-@SLOT@.service.d/port.conf"
-# containing:
-# [Service]
-# Environment=PGPORT=5433
-# This will override the setting appearing below.
-
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=forking
-
-User=postgres
-Group=postgres
-
-# Port number for server to listen on
-Environment=PGPORT=5432
-
-# Location of configuration files
-Environment=PGDATA=/etc/postgresql-@SLOT@
-
-# Where the data directory is located
-Environment=DATA_DIR=/var/lib/postgresql/@SLOT@/data
-
-# Where to send early-startup messages from the server (before the logging
-# options of postgresql.conf take effect)
-# This is normally controlled by the global default set by systemd
-# StandardOutput=syslog
-
-ExecStartPre=/usr/bin/postgresql-@SLOT@-check-db-dir
-ExecStart=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl start -D ${DATA_DIR} -s -l ${DATA_DIR}/postmaster.log -o "-p ${PGPORT} -D ${PGDATA} --data-directory=${DATA_DIR}" -w -t 300
-ExecStop=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl stop -D ${DATA_DIR} -s -m fast
-ExecReload=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl reload -D ${DATA_DIR} -s
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
-
-# Disable OOM kill on the postmaster
-OOMScoreAdjust=-1000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/qdbm/qdbm-1.8.78-r3.ebuild b/dev-db/qdbm/qdbm-1.8.78-r3.ebuild
index e3abbce65c86..fd0fc1a4033f 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r3.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="bzip2 cxx debug java lzo perl ruby static-libs zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-db/tinycdb/tinycdb-0.78.ebuild b/dev-db/tinycdb/tinycdb-0.78.ebuild
index 063a3b4e6a2a..8906f20cd579 100644
--- a/dev-db/tinycdb/tinycdb-0.78.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.78.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~riscv ~x86"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index ddd3a81e9965..16a919435257 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index cdb75a2d8c77..7ecadc0b2e41 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
hsoft/avra
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index af7e7c744bef..758cfea596b8 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1 +1,2 @@
DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
+DIST u-boot-2021.07.tar.bz2 17275746 BLAKE2B 1a209a604e0f30264781a14ca855bbb777e8f1c031de60d28de397084fc9bfc4a3771ad00ec22f5cdcfa721f22707a533b9b59004ac0b107df927f23dc5ab0a6 SHA512 210b206a4626feb0985580d9448a97b499b09bf9b9313ca847a66624785e9e9b0fae8f2e329acd344f5f75cb722d2093dd0ee394311ddd1fde05e400ee71a24d
diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
index 71b1461e1146..899a677d0cde 100644
--- a/dev-embedded/u-boot-tools/metadata.xml
+++ b/dev-embedded/u-boot-tools/metadata.xml
@@ -1,8 +1,11 @@
-
- embedded@gentoo.org
- Embedded Gentoo
-
+
+ embedded@gentoo.org
+ Embedded Gentoo
+
+
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
new file mode 100644
index 000000000000..8511d1c55044
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 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 2044b2381260..2e5b49bef6a8 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/asm-analysis/asm-analysis-9.2.ebuild b/dev-java/asm-analysis/asm-analysis-9.2.ebuild
index 405a33e55b42..bad56ce6a45d 100644
--- a/dev-java/asm-analysis/asm-analysis-9.2.ebuild
+++ b/dev-java/asm-analysis/asm-analysis-9.2.ebuild
@@ -13,7 +13,7 @@ MY_P="ASM_${PV//./_}"
SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
RESTRICT="test"
CDEPEND="dev-java/asm-tree:${SLOT}"
diff --git a/dev-java/asm-commons/asm-commons-9.2.ebuild b/dev-java/asm-commons/asm-commons-9.2.ebuild
index a41b83579109..a76b608e2305 100644
--- a/dev-java/asm-commons/asm-commons-9.2.ebuild
+++ b/dev-java/asm-commons/asm-commons-9.2.ebuild
@@ -13,7 +13,7 @@ MY_P="ASM_${PV//./_}"
SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
RESTRICT="test"
CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
diff --git a/dev-java/asm-tree/asm-tree-9.2.ebuild b/dev-java/asm-tree/asm-tree-9.2.ebuild
index d8ced9551e3f..c31e9ede858b 100644
--- a/dev-java/asm-tree/asm-tree-9.2.ebuild
+++ b/dev-java/asm-tree/asm-tree-9.2.ebuild
@@ -13,7 +13,7 @@ MY_P="ASM_${PV//./_}"
SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
RESTRICT="test"
CDEPEND="dev-java/asm:${SLOT}"
diff --git a/dev-java/asm-util/asm-util-9.2.ebuild b/dev-java/asm-util/asm-util-9.2.ebuild
index 93abddd311d0..3536a1d8ea12 100644
--- a/dev-java/asm-util/asm-util-9.2.ebuild
+++ b/dev-java/asm-util/asm-util-9.2.ebuild
@@ -13,7 +13,7 @@ MY_P="ASM_${PV//./_}"
SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
RESTRICT="test"
CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
diff --git a/dev-java/asm/asm-9.2.ebuild b/dev-java/asm/asm-9.2.ebuild
index e5b02c9c8299..0f8cff90ed9f 100644
--- a/dev-java/asm/asm-9.2.ebuild
+++ b/dev-java/asm/asm-9.2.ebuild
@@ -13,7 +13,7 @@ MY_P="ASM_${PV//./_}"
SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
RESTRICT="test"
CDEPEND=""
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
similarity index 78%
rename from dev-java/commons-lang/commons-lang-2.6-r1.ebuild
rename to dev-java/commons-lang/commons-lang-2.6-r2.ebuild
index ce82157c1ae7..4e9a61a966be 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
@@ -1,28 +1,29 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="commons-lang:commons-lang:2.6"
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
SLOT="2.1"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-DEPEND=">=virtual/jdk-1.4
+DEPEND="virtual/jdk:1.8
test? (
dev-java/ant-junit:0
)"
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND="virtual/jre:1.8"
S="${WORKDIR}/${P}-src"
@@ -31,7 +32,8 @@ JAVA_ANT_ENCODING="ISO-8859-1"
src_install() {
java-pkg_newjar "target/${P}.jar" "${PN}.jar"
dodoc RELEASE-NOTES.txt NOTICE.txt
- dohtml *.html
+ docinto html
+ dodoc *.html
use doc && java-pkg_dojavadoc target/apidocs
use source && java-pkg_dosrc src/main/java/*
}
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index dce004d82a1c..31fabc8cd4c4 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,2 +1 @@
-DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
diff --git a/dev-java/jansi/files/jansi-1.11-build.xml b/dev-java/jansi/files/jansi-1.11-build.xml
deleted file mode 100644
index 058559ce0847..000000000000
--- a/dev-java/jansi/files/jansi-1.11-build.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================================== WARNING ===================================
- JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
- ===============================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/jansi/jansi-1.11-r2.ebuild b/dev-java/jansi/jansi-1.11-r2.ebuild
deleted file mode 100644
index 8006241e27d0..000000000000
--- a/dev-java/jansi/jansi-1.11-r2.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
-
-# TODO: Get doc (missing classpath entries) working.
-JAVA_PKG_IUSE="source test"
-
-inherit vcs-snapshot java-pkg-2 java-ant-2
-
-DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
-HOMEPAGE="http://jansi.fusesource.org/"
-SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/jansi-native:0"
-
-DEPEND="${CDEPEND}
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- )
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}/jansi"
-
-EANT_GENTOO_CLASSPATH="jansi-native"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
- EANT_EXTRA_ARGS="-Djunit.present=true"
-
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild
index f570a1b7b6da..8da149faefe4 100644
--- a/dev-java/jansi/jansi-1.13.ebuild
+++ b/dev-java/jansi/jansi-1.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="dev-java/jansi-native:0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
index f943332913c4..c7a1905d1b0b 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-c
LICENSE="GPL-2-with-MySQL-FLOSS-exception"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
# Common dependencies
# POM: mysql-connector-java-${PV}.pom.xml
diff --git a/dev-java/jgoodies-animation/Manifest b/dev-java/jgoodies-animation/Manifest
deleted file mode 100644
index a3191f31ff45..000000000000
--- a/dev-java/jgoodies-animation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jgoodies-animation-1.2.0.zip 728028 BLAKE2B 591b63b6a2799bfe6020c4e81b834807fba3e72a039dbd9954846b6c5a5c2445493e2d8814b1897b9465ec39c2b62c2f027c1e05ef7db5e9439acc236dbf9078 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r2.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r2.ebuild
deleted file mode 100644
index 0ca9ed5a45f6..000000000000
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_V=${PV//./_}
-
-DESCRIPTION="JGoodies Animation Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
- >=virtual/jre-1.6
- examples? (
- >=dev-java/jgoodies-binding-1.1:1.0
- >=dev-java/jgoodies-forms-1.0:0
- )"
-
-S="${WORKDIR}/animation-${PV}"
-
-EANT_FILTER_COMPILER="jikes"
-EANT_DOC_TARGET=""
-
-DOCS=( RELEASE-NOTES.txt README.html )
-
-src_prepare() {
- default
-
- java-pkg_clean
-}
-
-src_test() {
- eant test -Djunit.jar.present=true \
- -Djunit.jar=$(java-pkg_getjar junit junit.jar)
-}
-
-src_install() {
- java-pkg_dojar build/animation.jar
- einstalldocs
- use doc && java-pkg_dohtml -r docs/*
- use source && java-pkg_dosrc src/core/*
- use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/jgoodies-animation/metadata.xml b/dev-java/jgoodies-animation/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/jgoodies-animation/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
deleted file mode 100644
index b4b653a2e7de..000000000000
--- a/dev-java/jgoodies-binding/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
deleted file mode 100644
index e7e455b79489..000000000000
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_V=${PV//./_}
-
-DESCRIPTION="Bind object properties with UI components"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-DOCS=( RELEASE-NOTES.txt README.html )
-
-S="${WORKDIR}/binding-${PV}"
-
-JAVA_SRC_DIR="src/core"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_install() {
- java-pkg-simple_src_install
- use examples && java-pkg_doexamples \
- src/core \
- src/tutorial
- einstalldocs
-}
diff --git a/dev-java/jgoodies-binding/metadata.xml b/dev-java/jgoodies-binding/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/jgoodies-binding/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
deleted file mode 100644
index 29766bc05358..000000000000
--- a/dev-java/jgoodies-forms/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST forms-1_3_0.zip 1320397 BLAKE2B a520ffe8a5487d125a53bed8d8524b68f68aaf1444389e4038af5f9a035ce800fdb1a470d172ec442240d5530e4c34cd34a0523a5ab92888daa57f543defd296 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8
-DIST jgoodies-forms-1_8_0.zip 1668539 BLAKE2B eed78fccd151322737b0f9e5fe39bf7e50f2b4a761b406059af5b62c564f28c44cd4a4efbd5485389d31948b26661aae641066020ed8d460f1c297ef9223be7c SHA512 dced4ddaea7e9157f99b7c27ad06bfed53c307181bfc21cee8f454ba8cececa3f5fd5186947fe5bb299c4de2032bd7489248e3e77623785ac47388306e3d6933
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
deleted file mode 100644
index 7a564f2d4aab..000000000000
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="forms"
-MY_PV=${PV//./_}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="JGoodies library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-java_prepare() {
- java-pkg_clean
-}
-
-src_install() {
- java-pkg_dojar "build/${MY_PN}.jar"
-
- dodoc RELEASE-NOTES.txt README.html
-
- use doc && java-pkg_dohtml -r docs/*
- use source && java-pkg_dosrc src/{core,extras}/com
- use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
deleted file mode 100644
index 15575fc1f3e3..000000000000
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="forms"
-MY_PV=${PV//./_}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="JGoodies Forms Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/jgoodies-common:${SLOT}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${P}
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="jgoodies-common-${SLOT}"
-
-java_prepare() {
- mkdir src || die
- unzip ${P}-sources.jar -d src || die
- rm "${S}"/pom.xml "${S}"/*.jar || die
-}
diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/jgoodies-forms/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 48a9a9fd25d0..2700678e3838 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,2 +1 @@
-DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
deleted file mode 100644
index 91f20179a562..000000000000
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.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
-
-MAVEN_ID="com.github.luben:zstd-jni:1.4.9-1"
-MY_PV="$(ver_rs 3 -)"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="JNI bindings for Zstd native library"
-
-HOMEPAGE="https://github.com/luben/zstd-jni"
-SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="${RDEPEND}"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_configure() {
- local mycmakeargs=(
- -DJAVA_HOME="$(java-config -g JAVA_HOME)"
- # Resolve bug #776910
- # Reference: https://stackoverflow.com/a/51764145
- -DJAVA_AWT_LIBRARY="NotNeeded"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- mkdir -p "${S}/target/classes/META-INF" || die "Failed to create META-INF dir"
- echo "Manifest-Version: 1.0
-Implementation-Version: ${MY_PV}
-Bundle-NativeCode: libzstd-jni.so;osname=Linux" > "${S}/target/classes/META-INF/MANIFEST.MF" || die "Failed to create MANIFEST.MF"
- java-pkg-simple_src_compile
- java-pkg_addres ${JAVA_JAR_FILENAME} "${BUILD_DIR}" -name libzstd-jni.so || die "Failed to add library to jar"
-}
-
-src_install() {
- java-pkg-simple_src_install
-}
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
index d978a25ba299..555f4fb3baf8 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND="${RDEPEND}"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6a910847772a..448293211a4f 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/go-1.17.ebuild b/dev-lang/go/go-1.17.ebuild
index a545e2d83127..bfde2d27f4dc 100644
--- a/dev-lang/go/go-1.17.ebuild
+++ b/dev-lang/go/go-1.17.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/moarvm/Manifest b/dev-lang/moarvm/Manifest
index c512586ebd74..d937b38189d8 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1 +1,2 @@
DIST MoarVM-2021.06.tar.gz 5449936 BLAKE2B 2bf6fc2e1a4dd0741819305e506945b09ed2a0fc1348ff98565cae397e76044176f05e87faeed1f52d5efadccb6d44edcb987553f5e164417153a8f23ba09493 SHA512 b23e20ed3e0830395ac09bd84a33ea3ab7ba52bce835c67b1feec45823ca2f0c9d04957d1f1b48b400fc30a48db37c5f89c3975b0273f684d9677145e2296f2c
+DIST MoarVM-2021.08.tar.gz 13643526 BLAKE2B 433cfaaad4138d8b98fc4bacd5495281f2a8da5195aa74aded118126afdf11cdf0175fd033472e951e91ab3c1eb11877ab039cd24d911553d5854be18021a87e SHA512 6199871f51a4998e1b5260ba833e3bf09c6115e12334a94de5aa4135b93f8dc754967712ce8e092a36b4940368433be840cbf1a8ce7aec52219f768acd90078d
diff --git a/dev-lang/moarvm/moarvm-2021.08.ebuild b/dev-lang/moarvm/moarvm-2021.08.ebuild
new file mode 100644
index 000000000000..965484962763
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2021.08.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+ inherit git-r3
+ S="${WORKDIR}/${P}"
+else
+ SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+ >=dev-libs/libuv-1.26:=
+ dev-libs/libffi:="
+DEPEND="${RDEPEND}
+ clang? ( >=sys-devel/clang-3.1 )
+ dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+ MAKEOPTS+=" NOISY=1"
+ use doc && DOCS+=( docs/* )
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
+ einfo "--prefix '${prefix}'"
+ einfo "--libdir '${libdir}'"
+ local myconfigargs=(
+ "--prefix" "${prefix}"
+ "--has-libuv"
+ "--has-libatomic_ops"
+ "--has-libffi"
+ "--libdir" "${libdir}"
+ "--compiler" "$(usex clang clang gcc)"
+ "$(usex asan --asan)"
+ "$(usex debug --debug --no-debug)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static)"
+ "$(usex ubsan --ubsan)"
+ )
+
+ perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 55a9f3fe4496..a4de935697d5 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1 +1,2 @@
DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe
+DIST nqp-2021.08.tar.gz 5208527 BLAKE2B 1f2e454e63484a8a636f61c9110b4a20775ec59dd7734fe32a93b01aaad5ea977ea74678085a66d9f072234de5768d8023182d6df56a448f2a0aa0fd3c1c76c3 SHA512 fca1dc8c36f914304f97330cb33be3a94c539f3cb6cc80d898c734dcf04b12b8be30ffce358a0a5320c6ea56afd627f792b4a8fa3f94134776922ae088b92814
diff --git a/dev-lang/nqp/nqp-2021.08.ebuild b/dev-lang/nqp/nqp-2021.08.ebuild
new file mode 100644
index 000000000000..81e93919b90b
--- /dev/null
+++ b/dev-lang/nqp/nqp-2021.08.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.8 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=${EPREFIX}/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 86426e412dd1..0f2506613202 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,8 @@
DIST php-7.3.29.tar.xz 12139492 BLAKE2B 7e1287e0fd236252f5bc92009e4ff51676eccd197c1c579f0e79a5428fa3920b5d1f95a459cdd77c22699fbe83984a6d726ab4fc0fc1e309da8b34e0e3998071 SHA512 8a495546d575a31f864f85139d8d7931361e6ac421f2cf5ef3b4cb57f59c44568cb9ad0c8793f50169d8d9933abdcec14ab90add2d7fab056e19e7f66d60689f
+DIST php-7.3.30.tar.xz 12142596 BLAKE2B 9d8d60aa2a24465e53d99be05f66c8c65ce738c866af0889cdfcd95d545d6308fce33ca2faaaeb2a298eae13d58b5f5b5c519de6af48230a4d9c4e3d41debb28 SHA512 89eb62ab4284393f33b79ee336c1672613c498adb858b16e1a17d5b2056068c849b96bbf591311ff322c607168d9518ade3bfebedbc4da4f37c34d2c64c671b6
DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681
DIST php-7.4.22.tar.xz 10348532 BLAKE2B 20e4bfb0362bb13ca8cacf9fb2500ffdd2db011d69cb82f113dd0c25e8a5fd4a017d77481732930afd24a8e092edbce3eafe9d45f27718ddf7567469f80c5642 SHA512 80587ba613b8a863a666f44a16ebb33cbb5a5d396601d1eaf063c8f7793a98abae903cb76fca4216860f1a043d5ee997464d479d53ffff6a1d6a6cd31da9100d
+DIST php-7.4.23.tar.xz 10371160 BLAKE2B 5e9fc033f856132dd6b7b06fc5aedc72218f083779fd90a8c4c7a23fb4f8c248a7ff769f9d9f46e5143ddf88ce9289f5a8013c194aeaf22eca74d97846868611 SHA512 659b6bbf9be21a09640529bc088dfd7a494081188e37eb1f2dac2cab92a1084062fd06d550dc8c97bdd7dd9b57f4146e357447be2cb86643bda1d8dbc8a0d4a3
+DIST php-8.0.10.tar.xz 10703088 BLAKE2B c1be482bf0a7cd2392b4febccca8d9f7b32b12ff4f5ff0ce417658c52444308e67a1a0e702c0d70dc7cece4f8299b2bc12b6f999be8a758e5390e760ce4809d7 SHA512 25f23822a45eab837645a0259c7dbb999766506de35c1bba53e928e2b5935ba70278b931d5085966178e08013ec69407fc68eb041b3ae2e619b81f20ec8ce736
DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428
DIST php-8.0.9.tar.xz 10678448 BLAKE2B 7d8684a353ccbcd2aaff4c240563cbd9f94b16ad29223d7e00e3d9ca8b564dabe3f1d0ac676e6499af6b95f24ac2104ed9cc0ce30d05c7c565ccb2067a86b355 SHA512 de9923bfa3ca37cd775ff743beb417152d7380fa5622f3fb0055b49e552c6484561f4f503bb11f535aadd12352c92f673f3e3cc86964c767b1f6cec21265d03c
diff --git a/dev-lang/php/php-7.3.30.ebuild b/dev-lang/php/php-7.3.30.ebuild
new file mode 100644
index 000000000000..ca53010503c1
--- /dev/null
+++ b/dev-lang/php/php-7.3.30.ebuild
@@ -0,0 +1,758 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[jit?,unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode:0= )
+ session-mm? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:=[-minimal] )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? ( >=dev-libs/openssl-1.0.1:0= )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ oci8-instant-client? ( !ldap )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ $(use_with jit pcre-jit)
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.23.ebuild b/dev-lang/php/php-7.4.23.ebuild
new file mode 100644
index 000000000000..aadecf63e45e
--- /dev/null
+++ b/dev-lang/php/php-7.4.23.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif ffi +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +iconv imap inifile
+ intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ !cli? ( ?? ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ xmlrpc? ( xml iconv )
+ xmlreader? ( xml )
+ xmlwriter? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ oci8-instant-client? ( !ldap )
+ qdbm? ( !gdbm )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ firebird? ( pdo )
+ mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[jit?,unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =dev-libs/libffi-3.0.11:= )
+ firebird? ( dev-db/firebird )
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+ odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ session-mm? ( dev-libs/mm )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ sodium? ( dev-libs/libsodium:=[-minimal] )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? ( >=dev-libs/openssl-1.0.1:0= )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.7.6 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt )
+ zip? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+ "${FILESDIR}"/php-iodbc-header-location.patch
+)
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Emulate buildconf to support cross-compilation
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype)
+ $(use_with curl)
+ $(use_enable xml dom)
+ $(use_with enchant)
+ $(use_enable exif)
+ $(use_with ffi)
+ $(use_enable fileinfo)
+ $(use_enable filter)
+ $(use_enable ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_with kerberos)
+ $(use_with xml libxml)
+ $(use_enable unicode mbstring)
+ $(use_with ssl openssl)
+ $(use_enable pcntl)
+ $(use_enable phar)
+ $(use_enable pdo)
+ $(use_enable opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_enable simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap)
+ $(use_enable sockets)
+ $(use_with sodium)
+ $(use_with sqlite sqlite3)
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer)
+ $(use_enable xml)
+ $(use_enable xmlreader)
+ $(use_enable xmlwriter)
+ $(use_with xmlrpc)
+ $(use_with xslt xsl)
+ $(use_with zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype)
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg)
+ $(use_with xpm)
+ $(use_with webp)
+ )
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_enable gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl)
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ if use odbc && use iodbc ; then
+ our_conf+=(
+ --without-unixODBC
+ --with-iodbc
+ $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+ )
+ elif use odbc ; then
+ our_conf+=(
+ --with-unixODBC="${EPREFIX}/usr"
+ --without-iodbc
+ $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+ )
+ else
+ our_conf+=(
+ --without-unixODBC
+ --without-iodbc
+ --without-pdo-odbc
+ )
+ fi
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite)
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit)
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-external-pcre affects ext/pcre
+ our_conf+=(
+ --with-external-pcre
+ $(use_with jit pcre-jit)
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.0.10.ebuild b/dev-lang/php/php-8.0.10.ebuild
new file mode 100644
index 000000000000..79938681cad2
--- /dev/null
+++ b/dev-lang/php/php-8.0.10.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif ffi +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +iconv imap inifile
+ intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+ +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ !cli? ( ?? ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ xmlreader? ( xml )
+ xmlwriter? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ oci8-instant-client? ( !ldap )
+ qdbm? ( !gdbm )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ firebird? ( pdo )
+ mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[jit?,unicode]
+ fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.29.0 )
+ enchant? ( app-text/enchant:2 )
+ ffi? ( >=dev-libs/libffi-3.0.11:= )
+ firebird? ( dev-db/firebird )
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+ odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+ postgres? ( >=dev-db/postgresql-9.1:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ session-mm? ( dev-libs/mm )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ sodium? ( dev-libs/libsodium:=[-minimal] )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? ( >=dev-libs/openssl-1.0.1:0= )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.9.0 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt )
+ zip? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+ "${FILESDIR}/php-iodbc-header-location.patch"
+ "${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Emulate buildconf to support cross-compilation
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads zts)
+ )
+
+ our_conf+=(
+ $(use_with apparmor fpm-apparmor)
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype)
+ $(use_with curl)
+ $(use_enable xml dom)
+ $(use_with enchant)
+ $(use_enable exif)
+ $(use_with ffi)
+ $(use_enable fileinfo)
+ $(use_enable filter)
+ $(use_enable ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl)
+ $(use_enable ipv6)
+ $(use_with kerberos)
+ $(use_with xml libxml)
+ $(use_enable unicode mbstring)
+ $(use_with ssl openssl)
+ $(use_enable pcntl)
+ $(use_enable phar)
+ $(use_enable pdo)
+ $(use_enable opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_enable simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap)
+ $(use_enable sockets)
+ $(use_with sodium)
+ $(use_with sqlite sqlite3)
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer)
+ $(use_enable xml)
+ $(use_enable xmlreader)
+ $(use_enable xmlwriter)
+ $(use_with xslt xsl)
+ $(use_with zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype)
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg)
+ $(use_with xpm)
+ $(use_with webp)
+ )
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_enable gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl)
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ if use odbc && use iodbc ; then
+ our_conf+=(
+ --without-unixODBC
+ --with-iodbc
+ $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+ )
+ elif use odbc ; then
+ our_conf+=(
+ --with-unixODBC="${EPREFIX}/usr"
+ --without-iodbc
+ $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+ )
+ else
+ our_conf+=(
+ --without-unixODBC
+ --without-iodbc
+ --without-pdo-odbc
+ )
+ fi
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite)
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit)
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-external-pcre affects ext/pcre
+ our_conf+=(
+ --with-external-pcre
+ $(use_with jit pcre-jit)
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a0945a3545c2..16a41bbe3060 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,11 +8,18 @@ DIST Python-3.7.11.tar.xz 17393380 BLAKE2B 6394d69935950366da7c4cecd4816d7625417
DIST Python-3.7.11.tar.xz.asc 833 BLAKE2B 8af6b3e58b607a34c91f57af2fbe9c3f3c7cb6fa5e435e963edd7edcf7649e70c3a76bd346ff8ef1b3c890d8a92d3b2fed27ee01b512c579ff8ce80be61274fb SHA512 f19db95e88c9269174a2b4ac4d8c68fa7ed666b6698af26d2da202e30d145686e8679be763eecba9f8a0c34a207639724094463cffce659c3855ed4b133b0a59
DIST Python-3.8.11.tar.xz 18437648 BLAKE2B 957c553ced3387d19c1d1baf2eea7d41e9abfbf398c4514f475eadae29336dc02dbd2cdf7b90ab5fee1e49c083a366c113dcd73149445b663fcdf81a3b2b04f6 SHA512 c8c17491b05d83a9f8940474019034780a6b1ff4148654cd62c8f708c539718a0312cf0665efa2b8c42ed773f4306080bd105701a211ed56e6cab40837d5b2df
DIST Python-3.8.11.tar.xz.asc 833 BLAKE2B 52239149331a6529351714db10b5f6b2a37e9a9ce13470e0ab8ae4bf439544878df095995bdc28a534d55039a539c400f532aec8fb7d9b9ce7132167f0e39529 SHA512 40381e83a1bef996333d5044a361ce441c4631725457f8382588e9a86f586a9539ee139b8398aff3d988a317041fa87476f29cf6fcd2b31fe0e9b4cd21ede68a
+DIST Python-3.8.12.tar.xz 18443568 BLAKE2B 73413aee7a31347ac4342718a54d23d4036220262c4cd41cd50b06c3b1698d52d11cf7ac2c781b919f2cdb0dcb6397d623c463dcdcd1edca99abbbce239a3c6e SHA512 2f93fe5ff83f470c7b6a1b7f29f499a2a010fabd649e9fe65ad3fbfa21b6e1966e77c9b7ac012d978159bc3fe63fec2d64bc6982fc2ee1714d3fa0e47631f279
+DIST Python-3.8.12.tar.xz.asc 833 BLAKE2B 33f59aa667555832ee510d2a7295079f34a3983dfa84beab20b33ec691ea3eecfcc4a62591fe233fc30622d0236ee69a3d41b8922ee2f4c632df3523d565c3ec SHA512 ef552b716a721f410abb14387594c8b0ddc65ce4b8a6ae6bf920c1db2ea9ddf6bbf547e93d3716495ae31848eb1049aae4257016e888393681bbfb6f6529bc12
DIST Python-3.9.6.tar.xz 19051972 BLAKE2B 0d8586b2935088eeab7138cf2210c1a74f1bf7359359d25750af5f69de55eb39c92f518b887a8b749c772ed7d33e85b912928ae6d878514eb58d85ef210f54f0 SHA512 01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1
DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B 41901bfb80a901f2f14e86769e6d08ded8f75656d347201345183162e180e61442da871a1067572a54da579551166a19bf5436e51581bb10cb78afc4d28773fc SHA512 0673c8833f302c829bfde97453c52744f6aa99b4a72520f4cc384d4aa9d6ffd28a1407ceafb0a1ec4462b3aa74b656bf39c67872c4e6a131429ea58c47ad0ecc
DIST python-gentoo-patches-2.7.18_p11.tar.xz 31340 BLAKE2B bdc097b971ab8ec0b60f944002af34f3fff6b681c43515a4fec2fcac1a2c731bf4fcfae2178463103911e2f8cd6bc84d3b56cd0ad61da5c8276278ec9b85a242 SHA512 2a2388c4543267bfb0167f963a22f5141442c9347d9a8806ad6917843e6958d47c8f1933244651c870101b21408c920408fe056efb7a148117c24ab391151d88
DIST python-gentoo-patches-3.10.0rc1_p1.tar.xz 8496 BLAKE2B b3b771a8894e5bfeabb3bee10cf60c068dca28341784f0914bb2190f67f10007c2e4e3b18dc31ac7dd791e06314cd3f8cda6776261c6e83da380c492bbc53e89 SHA512 bb22cc121d3b915b98de32244926188dd9717054f32437822a59652be001ac3b6309cb1aba79ce158a486d33e761a31861aed56b5a7976bc83aee18174903248
+DIST python-gentoo-patches-3.10.0rc1_p2.tar.xz 10548 BLAKE2B b0a78e3b5e45ead483391c4382c3d6046b4a03e43c1ab5fcd1569f05afc271dde6278078cec852756364663111c38f0ecedca99ef2f2bb233714406505ed8e79 SHA512 1e0129903a3756b6ab087b982269197b64028432f81592b887d8431f429f864918eaa611c7b671e303de7603fd835fb4563219fedd3ee1dbd42e843e66d4fccd
DIST python-gentoo-patches-3.6.14.tar.xz 14744 BLAKE2B b9482f9d2b7ada60eff9a5672ed21556c00b473a7cfdb543dce8253fb0ff1539e635a35569478c496012ecde4eef78a257da28f7a80bff99da10249708262229 SHA512 246f83911c8e52ea83a9bf453faa0bc0ea0c29bbf3b666a938e3790c6147f71e617ff9cb27501c5f0b89172eb9e7819e3f2ef0a5bae271cc938d2c0c2b93f7ae
+DIST python-gentoo-patches-3.6.14_p1.tar.xz 16576 BLAKE2B 902a9073e6d3e40cfba105680d9947b64a4bfa1632381bc71afbd2691350dccb36f498bf17ac7dfc8ce331dfc3fb7e3cdd539cea3f5e9db1c49210ad4d124182 SHA512 4aa354f1ca8d9bb3c30b666ef61cac8380741342102aeb9ea77cc06ae62179f595acc1c2e6321e9c2395abbc3fbc649ecc93b80443d139859924524989539992
DIST python-gentoo-patches-3.7.11.tar.xz 16708 BLAKE2B 4f74b38f400c20b4112f080447021e7140704b282d6369a1479886740d12a17e7818b52a382a4b115238847bb08df0260b092b6ead491623b869c3d3a56f4cc2 SHA512 b96d7af8c9f7fb4b246a8b66e6440336a7d123678d990dd259d7ffb87d79ce74295ff350e220fee38d1b12f1ca94533899c2d2ce700391b3eac907722a79bba6
+DIST python-gentoo-patches-3.7.11_p1.tar.xz 18540 BLAKE2B 717f3b279368faa355e9b306ede5aa3cf750b7a862e50553caf4efe19b6b8d40431974fbb510414291c4c91623addebff54fd6d4f7f7553c686c5382174bc81f SHA512 e403d2364bbe600d7c3dba8f70157b1f243b00848e3826e6f350d7dbbdd0966229fbf9aa11e0e87fb5ab93b8ea69893f389e5b92c22d7315f99657d69695ded2
DIST python-gentoo-patches-3.8.11.tar.xz 16932 BLAKE2B aaa1df33997f4077916fb7cca2ec3a2b2ac1c0ead3db7c638a5152a82cfaaf5fc2768a10ac7235c417e25b2b735c53628ec096878f08eef0d211b03f4747103c SHA512 d2639b95c5a32f7145f92e52a94aec7c63f3ed4a66036ff73f052ff6836742d1e1dd7180f8634b65b4a44a10bf336092695bcc2230a7fd8be35bae870ed64b08
+DIST python-gentoo-patches-3.8.12.tar.xz 14936 BLAKE2B 1cb6cdb0bb659b1bc3f8a4ecd80da74b41a9fa2f4d5646ac4b48ddecd5124677cb24574a425404fedab4fb9c7faba4b1cb54cc3482785559a54fa3e9b3ca13f1 SHA512 86c30622bbf6847efcdf2bc43d916b05ee78ab17f45b93148a01cf4c181592029ecc52e8c4887112d97aeece63a92ee0f685a689287c133443cf51b3f8171fb9
DIST python-gentoo-patches-3.9.6_p1.tar.xz 12764 BLAKE2B 927718f1aadb5d5ef67e647a639a10bffdd48474bf01e50bd37ef1242bce57606b7b54c4823c1da3585ee76e737028163e38e9b4e19037585cc53f925e1c5fa7 SHA512 f06fb55786bd942e72e3225ee9ce218724aeee29f301279743588749007e991851a8f29db5b5dfd85435e3d763c00942947909a6fc60581bd0f3e8a6e913bff8
+DIST python-gentoo-patches-3.9.6_p2.tar.xz 14720 BLAKE2B e14634229b65a29f5294694949c138bfa6146810349d1207a07d84eeca529571eb9c760b58ddbe6e8d96d50d1a3e0d1dfe42328c53c977a9eeb22ecd553317dc SHA512 5d84b8bb4e5584e3ef8e6298af000e772240ad93ed0aaadf1d785db947f1e79aecae7313b8dbeb65849212c9930e683be6e18e42ef6c41a3c27d60f75df08a01
diff --git a/dev-lang/python/python-3.10.0_rc1_p2.ebuild b/dev-lang/python/python-3.10.0_rc1_p2.ebuild
new file mode 100644
index 000000000000..7c0200703675
--- /dev/null
+++ b/dev-lang/python/python-3.10.0_rc1_p2.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+ python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+ verify-sig? (
+ https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+ )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ app-arch/xz-utils:=
+ dev-libs/libffi:=
+ sys-apps/util-linux:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )
+ !!/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+}
diff --git a/dev-lang/python/python-3.6.14_p1.ebuild b/dev-lang/python/python-3.6.14_p1.ebuild
new file mode 100644
index 000000000000..c375dd63ae3a
--- /dev/null
+++ b/dev-lang/python/python-3.6.14_p1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+ python-utils-r1 toolchain-funcs verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+ verify-sig? (
+ https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+ )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ app-arch/xz-utils:=
+ dev-libs/libffi:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? ( dev-libs/openssl:= )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+ bluetooth? ( net-wireless/bluez )
+ test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+ virtual/pkgconfig
+ verify-sig? ( app-crypt/openpgp-keys-python )
+ !sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+ fi
+ default
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat || die
+ rm -fr Modules/_ctypes/libffi* || die
+ rm -fr Modules/zlib || die
+
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ Lib/distutils/command/install.py \
+ Lib/distutils/sysconfig.py \
+ Lib/site.py \
+ Lib/sysconfig.py \
+ Lib/test/test_site.py \
+ Makefile.pre.in \
+ Modules/Setup.dist \
+ Modules/getpath.c \
+ configure.ac \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ # force correct number of jobs
+ # https://bugs.gentoo.org/737660
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+ sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local disable
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+ tc-export CXX
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+
+ local myeconfargs=(
+ # glibc-2.30 removes it; since we can't cleanly force-rebuild
+ # Python on glibc upgrade, remove it proactively to give
+ # a chance for users rebuilding python before glibc
+ ac_cv_header_stropts_h=no
+
+ --with-fpectl
+ --enable-shared
+ $(use_enable ipv6)
+ $(use_with threads)
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --without-ensurepip
+ --with-system-expat
+ --with-system-ffi
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="gdb faulthandler"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+ emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+ CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+ local result=$?
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ # Remove static library
+ rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+ sed \
+ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+ -e "s/\(PY_LDFLAGS=\).*/\1/" \
+ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+ # Cheap hack to get version with ABIFLAGS
+ local abiver=$(cd "${ED}/usr/include"; echo python*)
+ if [[ ${abiver} != python${PYVER} ]]; then
+ # Replace python3.X with a symlink to python3.Xm
+ rm "${ED}/usr/bin/python${PYVER}" || die
+ dosym "${abiver}" "/usr/bin/python${PYVER}"
+ # Create python3.X-config symlink
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+ # Create python-3.5m.pc symlink
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+ fi
+
+ # python seems to get rebuilt in src_install (bug 569908)
+ # Work around it for now.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E "${ED}/usr/bin/${abiver}"
+ else
+ pax-mark m "${ED}/usr/bin/${abiver}"
+ fi
+
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+ use threads || rm -r "${libdir}/multiprocessing" || die
+ use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ docinto examples
+ find Tools -name __pycache__ -exec rm -fr {} + || die
+ dodoc -r Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" \
+ "${scriptdir}/pyvenv" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+}
diff --git a/dev-lang/python/python-3.7.11_p1.ebuild b/dev-lang/python/python-3.7.11_p1.ebuild
new file mode 100644
index 000000000000..c021a50070f4
--- /dev/null
+++ b/dev-lang/python/python-3.7.11_p1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+ python-utils-r1 toolchain-funcs verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+ verify-sig? (
+ https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+ )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ app-arch/xz-utils:=
+ dev-libs/libffi:=
+ sys-apps/util-linux:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+ bluetooth? ( net-wireless/bluez )
+ test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+ virtual/pkgconfig
+ verify-sig? ( app-crypt/openpgp-keys-python )
+ !sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+ fi
+ default
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat || die
+ rm -fr Modules/_ctypes/libffi* || die
+ rm -fr Modules/zlib || die
+
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ # force correct number of jobs
+ # https://bugs.gentoo.org/737660
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+ sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local disable
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+ tc-export CXX
+
+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
+ use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+
+ local myeconfargs=(
+ # glibc-2.30 removes it; since we can't cleanly force-rebuild
+ # Python on glibc upgrade, remove it proactively to give
+ # a chance for users rebuilding python before glibc
+ ac_cv_header_stropts_h=no
+
+ --enable-shared
+ $(use_enable ipv6)
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --without-ensurepip
+ --with-system-expat
+ --with-system-ffi
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+ emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+ CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+ local result=$?
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/lib/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ # Remove static library
+ rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+ sed \
+ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+ -e "s/\(PY_LDFLAGS=\).*/\1/" \
+ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+ # Cheap hack to get version with ABIFLAGS
+ local abiver=$(cd "${ED}/usr/include"; echo python*)
+ if [[ ${abiver} != python${PYVER} ]]; then
+ # Replace python3.X with a symlink to python3.Xm
+ rm "${ED}/usr/bin/python${PYVER}" || die
+ dosym "${abiver}" "/usr/bin/python${PYVER}"
+ # Create python3.X-config symlink
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+ # Create python-3.5m.pc symlink
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+ fi
+
+ # python seems to get rebuilt in src_install (bug 569908)
+ # Work around it for now.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E "${ED}/usr/bin/${abiver}"
+ else
+ pax-mark m "${ED}/usr/bin/${abiver}"
+ fi
+
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+ use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ docinto examples
+ find Tools -name __pycache__ -exec rm -fr {} + || die
+ dodoc -r Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" \
+ "${scriptdir}/pyvenv" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+}
diff --git a/dev-lang/python/python-3.8.12.ebuild b/dev-lang/python/python-3.8.12.ebuild
new file mode 100644
index 000000000000..427838727282
--- /dev/null
+++ b/dev-lang/python/python-3.8.12.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+ python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+ verify-sig? (
+ https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+ )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ app-arch/xz-utils:=
+ dev-libs/libffi:=
+ sys-apps/util-linux:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+ bluetooth? ( net-wireless/bluez )
+ test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+ virtual/pkgconfig
+ sys-devel/autoconf-archive
+ verify-sig? ( app-crypt/openpgp-keys-python )
+ !sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+ fi
+ default
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat || die
+ rm -fr Modules/_ctypes/libffi* || die
+ rm -fr Modules/zlib || die
+
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ # force correct number of jobs
+ # https://bugs.gentoo.org/737660
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+ sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+ sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local disable
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ # https://bugs.gentoo.org/700012
+ if is-flagq -flto || is-flagq '-flto=*'; then
+ append-cflags $(test-flags-CC -ffat-lto-objects)
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+ tc-export CXX
+
+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
+ use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+
+ local myeconfargs=(
+ # glibc-2.30 removes it; since we can't cleanly force-rebuild
+ # Python on glibc upgrade, remove it proactively to give
+ # a chance for users rebuilding python before glibc
+ ac_cv_header_stropts_h=no
+
+ --enable-shared
+ $(use_enable ipv6)
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --without-ensurepip
+ --with-system-expat
+ --with-system-ffi
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+ emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+ CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+ local result=$?
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/lib/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ # Remove static library
+ rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+ sed \
+ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+ -e "s/\(PY_LDFLAGS=\).*/\1/" \
+ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+ # Cheap hack to get version with ABIFLAGS
+ local abiver=$(cd "${ED}/usr/include"; echo python*)
+ if [[ ${abiver} != python${PYVER} ]]; then
+ # Replace python3.X with a symlink to python3.Xm
+ rm "${ED}/usr/bin/python${PYVER}" || die
+ dosym "${abiver}" "/usr/bin/python${PYVER}"
+ # Create python3.X-config symlink
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+ # Create python-3.5m.pc symlink
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+ fi
+
+ # python seems to get rebuilt in src_install (bug 569908)
+ # Work around it for now.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E "${ED}/usr/bin/${abiver}"
+ else
+ pax-mark m "${ED}/usr/bin/${abiver}"
+ fi
+
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+ use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ docinto examples
+ find Tools -name __pycache__ -exec rm -fr {} + || die
+ dodoc -r Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+}
diff --git a/dev-lang/python/python-3.9.6_p2.ebuild b/dev-lang/python/python-3.9.6_p2.ebuild
new file mode 100644
index 000000000000..682541d34485
--- /dev/null
+++ b/dev-lang/python/python-3.9.6_p2.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+ python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+ verify-sig? (
+ https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+ )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ app-arch/xz-utils:=
+ dev-libs/libffi:=
+ sys-apps/util-linux:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+ bluetooth? ( net-wireless/bluez )
+ test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+ virtual/pkgconfig
+ sys-devel/autoconf-archive
+ verify-sig? ( app-crypt/openpgp-keys-python )
+ !sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+ use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+ fi
+ default
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat || die
+ rm -fr Modules/_ctypes/libffi* || die
+ rm -fr Modules/zlib || die
+
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ # force correct number of jobs
+ # https://bugs.gentoo.org/737660
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+ sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+ sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local disable
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ # https://bugs.gentoo.org/700012
+ if is-flagq -flto || is-flagq '-flto=*'; then
+ append-cflags $(test-flags-CC -ffat-lto-objects)
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+ tc-export CXX
+
+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
+ use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+
+ local myeconfargs=(
+ # glibc-2.30 removes it; since we can't cleanly force-rebuild
+ # Python on glibc upgrade, remove it proactively to give
+ # a chance for users rebuilding python before glibc
+ ac_cv_header_stropts_h=no
+
+ --enable-shared
+ $(use_enable ipv6)
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --without-ensurepip
+ --with-system-expat
+ --with-system-ffi
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+ emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+ CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+ local result=$?
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/lib/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ # Remove static library
+ rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+ sed \
+ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+ -e "s/\(PY_LDFLAGS=\).*/\1/" \
+ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+ # Cheap hack to get version with ABIFLAGS
+ local abiver=$(cd "${ED}/usr/include"; echo python*)
+ if [[ ${abiver} != python${PYVER} ]]; then
+ # Replace python3.X with a symlink to python3.Xm
+ rm "${ED}/usr/bin/python${PYVER}" || die
+ dosym "${abiver}" "/usr/bin/python${PYVER}"
+ # Create python3.X-config symlink
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+ # Create python-3.5m.pc symlink
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+ fi
+
+ # python seems to get rebuilt in src_install (bug 569908)
+ # Work around it for now.
+ if has_version dev-libs/libffi[pax-kernel]; then
+ pax-mark E "${ED}/usr/bin/${abiver}"
+ else
+ pax-mark m "${ED}/usr/bin/${abiver}"
+ fi
+
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+ dodoc Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ docinto examples
+ find Tools -name __pycache__ -exec rm -fr {} + || die
+ dodoc -r Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index a9a5f5ce88bd..71c0ed42f948 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1 +1,2 @@
DIST rakudo-2021.06.tar.gz 5211187 BLAKE2B e6a73ada3bc7550ad9e2415374f8ecd9aeed021faf8bc52697c8d4bd1fc16782036fecf346f1b132f2d50b894f99ebca548e6e4209b1ff643a045679415ae3fd SHA512 1141979c63a5128919d24c4660cff8011fade12487bd7f437dbaeb6d121ab2d93e42022227ad47d6d840ddb12118c9f1cde8285d87677ff88b135c4e9f079ecc
+DIST rakudo-2021.08.tar.gz 5906537 BLAKE2B 73a70ac0524ef41355e835173bccca743db5aa0f7b41ac0b152537da84337f6281c0619b86cd282d8e103bcc37573e0c42e147d2f6cb7d626b5bfaac9c6917d6 SHA512 6b58ddf47742cb8abc7c017ccbc658dac04a7a2e9802e3c656f775f94a97264a92c24f0a88c0f7baae3fa5b531acb407a652eea6c9d9cdc2f00afef00c92a018
diff --git a/dev-lang/rakudo/rakudo-2021.08.ebuild b/dev-lang/rakudo/rakudo-2021.08.ebuild
new file mode 100644
index 000000000000..551b3af73d09
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ >=dev-lang/perl-5.10"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo; then
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+ ewarn "then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+src_configure() {
+ local backends
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
+ "--sysroot=/"
+ "--sdkroot=/"
+ "--backends=${backends}"
+ )
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ if use java; then
+ NQP=$(java-pkg_getjars --with-dependencies nqp)
+ fi
+}
+
+src_compile() {
+ emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bee87f9bf6f1..4874f50a99b9 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18-r1.ebuild
similarity index 94%
rename from dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
rename to dev-libs/appstream-glib/appstream-glib-0.7.18-r1.ebuild
index 448126df5f48..f81e79bb94a5 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.18-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk-doc fonts +introspection stemmer"
RDEPEND="
>=dev-libs/glib-2.58.0:2
sys-apps/util-linux
- app-arch/libarchive
+ app-arch/libarchive:=
>=net-libs/libsoup-2.51.92:2.4
>=dev-libs/json-glib-1.1.2
>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
@@ -26,7 +26,7 @@ RDEPEND="
>=media-libs/freetype-2.4:2 )
>=media-libs/fontconfig-2.11:1.0
dev-libs/libyaml
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
"
@@ -44,7 +44,7 @@ BDEPEND="
)
>=sys-devel/gettext-0.19.8
"
-# ${PN} superseeds appdata-tools
+# ${PN} supersedes appdata-tools
RDEPEND="${RDEPEND}
!
-
- jakov.smolic@sartura.hr
- Jakov Smolic
+
+ jsmolic@gentoo.org
+ Jakov Smolić
luka.perkov@sartura.hr
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 41d2164ca2a9..1d1e4d9d62a4 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,3 +4,4 @@ DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e
DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
+DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
new file mode 100644
index 000000000000..584154b6ff2d
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+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"
+IUSE="+asm cpu_flags_arm_neon 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 o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ if [[ ${CHOST} == *86*-solaris* ]] ; then
+ # ASM code uses GNU ELF syntax, divide in particular, we need to
+ # allow this via ASFLAGS, since we don't have a flag-o-matic
+ # function for that, we'll have to abuse cflags for this
+ append-cflags -Wa,--divide
+ fi
+ local myeconfargs=(
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+ --enable-noexecstack
+ $(use_enable cpu_flags_arm_neon neon-support)
+ $(use_enable cpu_flags_x86_aes aesni-support)
+ $(use_enable cpu_flags_x86_avx avx-support)
+ $(use_enable cpu_flags_x86_avx2 avx2-support)
+ $(use_enable cpu_flags_x86_padlock padlock-support)
+ $(use_enable cpu_flags_x86_sha shaext-support)
+ $(use_enable cpu_flags_x86_sse4_1 sse41-support)
+ # required for sys-power/suspend[crypt], bug 751568
+ $(use_enable static-libs static)
+ $(use_enable o-flag-munging O-flag-munging)
+
+ # disabled due to various applications requiring privileges
+ # after libgcrypt drops them (bug #468616)
+ --without-capabilities
+
+ # http://trac.videolan.org/vlc/ticket/620
+ # causes bus-errors on sparc64-solaris
+ $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+ $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+ $(use asm || echo "--disable-asm")
+
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgit2/libgit2-1.1.1.ebuild b/dev-libs/libgit2/libgit2-1.1.1.ebuild
index 157b5b32cbd9..e5be2e907283 100644
--- a/dev-libs/libgit2/libgit2-1.1.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2-with-linking-exception"
SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
IUSE="examples gssapi +ssh test +threads trace"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgweather/libgweather-40.0.ebuild b/dev-libs/libgweather/libgweather-40.0.ebuild
index b7249ad649f9..450abd3a7b1b 100644
--- a/dev-libs/libgweather/libgweather-40.0.ebuild
+++ b/dev-libs/libgweather/libgweather-40.0.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 12a05f3d41ef..76a8cbbce62d 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
# Helpful site:
# https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+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="+gmp +libtommath tomsfastmath"
# Enforce at least one math provider
diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild
index ec5f781b9293..e65ded25c030 100644
--- a/dev-libs/libtommath/libtommath-1.2.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
LICENSE="Unlicense"
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"
+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="doc examples static-libs"
BDEPEND="sys-devel/libtool"
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 1c0c4078889f..13e80a83581f 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -6,8 +6,8 @@
Gentoo KDE Project
- jakov.smolic@sartura.hr
- Jakov Smolic
+ jsmolic@gentoo.org
+ Jakov Smolić
libuv is a platform layer for node.js. Its purpose is to abstract
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15-r1.ebuild
similarity index 96%
rename from dev-libs/libxmlb/libxmlb-0.1.15.ebuild
rename to dev-libs/libxmlb/libxmlb-0.1.15-r1.ebuild
index dc0ed0417cd5..36625e4a84a0 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/glib:2
sys-apps/util-linux
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
"
DEPEND="
diff --git a/dev-libs/libxmlb/libxmlb-0.3.1.ebuild b/dev-libs/libxmlb/libxmlb-0.3.1-r1.ebuild
similarity index 96%
rename from dev-libs/libxmlb/libxmlb-0.3.1.ebuild
rename to dev-libs/libxmlb/libxmlb-0.3.1-r1.ebuild
index a4cc4b2a152c..9c0e47edf64f 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.1-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/glib:2
sys-apps/util-linux
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
"
DEPEND="
diff --git a/dev-libs/libxmlb/libxmlb-0.3.2.ebuild b/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
similarity index 96%
rename from dev-libs/libxmlb/libxmlb-0.3.2.ebuild
rename to dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
index a4cc4b2a152c..9c0e47edf64f 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.2.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/glib:2
sys-apps/util-linux
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
"
DEPEND="
diff --git a/dev-libs/light/light-1.2.2-r1.ebuild b/dev-libs/light/light-1.2.2-r2.ebuild
similarity index 90%
rename from dev-libs/light/light-1.2.2-r1.ebuild
rename to dev-libs/light/light-1.2.2-r2.ebuild
index 8ea699addebd..64dd04c8b3f4 100644
--- a/dev-libs/light/light-1.2.2-r1.ebuild
+++ b/dev-libs/light/light-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools udev
@@ -11,11 +11,14 @@ SRC_URI="https://github.com/haikarainen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="udev"
-RDEPEND="acct-group/video"
+RDEPEND="
+ acct-group/video
+ !sys-power/acpilight
+"
DEPEND="udev? ( virtual/libudev:= )
${RDEPEND}"
diff --git a/dev-libs/light/light-1.2.2.ebuild b/dev-libs/light/light-1.2.2.ebuild
deleted file mode 100644
index 8210dc3ec01b..000000000000
--- a/dev-libs/light/light-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A program to control backlights (and other hardware lights)"
-HOMEPAGE="https://github.com/haikarainen/light"
-SRC_URI="https://github.com/haikarainen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="udev"
-
-RDEPEND=""
-DEPEND="udev? ( virtual/libudev:= )
- ${RDEPEND}"
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-fcommon.patch"
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(usex udev --with-udev="/lib/udev/rules.d" "")
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index b643ff1f18c0..de8b47631850 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Shared Memory Abstraction Library"
HOMEPAGE="http://www.ossp.org/pkg/lib/mm/"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
LICENSE="mm"
SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
src_prepare() {
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index d2b192bb1b72..b02174df0870 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1 +1,2 @@
DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
+DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
new file mode 100644
index 000000000000..7ff078b1e4cc
--- /dev/null
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_PN="OpenCL-ICD-Loader"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Official Khronos OpenCL ICD Loader"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-util/opencl-headers-2021.06.30
+ !dev-libs/ocl-icd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
+ cmake_src_test
+}
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index 69c58db7d15f..08bd06628188 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="nls"
multilib_src_configure() {
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
similarity index 98%
rename from dev-libs/snowball-stemmer/snowball-stemmer-2.1.0.ebuild
rename to dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
index c486383408f3..52b680a45998 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/snowballstem/snowball/archive/v${PV}.tar.gz -> ${P}.
test? ( https://github.com/snowballstem/snowball-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> snowball-data-${MY_TESTDATA_COMMIT}.tar.gz )"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/$(ver_cut 1)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
IUSE="static-libs test"
diff --git a/dev-libs/spdlog/spdlog-1.9.2.ebuild b/dev-libs/spdlog/spdlog-1.9.2.ebuild
index deb8aada3af3..b763f5c7e398 100644
--- a/dev-libs/spdlog/spdlog-1.9.2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.9.2.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
virtual/pkgconfig
"
DEPEND="
- >=dev-libs/libfmt-6.1.2:=
+ >=dev-libs/libfmt-8.0.0:=
"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 0cd2105637eb..b763f5c7e398 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,7 +25,7 @@ BDEPEND="
virtual/pkgconfig
"
DEPEND="
- >=dev-libs/libfmt-6.1.2:=
+ >=dev-libs/libfmt-8.0.0:=
"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
index 294cf0ed1422..311c2d36747c 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
SLOT="0/18"
IUSE="archive crypt gtk-doc +introspection test +uchardet"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.56:2
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index 6e3e64f2f795..9e2162740edd 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
troydhanson/uthash
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 8ac8158089a7..a7f61d266e3d 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index b6a66e33b837..396c3740d594 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
+DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
new file mode 100644
index 000000000000..d082ba50ed27
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 CSKY M68k 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=""
+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-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0c9ac9160cf4..6e1bebca16b0 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Params-Util/Params-Util-1.102.0.ebuild b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
index 5e0263bd0653..485a1c6f40e6 100644
--- a/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Utility functions to aid in parameter checking"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=virtual/perl-Scalar-List-Utils-1.180.0
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
index 17daa08658b8..92d7bc0d1faf 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="PerlIO layer to gzip/gunzip"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
index e95671648ea9..e4aa2b610005 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="The Template Toolkit"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="xml gd mysql postgres latex vim-syntax test"
RDEPEND="
diff --git a/dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82.ebuild b/dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82-r1.ebuild
similarity index 84%
rename from dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82.ebuild
rename to dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82-r1.ebuild
index 88b16e33cfe9..939bfc7d3369 100644
--- a/dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82.ebuild
+++ b/dev-perl/Test-MinimumVersion/Test-MinimumVersion-0.101.82-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=RJBS
DIST_VERSION=0.101082
@@ -10,8 +10,6 @@ inherit perl-module
DESCRIPTION="does your code require newer perl than you think?"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-CPAN-Meta
@@ -22,7 +20,7 @@ RDEPEND="
>=virtual/perl-Test-Simple-0.960.0
>=virtual/perl-version-0.700.0
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=virtual/perl-CPAN-Meta-2.120.900
diff --git a/dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0.ebuild b/dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0-r1.ebuild
similarity index 85%
rename from dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0.ebuild
rename to dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0-r1.ebuild
index 8159f0126fe4..9ec303342dcd 100644
--- a/dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0.ebuild
+++ b/dev-perl/Test-Mock-LWP-Dispatch/Test-Mock-LWP-Dispatch-0.80.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=TADAM
DIST_VERSION=0.08
@@ -11,8 +11,6 @@ DESCRIPTION="Mocks LWP::UserAgent and dispatches your requests/responses"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-Carp
@@ -22,13 +20,14 @@ RDEPEND="
dev-perl/libwww-perl
dev-perl/Test-MockObject
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.300.0
test? (
virtual/perl-File-Spec
dev-perl/Test-Exception
)
"
+
src_test() {
perl_rm_files t/release-pod-coverage.t t/release-pod-syntax.t
perl-module_src_test
diff --git a/dev-perl/Test-MockModule/Manifest b/dev-perl/Test-MockModule/Manifest
index 1074dde96b69..6d040dfa214a 100644
--- a/dev-perl/Test-MockModule/Manifest
+++ b/dev-perl/Test-MockModule/Manifest
@@ -1,2 +1,2 @@
-DIST Test-MockModule-0.11.tar.gz 23756 BLAKE2B 1edabcb0f8b0627602be1dab9c572fdf0648360bad4debd4f1c632695938e9a2bb23afbff6f43c07339f0c066835eaee65af0914070643bfa53a1223424b55aa SHA512 417a0de701458e3e26ea194cb2de7756d9a1665b2b7283a375ee95362ee2d7b77996801d4dafd8ead12e97d59c2a57ffd1e98620446d5f47a1836c8ef18983b4
DIST Test-MockModule-0.13.tar.gz 24561 BLAKE2B 2ae6f41b29d78c88e8632fecc560d0a96cf38c7b25c7dcc63f935fe98a718fdea41997ef9663d8838edab89fa815a0696d49439a7b99304332f1b636bea0be0b SHA512 17c2aa7b67fcae2a333788db74fc94da9a680ad83786705e70417cb78df0cfa32e6fcca44962dcc9d7c2ee27c45d8f142ce03b62691da4940ccc405a0bb26472
+DIST Test-MockModule-v0.176.0.tar.gz 23847 BLAKE2B 600b8fbd166b1abed703ceb86028b866a90d30521bde4ed4ec39464ccb5f910094a921f85418b922363956cc429bbace48bbf5635f03ebc250112fefe2946064 SHA512 6e1ce7b8888e18d71f0e84bd2a761593e3a34e169d34251b5259e6e037796c2e207c50d5689d1ab56aa271e71f3ea2f05cc6a86f0bde080db1caf7205587cc60
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
deleted file mode 100644
index b7b62f9ba10d..000000000000
--- a/dev-perl/Test-MockModule/Test-MockModule-0.110.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=6
-
-DIST_VERSION=0.11
-DIST_AUTHOR=GFRANKS
-inherit perl-module
-
-DESCRIPTION="Override subroutines in a module for unit testing"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- virtual/perl-Carp
- dev-perl/SUPER
- virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
- >=dev-perl/Module-Build-0.380.0
- test? ( >=virtual/perl-Test-Simple-0.450.0 )
-"
-src_test() {
- perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
-}
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild
new file mode 100644
index 000000000000..4bf23d318d1f
--- /dev/null
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=v${PV}
+DIST_AUTHOR=GFRANKS
+inherit perl-module
+
+DESCRIPTION="Override subroutines in a module for unit testing"
+
+SLOT="0"
+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="
+ virtual/perl-Carp
+ >=dev-perl/SUPER-1.200.0
+ virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.380.0
+ test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Test-MockObject/Manifest b/dev-perl/Test-MockObject/Manifest
index bd84fea32e24..09f7c3b712e6 100644
--- a/dev-perl/Test-MockObject/Manifest
+++ b/dev-perl/Test-MockObject/Manifest
@@ -1 +1,2 @@
DIST Test-MockObject-1.20161202.tar.gz 29020 BLAKE2B 0d6c23378e5b14586055a9afa092d30c6334b619da53efaeecc2ed9a40d988736c528e4ae3899a92084a6a116b49ea9d20df0655b2c21a2b19e3df7f75a3e7d6 SHA512 6410b33727352f9bd1db5643c45ea187a8bd224146a804e523f3adc0cec5b3cf72238ae212d7ee9500743c74574d4185fcb357ed4351995eb3b51ad158a736f6
+DIST Test-MockObject-1.20200122.tar.gz 30294 BLAKE2B 1c64896dc30b6a67eeac64395f9fb576217f5378d76a01b4942d36b134fe9059102ac055ccad4cfef3f93e71791b21a91f2bcc92dc3f63d1800bdac0b38db9a6 SHA512 05c0e007a22cbf24e5566e2045797b26dcadac697c8f0025422ded0c3ca03fa71d9df0149a28a97ea1454a27c77d22c46a80e705fbc309386b7d3220acd03c5f
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
new file mode 100644
index 000000000000..c00d4d2a3601
--- /dev/null
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHROMATIC
+DIST_VERSION=1.20200122
+inherit perl-module
+
+DESCRIPTION="Perl extension for emulating troublesome interfaces"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Scalar-List-Utils
+ >=dev-perl/UNIVERSAL-can-1.201.106.170
+ >=dev-perl/UNIVERSAL-isa-1.201.106.140
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=dev-perl/Test-Exception-0.310.0
+ >=virtual/perl-Test-Simple-0.980.0
+ >=dev-perl/Test-Warn-0.230.0
+ )
+"
diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
similarity index 76%
rename from dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
rename to dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
index 0bc052484f44..3f47477cef0d 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=DAGOLDEN
DIST_VERSION=1.01
+DIST_EXAMPLES=( 'examples/*' )
inherit perl-module
DESCRIPTION="Replaces random number generation with non-random number generation"
@@ -12,13 +13,12 @@ DESCRIPTION="Replaces random number generation with non-random number generation
LICENSE="Apache-2.0"
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="test minimal examples"
-RESTRICT="!test? ( test )"
+IUSE="minimal"
RDEPEND="
virtual/perl-Carp
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.170.0
test? (
!minimal? (
@@ -31,12 +31,3 @@ DEPEND="${RDEPEND}
virtual/perl-version
)
"
-
-src_install() {
- perl-module_src_install
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- docinto examples/
- dodoc -r examples/*
- fi
-}
diff --git a/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild b/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0-r1.ebuild
similarity index 81%
rename from dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild
rename to dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0-r1.ebuild
index 9b0443a7e9d8..6c6460217011 100644
--- a/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild
+++ b/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=TARAO
DIST_VERSION=0.08
@@ -10,15 +10,13 @@ inherit perl-module
DESCRIPTION="Replace actual time with simulated high resolution time"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
dev-perl/Test-MockTime
virtual/perl-Test-Simple
virtual/perl-Time-HiRes
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
>=dev-perl/Module-Build-Tiny-0.35.0
test? (
dev-perl/Test-Class
diff --git a/dev-perl/Test-MockTime/Manifest b/dev-perl/Test-MockTime/Manifest
index fa162abc3b49..9bffd3746aec 100644
--- a/dev-perl/Test-MockTime/Manifest
+++ b/dev-perl/Test-MockTime/Manifest
@@ -1 +1,2 @@
DIST Test-MockTime-0.16.tar.gz 5804 BLAKE2B b6db2a275e57f494ff5908df9cfffc30b577096b5eb21c3f4a1064754fbfcbf7d082c968826aa5be66babc533256d81af20fbe1ef27df4106a7581984da70fb8 SHA512 158026f9b1590131b51a004c0b8ecc7e190d0bd90da13ae56f645909e30ce6830deae1821874d71a1ad4d0dee84cd9e2b50aeacf7ef1d9cd465332823da0f927
+DIST Test-MockTime-0.17.tar.gz 5885 BLAKE2B 6a27d6731554f934802c7cca561f4bd7bcf960b1007df4562dfc807a62961d965daa94c11d218ac2b557ed4bb6b1a8e0503630002cb7a32f2045c99939ed9299 SHA512 ad73be430e3a483a61209bacf4bfa170d6eec6597d3c0efcf5de167f9c129fbf656581dcdceeba88bd98e530371db2542894ded793f9d46e4155c612e2b7cac5
diff --git a/dev-perl/Test-MockTime/Test-MockTime-0.170.0.ebuild b/dev-perl/Test-MockTime/Test-MockTime-0.170.0.ebuild
new file mode 100644
index 000000000000..443cb1c5f100
--- /dev/null
+++ b/dev-perl/Test-MockTime/Test-MockTime-0.170.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DDICK
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Replaces actual time with simulated time"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ virtual/perl-Time-Piece
+ virtual/perl-Time-Local
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}"
+
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild b/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0-r1.ebuild
similarity index 92%
rename from dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild
rename to dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0-r1.ebuild
index 7833e1e42d29..77f1c3a927f7 100644
--- a/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild
+++ b/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=MONS
DIST_VERSION=0.05
@@ -13,15 +13,14 @@ DESCRIPTION="Enhancing Test::More for UTF8-based projects"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 x86"
-IUSE=""
-
-PERL_RM_FILES=(
- "t/pod-coverage.t"
- "t/pod.t"
-)
RDEPEND="
virtual/perl-Test-Simple
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
+
+PERL_RM_FILES=(
+ "t/pod-coverage.t"
+ "t/pod.t"
+)
diff --git a/dev-perl/Test-Most/Manifest b/dev-perl/Test-Most/Manifest
index 4f6321b93b9d..868b26a3ac3c 100644
--- a/dev-perl/Test-Most/Manifest
+++ b/dev-perl/Test-Most/Manifest
@@ -1,2 +1,2 @@
-DIST Test-Most-0.34.tar.gz 15919 BLAKE2B 2daad98526541c8c84c76dd8dd03f57350fb077b6854f3dafee7bcaaaca59f1ef0d521515f07f6c9af9604554388d0a221caf9f71e2b7953e3492f9d78d252f0 SHA512 00706bb25e6b9f806b536f75f66356413cdbcb19efd1c8b163fbd3357f61abe9e06e57c311eff216d36962ce74beb996db6cd4f0d2e5ed58fa5c0a0af32a33ef
DIST Test-Most-0.35.tar.gz 16074 BLAKE2B 7b23fd0a7a2c529d7408c288047de795cd670b1ba107e274729dc215c277748e55ddc1793018500f11b68bdfed91d3654b9fffc76788e882c4883db96620c05c SHA512 1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291
+DIST Test-Most-0.37.tar.gz 16544 BLAKE2B 2b6ecfa942dff391aa653aba0e5525c9e662ff0bdc4f53101bd808c496458256dadce8a5a403dff74607cab37eee683cd36abe5f676c59b7761b9c15bbc37fea SHA512 133dbb9815884fbecd65520dd2f2d43a761439c33f7d32ffdfc80ed3d3e05fb563dca420cf5445e61382735a048c467b35b5c160b1013b5f5c7616be00aa328d
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
deleted file mode 100644
index 7c7bb62e9089..000000000000
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=OVID
-MODULE_VERSION=0.34
-inherit perl-module
-
-DESCRIPTION="Most commonly needed test functions and features"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/Exception-Class-1.140.0
- >=dev-perl/Test-Warn-0.230.0
- >=dev-perl/Test-Deep-0.106
- >=dev-perl/Test-Differences-0.610.0
- >=dev-perl/Test-Exception-0.310.0
- >=virtual/perl-Test-Harness-3.210.0
- >=virtual/perl-Test-Simple-0.88
-"
-DEPEND="${RDEPEND}
- >=dev-perl/Module-Build-0.400.0
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Test-Most/Test-Most-0.370.0.ebuild b/dev-perl/Test-Most/Test-Most-0.370.0.ebuild
new file mode 100644
index 000000000000..9d5890859ef7
--- /dev/null
+++ b/dev-perl/Test-Most/Test-Most-0.370.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OVID
+DIST_VERSION=0.37
+inherit perl-module
+
+DESCRIPTION="Most commonly needed test functions and features"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-perl/Exception-Class-1.140.0
+ >=dev-perl/Test-Deep-0.119.0
+ >=dev-perl/Test-Differences-0.640.0
+ >=dev-perl/Test-Exception-0.430.0
+ >=virtual/perl-Test-Harness-3.350.0
+ >=virtual/perl-Test-Simple-1.302.47
+ >=dev-perl/Test-Warn-0.300.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index f65314477be4..bb0c9b694e87 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,2 +1 @@
-DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
DIST Test-Needs-0.002009.tar.gz 17052 BLAKE2B e8c51a23b1febe592ee25b0c83741695d07777adfbc2f0e4fa58a81284d0da5d7601b312cc7b33ead19680b728ba481efceb8b4fe042823212f4523f1028a009 SHA512 758f22ca9b024f7d3252ff575ae84453e64f4ef4e18d3233cdaa3b81d9212cf48e41fde529047e7355678d5e53345bd51210a45dd9545c3bf8ffe16f96a9500d
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
deleted file mode 100644
index e849641a81e8..000000000000
--- a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HAARG
-DIST_VERSION=0.002005
-inherit perl-module
-
-DESCRIPTION="Skip tests when modules not available"
-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="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? ( >=virtual/perl-Test-Simple-0.450.0 )
-"
diff --git a/dev-perl/Test-NoTabs/Manifest b/dev-perl/Test-NoTabs/Manifest
index 7d29de0d04a2..d3b59cbbab5d 100644
--- a/dev-perl/Test-NoTabs/Manifest
+++ b/dev-perl/Test-NoTabs/Manifest
@@ -1 +1,2 @@
DIST Test-NoTabs-2.00.tar.gz 28343 BLAKE2B b2519558f4f53f073555058c598fbbac587a2d7f43773de506f60426ba3b8ce8be4514b19e4fed07b66ff3a74845de1f73e535f280276d9dc44f561e903a9d67 SHA512 e776f5c12029376a7754492482f62385a391aec31b3dfd979a8eb20aa81dd66ef8c7d33435e67f8f1eb151cf5833e5bde33c09ceccef27ac6e20958f28ff83e8
+DIST Test-NoTabs-2.02.tar.gz 29626 BLAKE2B 7a9138e31a8f955b55496156520d5db4d7d2d9eb269417973a734321807b6df28d2729965269b3a8d7aa201e2ffa476d1bc6011c2833709d7c021fd4d191d174 SHA512 e7bd189fde1b35f67569ea702735ead8595684807491cf1635cb6a7d9360adca23d411ec1a165796afc45d55d1a724e07cecf8ddbd06206d4fe38f553954af3a
diff --git a/dev-perl/Test-NoTabs/Test-NoTabs-2.20.0.ebuild b/dev-perl/Test-NoTabs/Test-NoTabs-2.20.0.ebuild
new file mode 100644
index 000000000000..bba6b907d461
--- /dev/null
+++ b/dev-perl/Test-NoTabs/Test-NoTabs-2.20.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=2.02
+
+inherit perl-module
+
+DESCRIPTION="Check the presence of tabs in your project"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ virtual/perl-File-Spec
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Temp
+ )
+"
diff --git a/dev-perl/Test-NoWarnings/Manifest b/dev-perl/Test-NoWarnings/Manifest
index 5815ecadcadf..b773d16da190 100644
--- a/dev-perl/Test-NoWarnings/Manifest
+++ b/dev-perl/Test-NoWarnings/Manifest
@@ -1 +1,2 @@
DIST Test-NoWarnings-1.04.tar.gz 18204 BLAKE2B 60f8eae51f8ada20f91d7b512d254c224a7d3ca3c4d4e72d614338fa2561e31a4224d619157b8ecda5405e4cf900783c1d3d4759eccf92722bd72d75a6710e0a SHA512 48126d2385e6f7863067f541763f64bc72132f6093f316f75d15ad7dca9b863dc469dff18c6e3f93105647844acb5cd10e4d056d3aa19217cb9588eb8a5f0d7a
+DIST Test-NoWarnings-1.06.tar.gz 19445 BLAKE2B 6efda6a421925b1c740e49ad81e9ab929c48dbbf2a93fa1a97b48149dffa974e24cac0debdc813b5f38b06636163891f0d5441d3ccda340d214ac5b452ef6e02 SHA512 e8ceef3d56942996107a20843fd75fb4353f7ec787029e0f43c2d64f57267f2cb5be3b07d6744d32d41770181ce1c712f50f57df7bdea141acca75897485d7af
diff --git a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild
new file mode 100644
index 000000000000..ed1b83053353
--- /dev/null
+++ b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=1.06
+inherit perl-module
+
+DESCRIPTION="Make sure you didn't emit any warnings while testing"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+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"
+
+RDEPEND="virtual/perl-Test-Simple"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
similarity index 91%
rename from dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild
rename to dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
index 1eacbf840e31..6b5b7b724ea8 100644
--- a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild
+++ b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=DAGOLDEN
DIST_VERSION=1.06
@@ -13,14 +13,14 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
+IUSE="minimal"
+
RDEPEND="
virtual/perl-Carp
virtual/perl-Exporter
virtual/perl-Test-Simple
"
-DEPEND="
+BDEPEND="
>=virtual/perl-ExtUtils-MakeMaker-6.170.0
test? (
!minimal? (
diff --git a/dev-perl/Test-Object/Test-Object-0.80.0.ebuild b/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
similarity index 84%
rename from dev-perl/Test-Object/Test-Object-0.80.0.ebuild
rename to dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
index fa33679d37cf..6dc4781da920 100644
--- a/dev-perl/Test-Object/Test-Object-0.80.0.ebuild
+++ b/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=ETHER
DIST_VERSION=0.08
@@ -11,15 +11,14 @@ DESCRIPTION="Thoroughly testing objects via registered handlers"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-Carp
virtual/perl-Exporter
>=virtual/perl-Scalar-List-Utils-1.160.0
- virtual/perl-Test-Simple"
-DEPEND="${RDEPEND}
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( virtual/perl-File-Spec )
"
diff --git a/dev-perl/Test-Output/Manifest b/dev-perl/Test-Output/Manifest
index 7dd3f2b0f949..b4ec4e688892 100644
--- a/dev-perl/Test-Output/Manifest
+++ b/dev-perl/Test-Output/Manifest
@@ -1 +1,2 @@
DIST Test-Output-1.031.tar.gz 16821 BLAKE2B b0422d320fe43c78b12ef3bc4ac64279541fe6d68dcd8862dac65ae44d552ea07e2e73dc42a3ddff59725a60df7712ccf152cb841bc2b1c8224e5e57bbb5597f SHA512 b443d5a4ab7be1c308b74ebc9a1a50022b404886e8a1dbd2700d974ead506a6976ec6d5c141528cf1c2833174c3afd9023362cb0b4e000f0e878d2e3e9f90e90
+DIST Test-Output-1.033.tar.gz 17196 BLAKE2B dedaab02548bfef11473cb5778082908adffca7bba8862f83b48cbb395320a4207d9915161bc19034641424f45c5bd312bd551e93579947a0c1ef2dd7d30c731 SHA512 cc6e94baa5163e2ca0c23d63a6b505da207ed7f436bf9a1a77234ad898c34ae4d81ac42f17d1b8a73a223fd19ce1d1f66f3eef0fc852bb712f4f925a77f29820
diff --git a/dev-perl/Test-Output/Test-Output-1.33.0.ebuild b/dev-perl/Test-Output/Test-Output-1.33.0.ebuild
new file mode 100644
index 000000000000..bf9445b1094e
--- /dev/null
+++ b/dev-perl/Test-Output/Test-Output-1.33.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.033
+inherit perl-module
+
+DESCRIPTION="Utilities to test STDOUT and STDERR messages"
+
+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"
+
+RDEPEND="
+ >=dev-perl/Capture-Tiny-0.170.0
+ >=virtual/perl-File-Temp-0.170.0
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.640.0
+ virtual/perl-File-Spec
+ test? (
+ >=virtual/perl-Test-Simple-1.0.0
+ )
+"
+
+src_test() {
+ perl_rm_files t/pod{,-coverage}.t
+ perl-module_src_test
+}
diff --git a/dev-perl/Test-Perl-Critic/Manifest b/dev-perl/Test-Perl-Critic/Manifest
index c3533c818bec..3043a4c228b6 100644
--- a/dev-perl/Test-Perl-Critic/Manifest
+++ b/dev-perl/Test-Perl-Critic/Manifest
@@ -1 +1,2 @@
DIST Test-Perl-Critic-1.03.tar.gz 21467 BLAKE2B 2f94ed96bcfa0b12e80be4417344b02792bb3e4b15c1d4a3e555e5740d8d823730a8c77c8a961772d4a0493b404db4ab46455917406300e9cfad2f50f837721e SHA512 2b6b9e7a73d00c99584853fdc5aef74dea5a581bb4bbe103eb65b086de659cb3328b0e58ec6e64413b76fa37a834083ff0c87cdc02413576f910904e0efd7b30
+DIST Test-Perl-Critic-1.04.tar.gz 22140 BLAKE2B 84723863b467c1b388ff7142cbb415b6bbc9e5a981d1dce98dac2e803f0650a072c511fc08ba2a540da86238b9f5b26eef3d08bb76b789d2e49d6957eaab26c1 SHA512 bb4d0c671c927e849b24d97feb4c95bb612f5975af165650065d5fdbe2584a48cd8fc39dd14f8ab1a0e75e7ab067a86504f1b3729cdc43dc87bfb146fe526fbb
diff --git a/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.40.0.ebuild b/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.40.0.ebuild
new file mode 100644
index 000000000000..250a43c0a66c
--- /dev/null
+++ b/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.40.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="Use Perl::Critic in test programs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ virtual/perl-Carp
+ >=dev-perl/MCE-1.827.0
+ >=dev-perl/Perl-Critic-1.105.0
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.400.0
+"
diff --git a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
similarity index 84%
rename from dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild
rename to dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
index 6fa3f779de53..f873703d6d5f 100644
--- a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild
+++ b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=NEILB
DIST_VERSION=1.10
@@ -11,14 +11,13 @@ DESCRIPTION="Check for pod coverage in your distribution"
LICENSE="Artistic-2"
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="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-Test-Simple
dev-perl/Pod-Coverage"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
src_test() {
perl_rm_files t/pod.t
diff --git a/dev-perl/Test-Pod/Manifest b/dev-perl/Test-Pod/Manifest
index 051d69b27607..eea6c3a2aff9 100644
--- a/dev-perl/Test-Pod/Manifest
+++ b/dev-perl/Test-Pod/Manifest
@@ -1 +1,2 @@
DIST Test-Pod-1.51.tar.gz 12159 BLAKE2B 569fd4764ce2b5d2f64f54d92c7ee5c6cab9bc38944a72fe439b1e5f6bb49196ca12a741bf7ed98ba72b4248c62a96ae462e27085f76afcf1da81cf7e47e9037 SHA512 bf4e8b2a71a79a5edec86991c7cbbcc929fa4f2eb403b411cd678fbdf89fe30c198e00a29db80ca9c98fe6655167c0a77e7f166f073a18711db3b1f3e5cd3c15
+DIST Test-Pod-1.52.tar.gz 11841 BLAKE2B fd7952505033943701a3126283b8c144a170824de32a31e673da7db5139a476811e45f4beaa7fe2ccfcd81eae5927286403f0d73e50b9a5c4acb79b833f9a307 SHA512 9b078488e1da8b907f5f3a46452aa9bfd49db61f1539d076dccebf9a8b476eaf0f539f00badc9c500b1e732a8827331b2286375924986efb990367767eeb8365
diff --git a/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild
new file mode 100644
index 000000000000..3590840e68fa
--- /dev/null
+++ b/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.52
+inherit perl-module
+
+DESCRIPTION="Check for POD errors in files"
+
+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"
+
+RDEPEND="
+ >=virtual/perl-Pod-Simple-3.50.0
+ >=virtual/perl-Test-Simple-0.620.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ )
+"
diff --git a/dev-perl/Test-Portability-Files/Manifest b/dev-perl/Test-Portability-Files/Manifest
index 6cc1e2348d46..154e3f609643 100644
--- a/dev-perl/Test-Portability-Files/Manifest
+++ b/dev-perl/Test-Portability-Files/Manifest
@@ -1 +1,2 @@
DIST Test-Portability-Files-0.09.tar.gz 19875 BLAKE2B 288a28c2f0b572dc4c51b64b54af6b792fd3717e0e223bc76218e0f7876c4c6fb366b087cf85fdbb40992a3c4f05f14b0ade2c7137556e7e24306e122f5c6501 SHA512 bb397342bf0c4d09e1a5a2ee7b7fe9ec9094c83e8b19f36b2ac803fed192cf4021723e9960d184b2acbd274852a258edfe505ba55efe4eed75c8b501e1aed2e7
+DIST Test-Portability-Files-0.10.tar.gz 20879 BLAKE2B 4eaf04e7d3d680f672341da6a05ed64f2c586f70ef9a5f914eec3b08bd355dde12c8a9a60f47787d3440caf473268dbabe6acd076d792ea4fa92dca012756654 SHA512 e83177e7a08d7c922ce4a51304e160824036e14f3ec77b01fa864918b496823e7425fbe8df0e7d406e00d93767aa8a02ab72088e0eceeded16d45707171ecf03
diff --git a/dev-perl/Test-Portability-Files/Test-Portability-Files-0.100.0.ebuild b/dev-perl/Test-Portability-Files/Test-Portability-Files-0.100.0.ebuild
new file mode 100644
index 000000000000..3952ad9fdfe5
--- /dev/null
+++ b/dev-perl/Test-Portability-Files/Test-Portability-Files-0.100.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ABRAXXA
+DIST_VERSION=0.10
+inherit perl-module
+
+DESCRIPTION="Check file names portability"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ virtual/perl-File-Spec
+ virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-File-Temp-0.230.400
+ virtual/perl-IO
+ >=virtual/perl-Test-Simple-0.980.0
+ )
+"
+
+src_prepare() {
+ perl_rm_files t/release-*.t t/author-*.t
+ perl-module_src_prepare
+}
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
similarity index 78%
rename from dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
rename to dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
index 68bb2a8f1459..4e755f481fef 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit versionator
+EAPI=8
DIST_AUTHOR=ABIGAIL
-DIST_VERSION=$(get_major_version)
-
+DIST_VERSION=2017040101
inherit perl-module
DESCRIPTION="Provide commonly requested regular expressions"
@@ -15,17 +12,15 @@ DESCRIPTION="Provide commonly requested regular expressions"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="
- test? ( >=virtual/perl-Test-Simple-1.1.14 )
- virtual/perl-ExtUtils-MakeMaker
-"
RDEPEND="
virtual/perl-Test-Simple
virtual/perl-Exporter
"
+BDEPEND="${RDEPEND}
+ test? ( >=virtual/perl-Test-Simple-1.1.14 )
+ virtual/perl-ExtUtils-MakeMaker
+"
src_test() {
# Omit code coverage / documentation tests
diff --git a/dev-perl/Test-Requires/Manifest b/dev-perl/Test-Requires/Manifest
index 6f5da1658a18..d0127d72f14c 100644
--- a/dev-perl/Test-Requires/Manifest
+++ b/dev-perl/Test-Requires/Manifest
@@ -1 +1,2 @@
DIST Test-Requires-0.10.tar.gz 10788 BLAKE2B 712e902d6e69354465876a6a20b38a5809e46fe81630c0e0f7b484ccb1b6c7d8a9128cd27a2054c774fc8e1fde5b87d21c5892be3e30f0f322437d9e13e6228b SHA512 5bc6bf52ae5ab3c56f49b7b17faedf7d6afef2cadfca8aab4770f2c2f91cd4fcb98921e1af159d1dc42684b80f50d4b7fc12bd05ef9dccdcbeeeb6100a9e5ae6
+DIST Test-Requires-0.11.tar.gz 10902 BLAKE2B e0d6779a52bf306526e410d7c37b5c74a4eb10b1d2cdc697d36e94b07c58af209942493e36218bc4a1ed2d8d036b016dfaf1500cb95f37b2bfffac4ffd03a853 SHA512 770ea2469e386296fe1ded3630fa9b7f30ee22acd3522fb83ad95171ccb96812ef2fc5fa30d658a405dc1c435d35b6d476cc054021d74e04b419b517f6f898fa
diff --git a/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild
new file mode 100644
index 000000000000..c5527fb12d4e
--- /dev/null
+++ b/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Checks to see if the module can be loaded"
+
+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 ~x86-solaris"
+
+RDEPEND="
+ >=virtual/perl-Test-Simple-0.470.0
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.640.0
+"
diff --git a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
similarity index 89%
rename from dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild
rename to dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
index 122c630d7089..740dd6c0e41e 100644
--- a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild
+++ b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=MALLEN
DIST_VERSION=0.05
@@ -11,13 +11,11 @@ DESCRIPTION="Easily test network connectivity"
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="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-Socket
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
virtual/perl-Test-Simple
diff --git a/dev-perl/Test-Script/Manifest b/dev-perl/Test-Script/Manifest
index add130a1e10a..e3ddedbe5283 100644
--- a/dev-perl/Test-Script/Manifest
+++ b/dev-perl/Test-Script/Manifest
@@ -1,2 +1,2 @@
-DIST Test-Script-1.18.tar.gz 23092 BLAKE2B 0150648353772504c3fd315a9487beb9af0d941df01ad6808ab952dff7d2fd25087796ddfa84ddc362754944c68dc74a388d64a4cccef52210069e8de1fafc63 SHA512 c89e1dd68ca275744ac12811f0d66d42f8fd76766cc515e11e0df2a82beb8cc052253e19b04f5bc86d45e3a9a2a1d6afd5cd4707e8a97f3a9d4c1dd28e4a72b4
DIST Test-Script-1.23.tar.gz 22974 BLAKE2B 94267dfc75af9aecb02a9cc49f9f41223f85292892db7262bb3d7617dd73dd9a03cb9e98ed58b463b9337af217136d30bfdf29020eeb25947cf0838078534a3d SHA512 996564ba87b12849e86883b970117c9d5806be5b00d42207df1027f823a19497bf878640c46a8286e7d77afb8d1fbb3ef6dcfc0d21c2738a5ef124ddf5bc4834
+DIST Test-Script-1.29.tar.gz 26506 BLAKE2B 45434b4cfb308906c724272dfde7a320c6a6b470a10ff19c62736e38b1e4fe2be4c6a17cb2e3dc45b021619365b0f4c11b00bf3045350809ce37772462c678c9 SHA512 979fade0abc83f8d7d4c1c094fa928e27bd7c9db52140b156689d3b192d9ea84f5824554d6788c9144cf2923a04b1d8a8bdfdcc05a0be5514de92353c9a7d10f
diff --git a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild b/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
deleted file mode 100644
index cfb3375ad11e..000000000000
--- a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PLICEASE
-DIST_VERSION=1.18
-inherit perl-module
-
-DESCRIPTION="Cross-platform basic tests for scripts"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="
- >=virtual/perl-File-Spec-0.800.0
- >=dev-perl/Probe-Perl-0.10.0
- >=dev-perl/IPC-Run3-0.34.0
- >=virtual/perl-Test-Simple-0.960.0"
-# NB: Needs Test::Builder::Tester 1.02 =>
-# which is <= Test-Simple-0.96
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Test-Script/Test-Script-1.290.0.ebuild b/dev-perl/Test-Script/Test-Script-1.290.0.ebuild
new file mode 100644
index 000000000000..99deefbe670a
--- /dev/null
+++ b/dev-perl/Test-Script/Test-Script-1.290.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=1.29
+inherit perl-module
+
+DESCRIPTION="Cross-platform basic tests for scripts"
+
+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"
+
+RDEPEND="
+ dev-perl/Capture-Tiny
+ >=virtual/perl-File-Spec-0.800.0
+ virtual/perl-IO
+ >=dev-perl/Probe-Perl-0.10.0
+ >=virtual/perl-Test-Simple-1.302.15
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=dev-perl/Test2-Suite-0.0.60
+ )
+"
diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
similarity index 89%
rename from dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild
rename to dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
index eaea79830a44..ee81b2afa72e 100644
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=EXODIST
DIST_VERSION=0.35
@@ -11,14 +11,12 @@ DESCRIPTION="Ensure that tests work correctly when fork() is used"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-File-Temp
>=virtual/perl-Test-Simple-0.880.0
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.640.0
test? (
virtual/perl-Test-Harness
diff --git a/dev-perl/Test-Spec/Test-Spec-0.540.0.ebuild b/dev-perl/Test-Spec/Test-Spec-0.540.0-r1.ebuild
similarity index 84%
rename from dev-perl/Test-Spec/Test-Spec-0.540.0.ebuild
rename to dev-perl/Test-Spec/Test-Spec-0.540.0-r1.ebuild
index 4c26ad0c97b1..8af6d52fc665 100644
--- a/dev-perl/Test-Spec/Test-Spec-0.540.0.ebuild
+++ b/dev-perl/Test-Spec/Test-Spec-0.540.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
DIST_AUTHOR=AKZHAN
DIST_VERSION=0.54
inherit perl-module
@@ -9,8 +10,6 @@ inherit perl-module
DESCRIPTION="Write tests in a declarative specification style"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
virtual/perl-Carp
@@ -23,7 +22,7 @@ RDEPEND="
dev-perl/Test-Trap
dev-perl/Tie-IxHash
"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
dev-perl/Devel-GlobalPhase
diff --git a/dev-perl/Test-Strict/Manifest b/dev-perl/Test-Strict/Manifest
index ea72ecb15853..0dfdd1f07a50 100644
--- a/dev-perl/Test-Strict/Manifest
+++ b/dev-perl/Test-Strict/Manifest
@@ -1 +1,2 @@
DIST Test-Strict-0.47.tar.gz 20679 BLAKE2B e72eef42fdb7c0e354147c06f4e7c418d5c302d0bca662995042d7046fd9deae3ae6b12fa0f780aff8d6f0e5cab52db76184d99471d130ce18bfd6c00657dddb SHA512 56ffc488cb2502af228ad03f3da7bf11f04c0cacc7f1ea13b3aa8e0578f0df36a9be092f71db973748c8db15f45873a384f2e24844468b9a300d2386692c21b9
+DIST Test-Strict-0.52.tar.gz 20932 BLAKE2B 720358a1e0f9a8ee73a8f8bd2b61bb69f39e597c8712d4ad98772354daf0c41763c6ffa90870cac8326b71cd173a1400d4c411cb0e6797f7d9dc3f05b7af2b3e SHA512 2d2e27f8fa5156bae4b54c2a9da5f5bd37c820ca9f9594f51c0915695f74f16880445d8a47de5a86d0277482b8234d4ab8e1c8a7ba00871c950268be40f543b5
diff --git a/dev-perl/Test-Strict/Test-Strict-0.520.0.ebuild b/dev-perl/Test-Strict/Test-Strict-0.520.0.ebuild
new file mode 100644
index 000000000000..869edefb5a8d
--- /dev/null
+++ b/dev-perl/Test-Strict/Test-Strict-0.520.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MANWAR
+DIST_VERSION=0.52
+inherit perl-module
+
+DESCRIPTION="Check syntax, presence of use strict; and test coverage"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=virtual/perl-File-Spec-0.10.0
+ >=virtual/perl-File-Temp-0.10.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/IO-stringy
+ >=virtual/perl-Test-Simple-1.0.0
+ )
+"
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
similarity index 91%
rename from dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
rename to dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
index 89b52437aaac..51d8c6fc0cee 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DIST_AUTHOR=ETHER
DIST_VERSION=1.10
@@ -11,14 +11,13 @@ DESCRIPTION="Track the number of times subs are called"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-DEPEND="
+RDEPEND="
virtual/perl-Exporter
>=virtual/perl-File-Spec-0.800.0
>=dev-perl/Hook-LexWrap-0.200.0
>=virtual/perl-Test-Simple-0.420.0
"
-RDEPEND="${DEPEND}
+BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
diff --git a/dev-perl/Test-Taint/Manifest b/dev-perl/Test-Taint/Manifest
index c6929f04b4ca..d59b2c4bd6e5 100644
--- a/dev-perl/Test-Taint/Manifest
+++ b/dev-perl/Test-Taint/Manifest
@@ -1 +1,2 @@
DIST Test-Taint-1.06.tar.gz 13346 BLAKE2B 089d3c51a90bf307001fe77b6cf6bfee3f6c1b49ea270724afabd04be32a4fb2dced13eac26a8d735728d7ee8af75da99c080406ccbc45c0429784d2538646b5 SHA512 58221b0145d9b908994c093168ca547a18cd56113f4923a4662bb9c113635378740363914d1fd43602f15c76a23cfe26d0682ed6ce22836d712692f439e782c2
+DIST Test-Taint-1.08.tar.gz 13388 BLAKE2B 0e0fe7e9c45c71d1bc19dfc9e78a1bc50b5e01b38b18974e9ad2dea61756672fecbba6d9ba0bb2634d22ff2ccb10e6fdd9cc94050a0a371a4d11ac59a4a06f88 SHA512 2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20
diff --git a/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild b/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild
new file mode 100644
index 000000000000..12a4ba40030c
--- /dev/null
+++ b/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.08
+inherit perl-module
+
+DESCRIPTION="Tools to test taintedness"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+src_test() {
+ perl_rm_files t/pod-coverage.t t/pod.t
+ perl-module_src_test
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 41731753394e..5cc83ccfab57 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index a7cfe5a8314e..e394309ac89c 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1 +1,2 @@
DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
+DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
new file mode 100644
index 000000000000..32a585eab37d
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN="${PN/pecl-}"
+MY_PV="${PV/_rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
+
+USE_PHP="php7-3 php7-4 php8-0"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+S="${PHP_EXT_S}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 404b1e8693f0..b6efe99f588d 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1 +1,2 @@
DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
+DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
new file mode 100644
index 000000000000..e7895b657c1a
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_ECONF_ARGS=()
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Bindings for the libmcrypt library"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 64f9f062d021..83ba15d4a4be 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1 +1,2 @@
DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
diff --git a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
new file mode 100644
index 000000000000..08a881c182d8
--- /dev/null
+++ b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
@@ -0,0 +1,41 @@
+--- a/tests/experimental/session_gc.phpt 2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/session_gc.phpt 2021-08-27 14:30:01.504619748 -0400
+@@ -20,22 +20,23 @@
+
+ session_start();
+ $_SESSION['foo'] = 1;
+-var_dump($_SESSION);
++$session1 = $_SESSION;
+ session_write_close();
+
+ $_SESSION = NULL;
+-var_dump($_SESSION);
++$session2 = $_SESSION;
+
+ session_start();
+-var_dump($_SESSION);
++$session3 = $_SESSION;
+ session_write_close();
+
+ sleep(3);
+
+ session_start();
+-var_dump($_SESSION);
++$session4 = $_SESSION;
+ session_write_close();
+
++var_dump($session1, $session2, $session3, $session4);
+
+ --EXPECT--
+ array(1) {
+--- a/tests/experimental/extreme_floats.phpt 2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/extreme_floats.phpt 2021-08-27 14:40:03.223499433 -0400
+@@ -2,6 +2,8 @@
+ Extreme floats: max, min, Inf, -Inf, and NaN
+ --SKIPIF--
+
++--INI--
++serialize_precision = 14
+ --FILE--
+ ${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
+ sys-libs/zlib
+"
+
+RDEPEND="
+ php_targets_php7-3? (
+ ${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?]
+ igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
+ )
+ php_targets_php7-4? (
+ ${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?]
+ igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
+ )
+ php_targets_php8-0? (
+ ${COMMON_DEPEND} dev-lang/php:8.0[session(-)?]
+ igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] )
+ )"
+DEPEND="${RDEPEND} test? ( net-misc/memcached )"
+
+PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" )
+
+src_unpack() {
+ default
+ mv "${WORKDIR}/php-memcached-${REPO_COMMIT}" "${S}" || die
+ ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/skipif.inc" || die
+ ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/serializer/skipif.inc" || die
+ local x
+ local broken_tests=(
+ # Known broken tests. https://github.com/php-memcached-dev/php-memcached/issues/386
+ get_bykey_cas getdelayed_bykey_cas getdelayed_cbthrows
+ stats stats_badserver getmulti_badserver
+ # Excessive warnings make them "BORK"
+ serializer/serializer_php_bad_serialize serializer/serializer_php_bad_unserialize
+ )
+ for x in "${broken_tests[@]}" ; do
+ rm "${S}/tests/experimental/${x}.phpt" || die
+ done
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS="--enable-memcached
+ $(use_enable session memcached-session)
+ $(use_enable sasl memcached-sasl)
+ $(use_enable json memcached-json)
+ $(use_enable igbinary memcached-igbinary)"
+
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ touch "${T}/memcached.pid" || die
+ local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
+ [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+ memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+ local exit_status
+ php-ext-source-r3_src_test
+ exit_status=$?
+
+ kill "$(<"${T}/memcached.pid")"
+ return ${exit_status}
+}
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index e4605a375aad..7da8caaeff39 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1 +1,2 @@
DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
+DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
new file mode 100644
index 000000000000..54ba34e572c7
--- /dev/null
+++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="pam"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
+DOCS=( README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3 pam
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ #Fix DOS line endings
+ sed -i 's/\r$//' -- pam.c || die
+ php-ext-source-r3_src_prepare
+}
+
+src_install() {
+ pamd_mimic_system php auth account password
+ php-ext-pecl-r3_src_install
+}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..34f9154d7935
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ps"
+USE_PHP="php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples"
+
+DEPEND="dev-libs/pslib"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=""
+
+src_test() {
+ # tests/004.phpt depends on set numeric format
+ LC_ALL=C php-ext-pecl-r3_src_test
+}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
deleted file mode 100644
index fd04378b47c9..000000000000
--- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# Only really build for >=7.0
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for creating PostScript files"
-LICENSE="BSD"
-SLOT="7"
-IUSE="examples"
-
-DEPEND="
- php_targets_php7-1? ( dev-libs/pslib )
- php_targets_php7-2? ( dev-libs/pslib )
- php_targets_php7-3? ( dev-libs/pslib )
- php_targets_php7-4? ( dev-libs/pslib )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
- if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
- php-ext-source-r3_src_prepare
- else
- default_src_prepare
- fi
-}
-
-src_install() {
- if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
- php-ext-pecl-r3_src_install
- fi
-}
-
-src_test() {
- if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
- # tests/004.phpt depends on set numeric format
- LC_ALL=C php-ext-pecl-r3_src_test
- fi
-}
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index 8317998a9905..7b4b9e48b084 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -1 +1,2 @@
DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
+DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
new file mode 100644
index 000000000000..f8aad573f6e7
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*[cli]
+ >=dev-php/theseer-DirectoryScanner-1.3
+ =dev-php/zetacomponents-Base-1.8
+ =dev-php/zetacomponents-ConsoleTools-1.7.1
+
astor
+ berkerpeksag/astor
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 70c0c53c5255..775d87e6254b 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1,3 @@
DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
DIST astroid-2.7.2.tar.gz 374584 BLAKE2B 09f0f70bd0caa8e4971611d2190ccfbc06a8f871abe1e47313ff574bf4680eb26ec67c0a89fc0a434a15535b2c31d005036a0780b62495ac9d6b69e7f04419d3 SHA512 c14841265b2d50a76a5f4ff9c9f19fcdab9e1de8d726e1d40185e517bd3e9c7e1c131e23e0160102f842d7233884eb66d7db7d2443e2609db87d6ec88ed7d5b6
+DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
diff --git a/dev-python/astroid/astroid-2.7.3.ebuild b/dev-python/astroid/astroid-2.7.3.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.7.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+ https://github.com/PyCQA/astroid/
+ https://pypi.org/project/astroid/"
+SRC_URI="
+ https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+ >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+ local deselect=(
+ # no clue why it's broken
+ tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+ )
+
+ # Faker causes sys.path_importer_cache keys to be overwritten
+ # with PosixPaths
+ epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 5d1868f898d5..c4c9cb9644f8 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,3 +1,4 @@
DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
+DIST black-21.8b0.tar.gz 1167978 BLAKE2B e7df398d09b71389069991bf0872a97d8a8c0b13ddeec12ee8f08ae9d9716a3d47447727d2759d475f10d323df151b8bb2353f3fd60c99eccb1e912554ebbe7b SHA512 ed38dbf0c881fee7da74f0d6bfe4ea0f85b5bed30d37abde2fd728e33f94ceaaa27b7107cfe763c19bdaea57fcbf54bcae82ce8bdcabc29035cdc85a8e10ab00
diff --git a/dev-python/black/black-21.8_beta0.ebuild b/dev-python/black/black-21.8_beta0.ebuild
new file mode 100644
index 000000000000..476aa5429eae
--- /dev/null
+++ b/dev-python/black/black-21.8_beta0.ebuild
@@ -0,0 +1,51 @@
+# 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 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ >=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+ >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2aecc8b78be2..4914f9a8e98c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,4 +7,6 @@ DIST boto3-1.18.27.tar.gz 405813 BLAKE2B d3da4db8133c9ad7b979a6a765f0f6d7d72e558
DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
DIST boto3-1.18.29.tar.gz 406872 BLAKE2B c1535f65d03766cd1ffc0ff3b34e3c2df2ed912d3d4e6fc81ac682f006a2610844b5bfe182ab976668e8febd4ea0e5a71e67194bd5766ef8400942fa1d1077cc SHA512 ab2176be91a4cb84e2481b79e9567b67b276ac5acdb6ca0087e6684c16ab764de57805d4bc311352968e54d79c348b793ed5c75b18a18815b8f9cdf25a82b34e
DIST boto3-1.18.30.tar.gz 407362 BLAKE2B 14cbd75f3a4441d0b0aa3cb9cd1001053be59086cd0d09ce0231b9e6d00ef1c15e138b1ddb2099d6e167782e9693160e377b71d6eaf83101ec6b490424832661 SHA512 582d677c481e0a2f7586d0735a9f4101a5abfc7c03891f67b034a5a6ac9b41703fdfb62e66c0509882b3b54791ec16e09988a99421c75b3d66cf068bccb4eb3f
+DIST boto3-1.18.31.tar.gz 407465 BLAKE2B 816833b83f8a9da0ce97ebd5a2636f8d7a9f9170c690c2be57be53f959f191976d2e661057a64b233705dfeb740c599520bf99cc74d385c867192e442cbb1076 SHA512 4dbe54b0beda32f3decbfe378cffc6c20899d4800196c4bf1390365ea0c84836b526f4a23cd2779a3cc365cc863612ade972c96284be7bbfbe8f652b1312c9c4
+DIST boto3-1.18.32.tar.gz 407959 BLAKE2B 6e186599707ab606ab45b05347bfcc512e16c6c4d9793d002aa239eb0d1a0c0ee9e50a05013c7bd0e5b30c05e791646f692faf997e3ee6b35f278bfe888f16f1 SHA512 7b9862a9ca0d9e13e14d45d1cd989abc5e12e45e9f5cff1e52805c0bd39cbd8f27d5c24df5438e27c0a7e3115bb572570656ca09d5a58d93244802464864b38c
DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.31.ebuild b/dev-python/boto3/boto3-1.18.31.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.31.ebuild
@@ -0,0 +1,57 @@
+# 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="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 ~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}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ ||
+ die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.32.ebuild b/dev-python/boto3/boto3-1.18.32.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.32.ebuild
@@ -0,0 +1,57 @@
+# 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="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 ~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}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ ||
+ die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 92e76a3c7021..69faa881bda4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,4 +7,6 @@ DIST botocore-1.21.27.tar.gz 8076120 BLAKE2B e7928438ec4b100ef00d202899fae47c7bb
DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
DIST botocore-1.21.29.tar.gz 8079625 BLAKE2B c396b453893782f94e503cb581efe5beb2a5766beb46b5c0840db3cea3d14b637a49c0cbf8971dc3fc4aa6899cdbaffac882cf3f889e78c25f0b5195de947925 SHA512 0b791b14e81158dbaaac0f39c0f1eba3f67b4a75ef97bbeff2a9eecf9b5c436268ae4a2ff0834bb00628497e06539148c22621a61ba6df9d44b988e17a67b329
DIST botocore-1.21.30.tar.gz 8081027 BLAKE2B 6566d74873c08ce84f6bd0e6a802e62c6cf21956136f2e3991e1b498c3ac4f6a11b17a3d8b44595f4d4b5ef5e9b2a6bd71802e5f0270b8cc1473e8fc94e0db5c SHA512 fdc4991ac8fccb71c82542b05c25edba1607381289e384786079bd3b9efda527e0aecccd29fc372ff5b8d265a204fc570bbf7191683a36d9cb9e43a2153fe685
+DIST botocore-1.21.31.tar.gz 8081621 BLAKE2B 78bd0ad2d1371582e97c8ddddb9a0b9f41fd75d701ba2ad49fab0e6f3d4602eb6a06bb51f23f674ef71d8c0bcec39ab545071ec8ef252df1c9d9133d8223a746 SHA512 bdaa85ad59936334e8d0e57a0e6631bb1c4408a0b9a50eb883b9b9dc5df4845da2df0fc64af755c5bb2ce5ee667c449a751263e25c9912bcb335eaa41cbba95e
+DIST botocore-1.21.32.tar.gz 8083411 BLAKE2B f43cffb2b8dba99e9d893dc6842593525a5545878b52680f8418f86f01f1804dfd1439087092a71d1d9933b63e09615c781e52be8eb5176fb18d1808f0125d18 SHA512 a6d8ca645c3b00b04579be86febd232eac8929f1b58582948208d5b1cc82686c76327302c7459123be8e7a44bece1249ece58fe47619082916e383c0ee6c11a9
DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.31.ebuild b/dev-python/botocore/botocore-1.21.31.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.31.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${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 nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.32.ebuild b/dev-python/botocore/botocore-1.21.32.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.32.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${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 nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cattrs/cattrs-1.7.1.ebuild b/dev-python/cattrs/cattrs-1.7.1.ebuild
index 556f4c5620bc..121366bb696e 100644
--- a/dev-python/cattrs/cattrs-1.7.1.ebuild
+++ b/dev-python/cattrs/cattrs-1.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 6ba2044bb1d7..3c6b44c06d87 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190
DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
DIST cfn-lint-0.53.0.tar.gz 7501025 BLAKE2B 0f979ff74e020aa192c040bcc633df8133ed77559afd2fa637af0b02f190f516dc7b3bd2154b9e5ecf3e2edcbf624879727ccbcaab81493f450305e6e1790002 SHA512 58d63e1b9ee7cd64ff30e938d98992dca6214945464c27d61b6d6c7e0daab27daa1feb7f2631de172e9cbf1b22699894b7fb7becd7a292b5efeeedd402db3374
+DIST cfn-lint-0.53.1.tar.gz 7561747 BLAKE2B 2561a04344c567cf9e1e62cdd65e6de0bf8efd17072b5562021055e65c140d8453062fb0019f56f1a8c520043e1215e7c5db894af53801dff26a6e2422688d4f SHA512 3832e6aac7b9a3e638dcf46103a83882fa0bd3778d95aa5837fb7bfe2c9dd10c13ac4434e371396e2f65fe39a36b3f7fb8c7cce52b628fe7dd3fc17ed313f8b6
diff --git a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
new file mode 100644
index 000000000000..f483fd0763d2
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+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 ~x86"
+
+RDEPEND="
+ >=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_resources[${PYTHON_USEDEP}]
+ ' python3_6)
+ dev-python/jsonpatch[${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/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+ "${FILESDIR}/cfn-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+ # unpin the deps
+ sed -e 's:~=[0-9.]*::' -i setup.py || die
+ # requires git checkout
+ sed -e 's:test_update_docs:_&:' \
+ -i test/unit/module/maintenance/test_update_documentation.py || die
+ # requires Internet
+ sed -e 's:test_update_resource_specs_python:_&:' \
+ -i test/unit/module/maintenance/test_update_resource_specs.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b6a66e33b837..396c3740d594 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
+DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
diff --git a/dev-python/clang-python/clang-python-13.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc2.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.0_rc2.ebuild
@@ -0,0 +1,41 @@
+# 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=""
+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/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 22e0263a3469..c67347339807 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index c9182e19c8c0..c760fe582011 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1 +1,2 @@
DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
+DIST cli_helpers-2.2.0.tar.gz 34018 BLAKE2B c7dfe8b87db6312557b4ac87aa4eda77b94f12789fcd4a9e686cada47bd41601f5c357a77de4a1c6d550b2ea110b682da0a04edb312d26ecf281e6d323369462 SHA512 26d78227999e8bb37f58529ce29bbed1bc8d51c80f81127552fb1d1f880c476abdd43ca628c591ba50c0316b35d1df0541906bf902a7549f459da0e1200c8479
diff --git a/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild
new file mode 100644
index 000000000000..a558d553a0bc
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild
@@ -0,0 +1,24 @@
+# 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="Python helpers for common CLI tasks"
+HOMEPAGE="https://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index f36ceb139659..58df205d42ff 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
inherit distutils-r1 git-r3
@@ -19,7 +19,6 @@ RDEPEND="
>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
dev-python/wcwidth[${PYTHON_USEDEP}]
"
diff --git a/dev-python/click/click-8.0.1.ebuild b/dev-python/click/click-8.0.1.ebuild
index 966a710ace84..b71014ee0cbb 100644
--- a/dev-python/click/click-8.0.1.ebuild
+++ b/dev-python/click/click-8.0.1.ebuild
@@ -24,7 +24,8 @@ RDEPEND="
distutils_enable_sphinx docs \
'>=dev-python/docutils-0.14' \
dev-python/pallets-sphinx-themes \
- dev-python/sphinxcontrib-log_cabinet
+ dev-python/sphinxcontrib-log_cabinet \
+ dev-python/sphinx-issues
distutils_enable_tests pytest
python_install_all() {
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index b4ae56656370..22cae510583b 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index 0429414d77e3..d138e30a99e1 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
index 8fb881ddf1c4..9da3f2b3306d 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
LICENSE="|| ( Apache-2.0 BSD )"
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 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.4.1.ebuild
index 5d66c5564130..91ed0c5562a6 100644
--- a/dev-python/debugpy/debugpy-1.4.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~riscv ~sparc"
# There is not enough time in the universe for this test suite
RESTRICT="test"
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 50b50f11bdd1..eb6bc8a71471 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,2 +1 @@
-DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
deleted file mode 100644
index 21a62b24858b..000000000000
--- a/dev-python/dictdiffer/dictdiffer-0.8.1.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_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Dictdiffer is a library that helps you to diff and patch dictionaries"
-HOMEPAGE="
- https://github.com/inveniosoftware/dictdiffer/
- https://pypi.org/project/dictdiffer/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-SLOT="0"
-
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/isort[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# Requires self to be already installed
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
- # remove dep on pytest-runner
- sed -i -e '/pytest-runner/d' setup.py || die
-
- # remove dep on pytest-pep8 and pytest-cov
- sed -i -e '/addopts/d' pytest.ini || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
index 65199cc8aed6..3bbbe87772ff 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
BDEPEND="
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index ec9a1240101e..219e84da8697 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,2 +1 @@
-DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
DIST distro-1.6.0.tar.gz 53518 BLAKE2B d60555488ed12658a3129747eed891487dfdf7f16b530b84c44cd976c6dcfadbeb9e20130e5c2eee9c71b0fd0c86c82d258a76498171f4e553c087840903e3b8 SHA512 d30334ed1137c54ddc70e041b75be905b7e13398483d0d92117eca0407d2a7b60424d96fd7af885a2e3ea3676b1aef620e91598a53309ae0da12a360d57ac013
diff --git a/dev-python/distro/distro-1.5.0-r1.ebuild b/dev-python/distro/distro-1.5.0-r1.ebuild
deleted file mode 100644
index c8e9c2923639..000000000000
--- a/dev-python/distro/distro-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,17 +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="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.6.0.ebuild b/dev-python/distro/distro-1.6.0.ebuild
index 4f3ca5694125..527b1c542933 100644
--- a/dev-python/distro/distro-1.6.0.ebuild
+++ b/dev-python/distro/distro-1.6.0.ebuild
@@ -7,11 +7,14 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/en/latest/"
+HOMEPAGE="
+ https://distro.readthedocs.io/en/latest/
+ https://pypi.org/project/distro/
+ https://github.com/python-distro/distro/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.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 ~sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/distro/metadata.xml b/dev-python/distro/metadata.xml
index 5a9e015bc43b..bac643e74ad4 100644
--- a/dev-python/distro/metadata.xml
+++ b/dev-python/distro/metadata.xml
@@ -16,6 +16,6 @@
distro
- nir0s/distro
+ python-distro/distro
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index bef1b93a80f0..bc876c5b7ec0 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,4 @@
DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
DIST django-mptt-0.13.1.gh.tar.gz 302287 BLAKE2B 915e3066862be4d0883ba540cf584d917994ecbf83182726f5d39a40b61850e4ef1fade2c12325237f2c345de14ca6e54362712eb7bdbdf553eb6ebbf321075f SHA512 bc64d24f8d889109a054f270802f8ce6308c12bf3b9ebe1ba818d42e6c1f9d8904b8cad996e71e03c7f77ed80d912a7d8bb920cccc0e2fff170e754816367f40
+DIST django-mptt-0.13.2.gh.tar.gz 303658 BLAKE2B 8b9e968091be35d1b20816874f8a27cef065c11a25d5ac08192d01909be5a748ab96f0377a09b8a86ded5881d8ce075530bdd3a46c92065dd2f66d734853c27a SHA512 52e8631af11006a0ef1739d1f9c22d34fe39fd790dd45edb6bcde5f4ad875d6f2f0087aa4928d5e5b391b69728e67c2d8b6d10976714735eafe7b3b48e20d123
DIST django-mptt-0.13.gh.tar.gz 302525 BLAKE2B 21b2fde5c81d83321bf7569d2064db87aec3c184f27cf3fc3bd34421be04212188e15f79a575b08aabb3a7b95d116bf3e5f0fb57c56cadf9ad2ac166e8e77845 SHA512 63dbb61dab59d42b5e747f35370a0840d40ed465979d1f93e66561cf4c0726635cae774f87e39cc1ac480847f3ccf0eb65dc8593759a0860d586e334fdd37256
diff --git a/dev-python/django-mptt/django-mptt-0.13.2.ebuild b/dev-python/django-mptt/django-mptt-0.13.2.ebuild
new file mode 100644
index 000000000000..10262c58b326
--- /dev/null
+++ b/dev-python/django-mptt/django-mptt-0.13.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
+HOMEPAGE="https://github.com/django-mptt/django-mptt"
+SRC_URI="
+ https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-python/django-1.11[${PYTHON_USEDEP}]
+ dev-python/django-js-asset[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ "${EPYTHON}" tests/manage.py test -v2 myapp ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-taggit-serializer/metadata.xml b/dev-python/django-taggit-serializer/metadata.xml
index a8f4e7c79696..35508f56b7b9 100644
--- a/dev-python/django-taggit-serializer/metadata.xml
+++ b/dev-python/django-taggit-serializer/metadata.xml
@@ -4,5 +4,6 @@
django-taggit-serializer
+ glemmaPaul/django-taggit-serializer#
diff --git a/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild b/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
index a0b851b29159..53eef87e7fa5 100644
--- a/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
index 6e9f777e1ed6..1e5c64d89670 100644
--- a/dev-python/django_polymorphic/metadata.xml
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -7,5 +7,6 @@
django-polymorphic
+ django-polymorphic/django-polymorphic
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
index af1f703d494c..73e326ac47c5 100644
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ b/dev-python/empy/empy-3.3.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 187d09bbe454..c21840a904b4 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,2 +1,3 @@
DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
DIST flexmock-0.10.6.tar.gz 46740 BLAKE2B b5c8083694e8787e85ff0f41265ad9f716a4c82d274ca5c793b6d93bf8bf28f3e57afd33f7ba59149e75f7bffbebd3843901dfa75caaefc6f76f3eef0c603314 SHA512 2ebaed78926f01bd4d886a509d978d0de04629f7d96c48f846b8ccf7906bb2303e7cbeab8226c6eb98d058f940434144cc2d6300d6aa2533f1f217788211490e
+DIST flexmock-0.10.8.tar.gz 46905 BLAKE2B d5f28e012edf9678fd5f72ec1d99e4e98b00dbb36536877cb393c16563097e0e3f18ab24243f7090bfa306f8be194243d201d9aaf5d64491bb594cff82b60e1e SHA512 cac327b3e3c4c6ccbcd6c7f71863b67fdd5454c13bbd5403b3ba521e3ae945ba453152df623eef08b2b60210ba626447a9e6bad76c2215281d43ae0f42ebf1a9
diff --git a/dev-python/flexmock/flexmock-0.10.8.ebuild b/dev-python/flexmock/flexmock-0.10.8.ebuild
new file mode 100644
index 000000000000..dd44eb32f8f8
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.10.8.ebuild
@@ -0,0 +1,27 @@
+# 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="Testing library to create mocks, stubs and fakes"
+HOMEPAGE="https://flexmock.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest -p no:flaky
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc -r docs
+}
diff --git a/dev-python/flexmock/metadata.xml b/dev-python/flexmock/metadata.xml
index fdfb3b68303a..598d51e24709 100644
--- a/dev-python/flexmock/metadata.xml
+++ b/dev-python/flexmock/metadata.xml
@@ -1,18 +1,7 @@
-
- nelo@wallus.de
- Nelo-Thara Wallus
-
-
- polynomial-c@gentoo.org
- Lars Wendler
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
bkabrda/flexmock
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index f9e0426f7f07..ad74977b648b 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -14,14 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
LICENSE="GPL-2"
SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
+RDEPEND="dev-python/python-levenshtein[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}] )"
-DEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}
- dev-python/python-levenshtein[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" test_fuzzywuzzy.py || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index f74537b30eae..e107f8463a7f 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,4 +1,2 @@
-DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
-DIST google-api-core-1.31.1.tar.gz 134947 BLAKE2B 112e705f8a2d945a207c10096a3cd8c1c65bf806339e8d688cc5638d234c1de03d168099414dd7314b8d3129d6d0e198208cddf15369b84ad837b9da90e8499c SHA512 29c84b98ae39416dbcb8ba7412237007bddea6e9a3af07c1f7753bfe57576125325a6412b73ab7d58c57257405b4b6aa36e043d0cf2496517828c7594f6698ef
DIST google-api-core-1.31.2.tar.gz 135491 BLAKE2B d2567f628ac888b8f708b5e62c7a34cdad592e98689b3208041e48f08345da5df7da295d261af73c8e89041c91297a90af243b24c250095493af07c6d892459f SHA512 e819bbaadf1aedf78cb397c9a5a9677fbc625285a4f3d14620e5af0ec125f97eaabe18e34a669daee3bd51520de0818a4e2f451f83502ad78adf77e4c739fa67
DIST google-api-core-2.0.0.tar.gz 134125 BLAKE2B 814d20f4b9d02c389768e184d8be4614cabe0efbf227c98574dacf0fb3bde6cae71c40d2a17a1353f5dd02aad4f19e49b7338038cf22a2e0ec4be450b2f70af9 SHA512 588dcdeb80c4cd53ebc9d1a76efc03bc3bff22aa850d48385edc0bc6a0d343b406d26e64d22c0befc06f6406bb6c8efcf07947c6e48c49e6f077b72b8414403f
diff --git a/dev-python/google-api-core/google-api-core-1.30.0.ebuild b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
deleted file mode 100644
index c181080079eb..000000000000
--- a/dev-python/google-api-core/google-api-core-1.30.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
- https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- dev-python/namespace-google[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
- >=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
- python@gentoo.org
Python
+
memory_profiler
+ pythonprofilers/memory_profiler
f@bianp.net
Fabian Pedregosa
- fabianp/memory_profiler
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 1b7f4cf37278..62910599a49a 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -4,3 +4,5 @@ DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5
DIST moto-2.2.2.tar.gz 1684678 BLAKE2B ebe1eb08c67ccdb8c484fa8fc75d7ce58750d94620f46b53268d6b6b0732d90160bf7b6837efa492f621e1c001d933f5d59d39c266d65bbb1852f315b3bc03d0 SHA512 a8b192637b701eda0e4a7b11e84f5251386de98590f1d7c33732d8bf12642b39b61f1d360ad39c3e1b0a645268139d9e330d48fbe7029b943094ad317cb45ff6
DIST moto-2.2.3.tar.gz 1700636 BLAKE2B 926fe245ce457dd79eef6780fc0b984d2ff1cbe95807a3463f0d0080583af2ba356ccfcce22e60927737e1531ec7bc167c5f649e784b191ec821aa56df65277d SHA512 0b46229ae06db7cb2634df3f1b3b1a6b6fc983978a763e8879db0d9e209ccc6b96b28e8e2ee40f6e1a8e39b74d7a2430788126220e3a7dab5e8df217c3c8c005
DIST moto-2.2.4.tar.gz 1724663 BLAKE2B 3feb39bec246a8157aa542c711289ab0ca257ec510835cd48aa732c3f07903db857971e3d024c1aef35b5a0b55b7c4ecef2b319824c1d76f0076ab8d2d75329e SHA512 8acd8a3156db71af35ad0ac6a5105a6b7739d8ca9881a2cb091637830bc6fbb10d8bf6adfd1a1091556f9269fad737b345d2bdf50e09b54201fe7438674dd906
+DIST moto-2.2.5.tar.gz 1737336 BLAKE2B 450861edc607b9175cd72f29923e3259b81ce3a6e02302eb74486946cd8f6ebe8c15c61f6fd6da66d821b148924a0de1bcaf4e46ce6a5a751f7817d42450ea96 SHA512 27c04690d55647c7b43b342647f9a37f47ec3656c96aad8b6572c57752d555a77ecce3670e3cc5397318423ed179632fd79562a8b3a209049d74bf6e2a4bd51d
+DIST moto-2.2.6.tar.gz 1750177 BLAKE2B 0ea94b8a46e212bbf6556c1fc1ec439ea83f1d1dbbaea2e494d58c3f33e68c8397a243b19de45f4ef500482d510a0f2bf99bd9a85e784b02e7c174be3de4e0c9 SHA512 562e43f0d323a16c6a1fc69775b82c904c8a89df528a5ca4b383288d3749c15482f80befdb261bfd30de978f45ae4b6cbca4ffe33391dfcee8002ea604741b60
diff --git a/dev-python/moto/moto-2.2.5.ebuild b/dev-python/moto/moto-2.2.5.ebuild
new file mode 100644
index 000000000000..349a06d68b97
--- /dev/null
+++ b/dev-python/moto/moto-2.2.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+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 ~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-1.9.201[${PYTHON_USEDEP}]
+ >=dev-python/botocore-1.12.201[${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_prepare_all() {
+ # unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+ sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local ignore=(
+ # incompatible versions?
+ tests/test_core/test_decorator_calls.py
+ tests/test_s3/test_s3_classdecorator.py
+ )
+
+ # 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' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/moto/moto-2.2.6.ebuild b/dev-python/moto/moto-2.2.6.ebuild
new file mode 100644
index 000000000000..349a06d68b97
--- /dev/null
+++ b/dev-python/moto/moto-2.2.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+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 ~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-1.9.201[${PYTHON_USEDEP}]
+ >=dev-python/botocore-1.12.201[${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_prepare_all() {
+ # unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+ sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local ignore=(
+ # incompatible versions?
+ tests/test_core/test_decorator_calls.py
+ tests/test_s3/test_s3_classdecorator.py
+ )
+
+ # 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' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/olefile/metadata.xml b/dev-python/olefile/metadata.xml
index 37988c3230b1..84f334df21c1 100644
--- a/dev-python/olefile/metadata.xml
+++ b/dev-python/olefile/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
olefile
decalage2/olefile
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index 5318544ccad9..b53151d214f4 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
@@ -15,5 +15,6 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-distutils_enable_sphinx doc
+distutils_enable_sphinx doc \
+ dev-python/sphinx_rtd_theme
distutils_enable_tests unittest
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 88d01c75eaa4..62645140a6f3 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1 +1,2 @@
DIST openstacksdk-0.58.0.tar.gz 1021818 BLAKE2B 530ec940b958d5c9b1a1caba71716201172e1141ebac208b26ea512732be152ccc6e928d20e38964eb455ff47fd6f42756d3f9af19800a45104b631d45d312c9 SHA512 94bb317e9f79ab419e5a0e7def4510d6686e3b8585721c15bd1f03eced5e8f45509cf925ed2b3e51a19ecd2d3e28469343cdae5a3df549f35bb61c448add5caa
+DIST openstacksdk-0.59.0.tar.gz 1021995 BLAKE2B be57afcdc707547e2cd69774de1b7d0dc4b84ffe58bdaa4f063b85996e8ee08ded60004d3211f827d7b4a5239d1420485ce2fae92b550722c959274a18ed2753 SHA512 02f8f8f174896417f0cf4ce1c65c87ea705664fa7a1c6383ad1791f5d94cb818b5b0bfee331bd0d07d724df59859ccef91c507b0c39522115f9549d6258a3eb7
diff --git a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
new file mode 100644
index 000000000000..4c149a4c1b41
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+ >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+ >=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+ !~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+ >=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+ >=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+ dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="${CDEPEND}
+ test? (
+ >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ dev-python/hacking[${PYTHON_USEDEP}]
+ >=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests unittest
+
+python_test() {
+ distutils_install_for_testing
+ cd "${TEST_DIR}"/lib || die
+
+ # Internet?
+ sed -e 's:test_create_dynamic_large_object:_&:' \
+ -i openstack/tests/unit/cloud/test_object.py || die
+
+ # TODO
+ sed -e 's:test_generate_form:_&:' \
+ -e 's:test_create_static_large_object:_&:' \
+ -e 's:test_object_segment_retries:_&:' \
+ -e 's:test_object_segment_retry_failure:_&:' \
+ -e 's:test_slo_manifest_retry:_&:' \
+ -i openstack/tests/unit/cloud/test_object.py || die
+
+ # unhappy about paths due to test runner
+ sed -e 's:test_method_not_supported:_&:' \
+ -i openstack/tests/unit/test_exceptions.py || die
+ sed -e 's:test_repr:_&:' \
+ -i openstack/tests/unit/test_resource.py || die
+
+ # functional tests require cloud instance access
+ eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index acbcab7c8d5a..e53e2d0c9f58 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
index 1343db350cca..4057a576a16b 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="Sphinx themes for Pallets and related projects"
@@ -19,4 +19,4 @@ RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_7 pypy3)"
+ ' pypy3)"
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index 042366cde629..371184c5784d 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 46260309e735..59e08873c7c5 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 1d1471e094d1..ca1cf6c983cb 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,2 +1 @@
-DIST pikepdf-2.15.1.tar.gz 2311058 BLAKE2B 47c7600ed8c27970b2a45dd5cd557ec6f18782f826a6f31247885d34564935bae2d92f6702fdd635d38730bf6a01e9c4b41251a8a94b73c1828677590bdf84ca SHA512 d71931539f87c64319e45710f31d01ec1cddc5c6bbf15948161336344857a9497ce61140ce4631af3e7708fa13e6e909eaf4bfb146c68f7a8b2ce1f03e206cd7
DIST pikepdf-2.16.1.tar.gz 2312177 BLAKE2B a7695ecc71621c1e64ab919e76dabd3a94ff16d401861fe50f29f00832dda8be01f3e67c811756ef89573345b49ec6c880635309f859624b9df42cf6eff7b43b SHA512 d2c73a0a69c6cf0ed22dc2dc949187464abd4194a5d917e5681de033d6a8ce4c089efd49eb110c9fa11f9dead292aa6ab7ed71a01f7cbaadc51d1f37a773c936
diff --git a/dev-python/pikepdf/pikepdf-2.15.1.ebuild b/dev-python/pikepdf/pikepdf-2.15.1.ebuild
deleted file mode 100644
index b35dcf5d5062..000000000000
--- a/dev-python/pikepdf/pikepdf-2.15.1.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} )
-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:0="
-RDEPEND="${DEPEND}
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
- >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
- dev-python/toml[${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 '/wheel/d' setup.py || die
- sed -i -e '/-n auto/d' setup.cfg || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.16.1.ebuild b/dev-python/pikepdf/pikepdf-2.16.1.ebuild
index 2e4514c389e8..b35dcf5d5062 100644
--- a/dev-python/pikepdf/pikepdf-2.16.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.16.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="app-text/qpdf:0="
RDEPEND="${DEPEND}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 0a8128470d4c..b15e3132566a 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,2 +1,3 @@
DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
+DIST prettytable-2.2.0.tar.gz 44939 BLAKE2B eff6eeb98b6accdb5089cfd1ceb09db2e4a0897e9675a07b744a12ab15fb1cb43bd4a411788d8e22662089f68a31c346d79cfaaca44c7f14f452870a7039bdb6 SHA512 df8ae2a1103a4965a351ba16a95ef9659107075bb023090bd9bffd69805ce647dcb26f49164f07f5af0c0b03503373c0353935b32a0fb18edf969dc984aecda7
diff --git a/dev-python/prettytable/prettytable-2.2.0.ebuild b/dev-python/prettytable/prettytable-2.2.0.ebuild
new file mode 100644
index 000000000000..0b41d1ad5955
--- /dev/null
+++ b/dev-python/prettytable/prettytable-2.2.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+ https://github.com/jazzband/prettytable/
+ https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_metadata[${PYTHON_USEDEP}]
+ ' pypy3)
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ $(python_gen_impl_dep sqlite)
+ )"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 4985189a71c3..b7d992b9b40e 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,2 +1 @@
-DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
DIST progress-1.6.tar.gz 7842 BLAKE2B 102f1ac481b5d5007d72b02f5451ad4bf7ef986be35034f68fc94108025ea274494d3d9fe56b9473c8ea6ca4abc2cfc458b453550d180fcf567f8a5c5feeafe6 SHA512 58a614bba5a7273a42ba5e9607b3a965fec17f26a4f24563d4c13679ea32b23dda7509c5da81a2a34bebeeedd91154d0457ab8dac95cc7a092add2567249cc94
diff --git a/dev-python/progress/progress-1.5.ebuild b/dev-python/progress/progress-1.5.ebuild
deleted file mode 100644
index 134b02fc12c5..000000000000
--- a/dev-python/progress/progress-1.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
- "${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/progress/progress-1.6.ebuild b/dev-python/progress/progress-1.6.ebuild
index 4670e5bd5833..7b238ed05d31 100644
--- a/dev-python/progress/progress-1.6.ebuild
+++ b/dev-python/progress/progress-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
python_test() {
"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index fb97fbd66b4e..16d872aebcf2 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD-2 Unlicense"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+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=""
DEPEND="
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 95d1f65f4205..c1a3a1bc7f46 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
SLOT="0"
IUSE="examples"
diff --git a/dev-python/pycups/pycups-2.0.1.ebuild b/dev-python/pycups/pycups-2.0.1.ebuild
index 46c50c1509fc..57d5ea1cc9fc 100644
--- a/dev-python/pycups/pycups-2.0.1.ebuild
+++ b/dev-python/pycups/pycups-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="examples"
RDEPEND="net-print/cups"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 8faef02f6a17..344fa71ab4c1 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1 +1,2 @@
DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
+DIST pyfakefs-4.5.1.tar.gz 203478 BLAKE2B 4f7fdd9a9ee80dc814b854b1e1ab6fca49c398733ea3c61369ed1f88c9e66c3f007e5270f9ea276c9eca4c268036a6cd2f2d05832bea94a0de0d947b5cab63f7 SHA512 2c4b0f4b9cef9866f12bf5d35462ab565f82a7cfb986e78eae07b8e77be67fd523b093ce4f88b34d817f36d04891f128af723be880c8072f6b593ceb31d65367
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
new file mode 100644
index 000000000000..1746a5e9e29e
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+ "${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
similarity index 91%
rename from dev-python/pykwalify/pykwalify-1.8.0.ebuild
rename to dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
index b7c0eb7967ca..ceda616a7cf4 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index a914219acbff..7ae5d58eef0b 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
python@gentoo.org
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 9275f54925ce..d3c387d2fb88 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,4 +1,2 @@
-DIST pylint-2.10.1.gh.tar.gz 813052 BLAKE2B 487c95851c6aa68ae6fa81a345959fa6b7c1ffe9f7c4c1d722f6ceb4c50671870f16c2a24392cc374cdaffa279028d38a23b9cb94376f58f4ff0e448da49d83b SHA512 c32948ef2eceab8857fcd789690c4766a606b053c1f931da13acdc0265f76fe96622439da12661e8ab899cdeccd93427a4561181670f14dfbb36e4e9c720ea07
DIST pylint-2.10.2.gh.tar.gz 813391 BLAKE2B 109f8817e32ddf8d93c9120518e77a1d2f7e61cd1a6362eb1cf9e6d242db72fa1a9271588a3abb28efca54bcc449dce623ae5d5fd63153ec2bc367e008aab465 SHA512 5d694587956c4f11eb4afaec26cefb66ccbe14dc2aacf378a0362326506d80eb2633e0d351c0a20715a3359a9bc438092d77b2e46f7f787210c7ab0555f2722f
-DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
diff --git a/dev-python/pylint/pylint-2.10.1.ebuild b/dev-python/pylint/pylint-2.10.1.ebuild
deleted file mode 100644
index 3bcbddbbc35d..000000000000
--- a/dev-python/pylint/pylint-2.10.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- =dev-python/astroid-2.7.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/toml-0.7.1[${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
- )
- # 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.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
deleted file mode 100644
index bdecb18a46f8..000000000000
--- a/dev-python/pylint/pylint-2.9.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-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="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-RDEPEND="
- =dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
- >=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6[${PYTHON_USEDEP}]
- =dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
- local skipped_tests=(
- # No need to run the benchmarks
- tests/benchmark/test_baseline_benchmarks.py
- )
- # Specify the test directory explicitly to avoid import file mismatches
- epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-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.9.6.ebuild b/dev-python/pylint/pylint-2.9.6.ebuild
index 75d26e73965e..ccd48c7f91f5 100644
--- a/dev-python/pylint/pylint-2.9.6.ebuild
+++ b/dev-python/pylint/pylint-2.9.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index 39e1576ef534..9097a6c5c0e6 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Python bindings for sys-block/parted"
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
index 8678327f1313..51c5d0651a41 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
SLOT="${PYPY_PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/pypy-7.3.5.ebuild b/dev-python/pypy/pypy-7.3.5.ebuild
index 47c2d5b35300..7109af78d9db 100644
--- a/dev-python/pypy/pypy-7.3.5.ebuild
+++ b/dev-python/pypy/pypy-7.3.5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
SLOT="0/73"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 gdbm +jit ncurses sqlite tk"
RDEPEND="
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
index 70dd2bacbc82..887eb29400b0 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
SLOT="${PYPY_PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 60d1e63dee6a..ac15453df1ef 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,5 +1,6 @@
DIST pypy3.7-gentoo-patches-7.3.4_p2.tar.xz 13268 BLAKE2B 175d6bd4ed8345f3e0c2e35b3904e9180b32262482ef530c213505b3b4a0db1912fb8367db6b48786a9ec16f82298fee09683254b86b6c5e97d5c96ec250bfb3 SHA512 e00b0b909a8e7aae33e5fdad4b23072f1d720236c3dfd2dc4273339205af6d575610aa41b779e894db48f48621a0c5544d9054e1a104d5fedc3de9c3df01e1c2
DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
+DIST pypy3.7-gentoo-patches-7.3.5_p1.tar.xz 9792 BLAKE2B c82869393c8a63462fa03c58822f95628093a64d2bb421aaa486ad8217d944ace641d9ea13f2b2a2c56ab16498824709fa35cf0a9704b728bac06646d8f2c15f SHA512 18643e28f137f62406ce4f2d448acb86329fd8566a31b90340c573e4205091ff5b15b77ac14796022968814f940cd9881fe4db9010609937b2a0a71d557531f2
DIST pypy3.7-gentoo-patches-7.3.5rc3_p1.tar.xz 8168 BLAKE2B d7da84e1b0e8dae1dfd712b5cda98ca021048be40df89a94607819712c6370fd22dafdd25fa2955c240ac7662cf75a76f0fb5c0309db727ce28b0978d7fe9fa7 SHA512 642b831754431b3a4441494dbb434b8d66fa48e67c23fb9fe94b15851a087e663397c39762e80c72f22fd1973c99304d5ca48d9222b4352d5dda55142e899f2d
DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
diff --git a/dev-python/pypy3/pypy3-7.3.5.ebuild b/dev-python/pypy3/pypy3-7.3.5.ebuild
index d75647a2e567..b13403847734 100644
--- a/dev-python/pypy3/pypy3-7.3.5.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.5.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
SLOT="0/pypy37-pp73"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
# pypy3.7 is in alpha state and a lot of tests are failing
RESTRICT="test"
diff --git a/dev-python/pypy3/pypy3-7.3.5_p1.ebuild b/dev-python/pypy3/pypy3-7.3.5_p1.ebuild
new file mode 100644
index 000000000000..af64d99ae146
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.5_p1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+ || (
+ >=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+ >=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+ )
+ dev-libs/openssl:0=
+ gdbm? ( sys-libs/gdbm:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ ! epython.py || die
+ python_moduleinto /usr/lib/pypy3.7/site-packages
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+ python_optimize "${ED}${dest}"
+
+ # remove to avoid collisions
+ rm "${PYTHON}" || die
+}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
index d4e1005a79f9..fe6d60a481a7 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MPL-2.0"
-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"
BDEPEND="
>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
test? ( !!dev-python/flaky )
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index f18e11dd8382..1c57049688d8 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 9d3521bca481..213fe0d785fa 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,2 +1 @@
-DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
DIST pytest-xprocess-0.18.1.tar.gz 26976 BLAKE2B 9772fff488414406f487add01fba9ee2e10e12965d5b289b8c17cffb5a6566aaea0653ca1b390e6b4c70d79ce3698b0ce8122ed919f9778cb8cf3f7488cffc8d SHA512 f19cba9954e4b2363db13b7dba373f5e50cfca6f43d6455f271bff4d01dcc2a3b15c13a47076dbeed34feffee856a8271df4837edab413e964a848cbb6228e7e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
deleted file mode 100644
index 3a9515f0a7f9..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.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_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
index f2ada45a465d..8957a7013ae5 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index d3cb037f7c7c..1ea1ea9fff12 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,2 +1 @@
-DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
DIST python-bugzilla-3.1.0.tar.gz 115259 BLAKE2B d3eed35aeb9778e23266fb3ce1fc477a93c09533c78e478292b90cd49668f2627d7ef47afd46973898b4d5de474399aae5e94e5cd776d5608d32325dc826c12c SHA512 8f95a60e559cc5b4576d81f37c7104d6bd4afae21986db3c5ef05c6021e601690a01ca97d67fa37e97026f0b97762594e8edd0454953e31930fa841696f65121
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
deleted file mode 100644
index 4343ed02ab19..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.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} )
-inherit distutils-r1
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
- || ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
- dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/docutils[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild
index 137bbf61ee25..847c5f9a5e96 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 92ec5980baea..ddf74e0d1938 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1 +1,2 @@
DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
+DIST python-dbusmock-0.24.0.tar.gz 81907 BLAKE2B 5fc8653228d9278c74e623d385c798ba078da5d8309a95e88a893d3ceb1736568f93196defcde1845bfee193ec2e7abb4197a663f612dfe4ff58ac9c0bb189e3 SHA512 531c2d427da28098d7dac91cd5be1c38be15dfc9495314a150523e56c10ffda846667dfda39cc47c8278ad41800fe39d6608f24da44ff2ae7d53f0413826d96c
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild
new file mode 100644
index 000000000000..aa54623eb206
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml
index 9413c73073ef..056098765a56 100644
--- a/dev-python/pytzdata/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 83e0338cc767..2d1151f77376 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="LGPL-3"
SLOT="0"
-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"
IUSE="+draft"
DEPEND="
diff --git a/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch b/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch
new file mode 100644
index 000000000000..4aa3342170e4
--- /dev/null
+++ b/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch
@@ -0,0 +1,37 @@
+From cbea8d8729282106373a12b9e08bcaac8abeb52f Mon Sep 17 00:00:00 2001
+From: goanpeca
+Date: Tue, 24 Mar 2020 11:51:28 -0500
+Subject: [PATCH] Add check for deprecated api between 2 and 3 versions
+
+---
+ qtsass/api.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/qtsass/api.py b/qtsass/api.py
+index 7ea4138..7a65fe2 100644
+--- a/qtsass/api.py
++++ b/qtsass/api.py
+@@ -13,9 +13,9 @@
+ from __future__ import absolute_import, print_function
+
+ # Standard library imports
+-from collections import Mapping, Sequence
+ import logging
+ import os
++import sys
+
+ # Third party imports
+ import sass
+@@ -26,6 +26,12 @@
+ from qtsass.importers import qss_importer
+
+
++if sys.version_info[0] == 3:
++ from collections.abc import Mapping, Sequence
++else:
++ from collections import Mapping, Sequence
++
++
+ # yapf: enable
+
+ # Constants
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 3409b05d8082..ef7668b644df 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -17,13 +17,15 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-py3.10.patch"
+)
distutils_enable_tests pytest
-python_prepare_all() {
+EPYTEST_DESELECT=(
# assert 1 == 2
- sed -i -e 's:test_watchers:_&:' tests/test_watchers.py || die
-
- distutils-r1_python_prepare_all
-}
+ tests/test_watchers.py::test_watchers
+)
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index b402a3a5535c..f7e2cb273773 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,4 +3,5 @@ DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e5
DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
DIST regex-2021.8.21.tar.gz 693951 BLAKE2B 4d10d6da6480b9e3e82546ad73e8c03e7625a515d1619943447f2aaf26f05df3b7397028f428e20ccd1bdfd6166a9b3d3335ede84605d2b4751a01306ebd807c SHA512 10bacc761a878ad1359c0ba8dbc7396dbaf7a2c1658dba228b8d993f41583399b097c665a3ce5887257fabb54e6be2ef7010a03a5af26d11af51075f3b8f0584
DIST regex-2021.8.27.tar.gz 693958 BLAKE2B ff0c184aff50794fc85de33c8d13daf6331db8ad50989ead1eb58d2fc065e279ba30bb36d998338399fe8e7ee4793b8bac1e13ba6b3eaf012f7fea7a210f56a2 SHA512 fbaf2a05c4753027668ae4c27b6d3353965458d74e403da37fab62067c20b5a76d82b723a271f89337a9192cd6237dd8b788b44c8b0a223f67642d7a537eff10
+DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
diff --git a/dev-python/regex/regex-2021.8.28.ebuild b/dev-python/regex/regex-2021.8.28.ebuild
new file mode 100644
index 000000000000..c0a5a26d5c4e
--- /dev/null
+++ b/dev-python/regex/regex-2021.8.28.ebuild
@@ -0,0 +1,34 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-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 ~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_test() {
+ eunittest -s "${BUILD_DIR}"/lib
+}
+
+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/reportlab/reportlab-3.5.68.ebuild b/dev-python/reportlab/reportlab-3.5.68.ebuild
index 6a2d53daf896..9fb30c83b03e 100644
--- a/dev-python/reportlab/reportlab-3.5.68.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.68.ebuild
@@ -16,7 +16,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 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
media-libs/freetype
diff --git a/dev-python/requests-cache/requests-cache-0.7.3.ebuild b/dev-python/requests-cache/requests-cache-0.7.3.ebuild
index b3e59acf4577..db97940e2622 100644
--- a/dev-python/requests-cache/requests-cache-0.7.3.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
dev-python/cattrs[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index fbab4941b133..6bc9a19251ad 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -3,3 +3,5 @@ DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d
DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
+DIST rich-10.8.0.tar.gz 16263649 BLAKE2B f73ee1996d16ba06dc0dc1909056deb731819395fea6c36d6953045bcc20ea95ab7b7d6a2025ed7b7f7991b75eb909a8cdbf80c561d1e60ad095ea24d005638f SHA512 89173ddffb421b09025ccfc479194d751bf96e114f06728e789f0b5fd903de22423c268c7ecf78ee8c6791ba6230abc7a5f2fbfd17d3445a205b84f326083447
+DIST rich-10.9.0.tar.gz 16264350 BLAKE2B dd8f27bb48baf6abe190ee5bc73d2a3dddac19cc3f52665655fbd6ed62654c1547fa33bc767d18b972e4d92d924db9eaf199e39affc34779c82fd4d45978f65a SHA512 8154994c1f21c7cbcd9ec03da4b0f22bf84c1ff380bddcf8c7f00d07fcfc8794da4160d2d68064d0664309bd1075ca593ebbf9e5c5f4fe6ad26a10460736fb02
diff --git a/dev-python/rich/rich-10.8.0.ebuild b/dev-python/rich/rich-10.8.0.ebuild
new file mode 100644
index 000000000000..b676261d987f
--- /dev/null
+++ b/dev-python/rich/rich-10.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rich/rich-10.9.0.ebuild b/dev-python/rich/rich-10.9.0.ebuild
new file mode 100644
index 000000000000..b676261d987f
--- /dev/null
+++ b/dev-python/rich/rich-10.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index c9fd066ee38b..d846063a321c 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -2,3 +2,4 @@ DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b
DIST ruamel.yaml-0.17.11.tar.xz 183476 BLAKE2B 02a1693d3a20f44b7f82668918a53d06f9fa5c0cff6f149fe51de3fbb3551e823f3a7a2f0f4e818f43e2974eaf95c4219d53738bad78544c6bb1f19d85457715 SHA512 8f24b33592c37fd1d370cb6367a3652e72df3d88c7a14fff187aaa8622b9bbd77e780193fcd920916eca7f627dd37c87eb9b987d091c944ff08ef25ee4567b45
DIST ruamel.yaml-0.17.13.tar.xz 183676 BLAKE2B 7b1be322f99a9cf6b4c5eb9722e4e425641c686574e6bafbed06e094e54ad93ea858c38779bb9f8c4fbc03916fcf7a65c4a3f4514bd8f10c46a8f6d112785350 SHA512 285572292e91702b6ad1e383fdc4f6434297f36ee9949859d2f5a21d23090957d9aabe323f505594fa10dc42822c3384b017c6ea7c3b04633925a291324392a6
DIST ruamel.yaml-0.17.14.tar.xz 183784 BLAKE2B cc223db89073aa3ba722a8b9a438c118cc4ef2e44f93b3768275776ee5440cbf1de0b1dc4d26ac3c51560c45711df0113076e885e2cc368f542ba02e51608d65 SHA512 5dfd608a79900ec74d570af9af22304d99dce19ce28ed32cb5f53ee71ec31033555da18fb3afe8d52291eb3a6320a91838e9e128047e359f4eea19f6105c76b4
+DIST ruamel.yaml-0.17.15.tar.xz 183820 BLAKE2B 901c08d05994a45cb9d8e7071244332c7b3f30fb83f22f9f2f9cfb769ec99ebc39fbdbcf652bc8e7ae8e5b9918aafbc229bcfcbeb1b7d64bd4bed2f8fe0d9ee7 SHA512 cd2fd4d0e2aba1f3f90bd54b355fa603045e913f90c7e460bcc4630619db027b1283af77c613fdc029f48300d8822ca349fb169e30679a1dd86beb1a3f75c49f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.ebuild
new file mode 100644
index 000000000000..f87789872e5e
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+ https://pypi.org/project/ruamel.yaml/
+ https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+ local deselect=()
+
+ [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ _test/test_deprecation.py::test_collections_deprecation
+ )
+
+ epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+ distutils-r1_python_install --single-version-externally-managed
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 2f6ed1652e95..0d6cd20ea785 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,2 +1 @@
DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
-DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
deleted file mode 100644
index 68f680a9be2a..000000000000
--- a/dev-python/scrypt/scrypt-0.8.18.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_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bindings for the scrypt key derivation function library"
-HOMEPAGE="https://github.com/holgern/py-scrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-# no functional changes since 0.8.16, so no point in upgrading
-KEYWORDS="~m68k"
-SLOT="0"
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 0ed0e45ae1c1..afbe92eee441 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1 @@
-DIST sentry-sdk-1.2.0.tar.gz 218371 BLAKE2B dcba23b246d4620f93b82a07a9fa9c73ae8b67d54e9a690fc53c1b08580433b2d37a50f29a47e01c7cdcc29eef45cc0b67e96f1e9b333496002ceea5ce7388a9 SHA512 86705fab17331bf5cbe4dbb25562d80b5b080d2bee0a9bb2c153bb379e63ada10465bd5fdfa24d71fc50cc1d80d5afd3e569a779f2a11bde671cc6782ddca347
DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild
deleted file mode 100644
index 0d827d4ea873..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- dev-python/urllib3[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/asttokens[${PYTHON_USEDEP}]
- dev-python/django[${PYTHON_USEDEP}]
- dev-python/executing[${PYTHON_USEDEP}]
- dev-python/eventlet[${PYTHON_USEDEP}]
- dev-python/fakeredis[${PYTHON_USEDEP}]
- dev-python/flask-login[${PYTHON_USEDEP}]
- dev-python/gevent[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pyrsistent[${PYTHON_USEDEP}]
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- dev-python/pytest-django[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zope-event[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local deselect=(
- # tests require Internet access
- tests/integrations/httpx/test_httpx.py
- tests/integrations/requests/test_requests.py
- tests/integrations/stdlib/test_httplib.py
- # wtf is it supposed to do?!
- tests/integrations/gcp/test_gcp.py
- # hangs
- 'tests/test_transport.py::test_transport_works[eventlet'
- # TODO
- 'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
- tests/test_client.py::test_databag_depth_stripping
- tests/test_client.py::test_databag_string_stripping
- tests/test_client.py::test_databag_breadth_stripping
- # incompatible version?
- tests/integrations/falcon/test_falcon.py
- # test_circular_references: apparently fragile
- 'tests/integrations/threading/test_threading.py::test_circular_references'
- # test for new feature, fails with IndexError
- tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
- )
-
- # Prevent tests/integrations/modules/test_modules.py:test_basic failure
- # Needs to detect sentry-sdk in the installed modules
- distutils_install_for_testing
-
- epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild
index d0881dad90d7..0d827d4ea873 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/sentry-python-${PV}"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
index 2b2cdf079def..c27ab3194b75 100644
--- a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
@@ -19,7 +19,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-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index d9a284c2a533..28cf9eebb539 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
DIST setuptools_scm-6.1.0.tar.gz 55618 BLAKE2B b1bdf0c2faa34eb77b378908fcd73670b2f1918552b62b0bd6a0359af00508485ddc91704966e4e862255b3c4e93492210741a60da41a8f09f9cd6c660e1aa8a SHA512 d9359936e22f8c0bc207def147283d79321ff0f26ba75661afd593edb3c41a06d057317f09bb5b8ef013e95b1aa5911372d4aeb3c7a05bd012ff24bdbf479073
+DIST setuptools_scm-6.2.0.tar.gz 54691 BLAKE2B 2564e4b3e888b0b24ed053bc85311062d8bafc07b12cdfd5ade2b5c276537bfa473377905282b4eb4901f13873e6319dc05fb12a07ae4525d89814b4edd84d57 SHA512 33c0a7c4be0df296dd859989f94db6eddf553e37e5580abe1dda63c33054e709a672a5eb9dc6f262f482f4d2a5507511aa0332022d46943251b5c522dff7c840
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.2.0.ebuild
new file mode 100644
index 000000000000..ab8618cba7dc
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-6.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+ https://github.com/pypa/setuptools_scm/
+ https://pypi.org/project/setuptools-scm/"
+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"
+
+RDEPEND="dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="
+ !!python@gentoo.org
Python
+
- sphinx_selective_exclude
+ sphinx-selective-exclude
pfalcon/sphinx_selective_exclude
diff --git a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
index e6668899d411..7509d12a09b3 100644
--- a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
+++ b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -14,6 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
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
index 7b80ce7fde63..02e40356dc3d 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="sphinx extension to support coroutines in markup"
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
index 784fdfecf6b9..f7526485a60e 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -22,7 +22,12 @@ RDEPEND="
dev-python/pyparsing[${PYTHON_USEDEP}]
"
-BDEPEND="test? ( app-doc/doxygen )"
+BDEPEND="
+ test? (
+ app-doc/doxygen
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ )
+"
distutils_enable_tests pytest
distutils_enable_sphinx doc
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index de97fa459833..fce5769cc191 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
index 668e2c8538ae..e499df72fce5 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -16,9 +16,6 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
- ' python3_{6,7})
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
"
@@ -32,6 +29,10 @@ BDEPEND="
# The doc can only be built from a git repository
distutils_enable_tests pytest
+EPYTEST_DESELECT=(
+ 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.
@@ -39,14 +40,6 @@ RDEPEND+="
dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
"
-python_test() {
- local deselect=(
- tests/test_filter.py::test_contributors
- )
-
- epytest ${deselect[@]/#/--deselect }
-}
-
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 579331160793..45c19a3ab609 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
SLOT="0"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild
index fc00691ea510..dc007d0dbc1c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="examples +sqlite test"
RDEPEND="
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index ee6ef4a2807f..b0c71b93dbe2 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,2 +1,3 @@
DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
DIST tldextract-3.1.0.tar.gz 101874 BLAKE2B 105f34699de2118126dc0f9d68f25999f99211aa8529c2640dd21d303cfb18cd5388819986881e235b8111a21b74d99c6424ad469a66a0ac45c25a0e7c31a21f SHA512 c6c67598b7dd2c8e85008c5061693182eb075e16390b001eb696fd12a0f5666d0a327667a0fd61e4f270003a8cfc97a8fbf7b53a246bab6f9e9ad95943dac9d8
+DIST tldextract-3.1.1.tar.gz 103195 BLAKE2B e0cdf85e22d58bf68705e9c37cfffaa8a9508316e734adf682b14daa50f02b408cbeda9f4554674f0f582b3246e750bbc46c70d7528c1a4af30b55f05e4bf595 SHA512 caec65beca0b2ba8f294043cf2f64839aef9fe472d1a76619bef1ec6b33ac99ccd08c24601c7fd97fef215621c9ec71a34911d3832febdb36d3f8ac9561b1175
diff --git a/dev-python/tldextract/tldextract-3.1.1.ebuild b/dev-python/tldextract/tldextract-3.1.1.ebuild
new file mode 100644
index 000000000000..fe0c1f271c53
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.1.1.ebuild
@@ -0,0 +1,37 @@
+# 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="Accurately separate the TLD from the registered domain and subdomains of a URL."
+HOMEPAGE="https://pypi.org/project/tldextract/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e 's:--pylint::' pytest.ini || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 44a4e0a36d73..d652fc21cd82 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,2 +1,3 @@
DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
+DIST traitlets-5.1.0.tar.gz 135161 BLAKE2B adb948cd07a961196c3b02cd28c7dac274ba9152ddae0fab1d706d78643ff1f60e4478731d960e583eb6ad5088b2730efa31c6b3a806497ac5c8aa7b05e51502 SHA512 2b7aa7db355ddb5fa5dcdc091324b933cf7f8b189c033d43408af1bcda40cb242cd787f82098e042f1c65f07bf94b89d7d9f10019374388c47390565e7e3a467
diff --git a/dev-python/traitlets/files/traitlets-5.1.0-py310.patch b/dev-python/traitlets/files/traitlets-5.1.0-py310.patch
new file mode 100644
index 000000000000..eed1b8e0985c
--- /dev/null
+++ b/dev-python/traitlets/files/traitlets-5.1.0-py310.patch
@@ -0,0 +1,39 @@
+From 9ee33f09bdae6bea94641ce39e24dc180df5517a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Mon, 30 Aug 2021 23:07:38 +0200
+Subject: [PATCH] Revert "Fix string assertion for python3.10"
+
+This reverts commit dbb604946745ed90c6e9f6ed17f2bde253042d52.
+The relevant change has been reverted in Python 3.10.0rc1, breaking
+the test again.
+---
+ traitlets/tests/test_traitlets_enum.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
+index a87dd70..769e830 100644
+--- a/traitlets/tests/test_traitlets_enum.py
++++ b/traitlets/tests/test_traitlets_enum.py
+@@ -5,7 +5,6 @@ Test the trait-type ``UseEnum``.
+
+ import unittest
+ import enum
+-import sys
+ from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
+
+
+@@ -88,10 +87,7 @@ class TestUseEnum(unittest.TestCase):
+ example = self.Example()
+ example.color = value
+ self.assertIsInstance(example.color, Color)
+- if sys.version_info < (3, 10):
+- self.assertEqual(str(example.color), value)
+- else:
+- self.assertEqual(repr(example.color), value)
++ self.assertEqual(str(example.color), value)
+
+ def test_assign_bad_enum_value_name__raises_error(self):
+ # -- CONVERT: string => Enum value (item)
+--
+2.33.0
+
diff --git a/dev-python/traitlets/traitlets-5.1.0.ebuild b/dev-python/traitlets/traitlets-5.1.0.ebuild
new file mode 100644
index 000000000000..cc6e4c002e4e
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-py310.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ dev-python/ipython_genutils \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index 48eab319d145..5fc7dc5a0b4d 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 64270f1aa124..63d09da5cd7c 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,2 +1 @@
-DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
diff --git a/dev-python/twine/twine-3.4.1.ebuild b/dev-python/twine/twine-3.4.1.ebuild
deleted file mode 100644
index 17f9c3dc5eef..000000000000
--- a/dev-python/twine/twine-3.4.1.ebuild
+++ /dev/null
@@ -1,53 +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="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
-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 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
- >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
- >=dev-python/keyring-15.1[${PYTHON_USEDEP}]
- >=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
- >=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/jaraco-envs[${PYTHON_USEDEP}]
- dev-python/jaraco-functools[${PYTHON_USEDEP}]
- dev-python/munch[${PYTHON_USEDEP}]
- dev-python/portend[${PYTHON_USEDEP}]
- dev-python/pretend[${PYTHON_USEDEP}]
- dev-python/pypiserver[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
- # requires internet
- rm -f tests/test_integration.py || die
- # pytest-socket dep relevant only to test_integration, and upstream
- # disables it anyway
- sed -i -e '/--disable-socket/d' pytest.ini || die
- sed -i -e '/--cov/d' pytest.ini || die
-
- distutils-r1_python_prepare_all
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
index 97a82eff44d7..15a5458a4761 100644
--- a/dev-python/twine/twine-3.4.2.ebuild
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -13,7 +13,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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index 68bcdd4ffffc..a112fefc0830 100644
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
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"
IUSE="conch crypt http2 serial test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 93a394d59e47..1505744e884d 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1 +1,2 @@
DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c
+DIST typing_extensions-3.10.0.2.tar.gz 46048 BLAKE2B a8f7ecacd553ed469cf090f4b8f52e15039fbcf1ae6879f5899fb99e7bbf5b7289cf5d7e5409314a110b2a626b59bd5e6a52f893e4322244c9e7e80ab393d334 SHA512 171ada56758fb04328a2cafefe80b70fbf166f2d799406883df642927964925ca73f04d0646661cd4fd016dfb5e1856b84f362e3b404c27b368ca06a09cf87db
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
new file mode 100644
index 000000000000..c5ec963b069c
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+MY_P=${P/-/_}
+DESCRIPTION="Type Hint extensions from Python 3.8 backported"
+HOMEPAGE="
+ https://pypi.org/project/typing-extensions/
+ https://github.com/python/typing/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+python_test() {
+ cd "${S}"/src_py3 || die
+ "${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/utidylib/utidylib-0.6-r1.ebuild b/dev-python/utidylib/utidylib-0.6-r2.ebuild
similarity index 100%
rename from dev-python/utidylib/utidylib-0.6-r1.ebuild
rename to dev-python/utidylib/utidylib-0.6-r2.ebuild
diff --git a/dev-python/utidylib/utidylib-0.7.ebuild b/dev-python/utidylib/utidylib-0.7-r1.ebuild
similarity index 100%
rename from dev-python/utidylib/utidylib-0.7.ebuild
rename to dev-python/utidylib/utidylib-0.7-r1.ebuild
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 74e3e2d57237..25dc92f02efe 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1 @@
-DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
-DIST virtualenv-clone-0.5.5.gh.tar.gz 8679 BLAKE2B 4283de1e7b53083357d68ea556ad68144fff104d531fcc741b2194e7b501de52ade791612a538d87585af75ecf187e0bee2d13a76cc55c0516f8f145a11b58e7 SHA512 b4bcbfbba9d6616d00ecbd574651dc93cdc71ac85e610c924681692665478975f2381e04afb0b9e8b59c76484085ab3519aa4a58b1dfe057a0be0ea83263e93e
DIST virtualenv-clone-0.5.6.gh.tar.gz 8723 BLAKE2B 2bac625f85a26ac2224fb982230fdf592963ac462d6d86c59100bf960fc37dd4ae7ae9da0e6234e1b2952d77ce55e0a0c60c06c7db4868709638f21479e8150b SHA512 5788a3d2994b3cbf4ec4668e2d0597e7a033a5eb13465b3964aeb2a38c5798a879e818a88a9cfa37b87a9aae534416c157cd82959af556b6ec94ffbc755ba844
diff --git a/dev-python/virtualenv-clone/metadata.xml b/dev-python/virtualenv-clone/metadata.xml
index 13775478268a..cd65f58a5e63 100644
--- a/dev-python/virtualenv-clone/metadata.xml
+++ b/dev-python/virtualenv-clone/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
virtualenv-clone
edwardgeorge/virtualenv-clone
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
deleted file mode 100644
index 49cb1ae866df..000000000000
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# rdepend is correct despite warning, see https://bugs.gentoo.org/705362
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A script for cloning a non-relocatable virtualenv"
-HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
deleted file mode 100644
index 92908cdde49a..000000000000
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.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
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A script for cloning a non-relocatable virtualenv"
-HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone/"
-SRC_URI="
- https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
index ffb83dc6e391..d26b54951793 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="
test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 104a0e47050d..c8d1fc8c4f4a 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1 +1,2 @@
DIST weasyprint-53.0.tar.gz 386339 BLAKE2B 6d8e30a02d54061557e549a685944de7cbc61f4c1b46b23dbaef66e87232325f630fd5a34cf5c846599612914f9306b5235fad65a008e19a7c200af2f4c7d9da SHA512 de34ee5654ee90aec82b67c1bc7d9496fe3a4247b2a649ab110d1613c4780fd9ae611c9da177de07e5287749978af9a4a7d5c102d0940e5fd970e5aa8586c47e
+DIST weasyprint-53.2.tar.gz 387220 BLAKE2B 820c3ef386c86ab927a02153e68ba085817d18c9658539233c283b2ee2e58a190420a88d3d1b4282d7e46eefbd89d9c5fbd94ccefaa6ef7c304d893579739482 SHA512 c4e1a831a9ac5b3adf1241b8c53c90330e3960cf7a5ab8307bbeb89e8e17a7e5a5d50fd676961ce45deda606b82eaa2b05d37f7dd5a1506bd0d78f8e4276328a
diff --git a/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
deleted file mode 100644
index 862f11dc0a04..000000000000
--- a/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -40,7 +40,6 @@
- [options]
- packages = find:
- zip_safe = false
--setup_requires = pytest-runner
- install_requires =
- setuptools>=39.2.0
- cffi>=0.6
-@@ -50,11 +49,6 @@
- cssselect2>=0.1
- CairoSVG>=2.4.0
- Pyphen>=0.9.1
--tests_require =
-- pytest-runner
-- pytest-cov
-- pytest-flake8
-- pytest-isort
- python_requires = >= 3.5
-
- [options.entry_points]
-@@ -86,7 +80,6 @@
- test = pytest
-
- [tool:pytest]
--addopts = --flake8 --isort
- norecursedirs = build dist .cache .eggs .git
-
- [coverage:run]
diff --git a/dev-python/weasyprint/weasyprint-53.2.ebuild b/dev-python/weasyprint/weasyprint-53.2.ebuild
new file mode 100644
index 000000000000..f201ef75f8ef
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-53.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+ >=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+ >=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+ >=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+ >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+ x11-libs/pango
+"
+
+BDEPEND="
+ test? (
+ app-text/ghostscript-gpl
+ media-fonts/ahem
+ media-fonts/dejavu
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e '/addopts/d' pyproject.toml || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 3496c4474f06..2e3cf73d59ee 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,9 +1,4 @@
-DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
-DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
-DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be48e57ff0c34dd59dc3bfa008e2fd204f2f290088e6c784580114b91ddefce1cd2a3cea9310cfd4848c983c04749a1dbf3ebb8 SHA512 4e232fb9ad1e447333880d9737c3af3e9c652db2e0d7187d485cb6cdf8fe58076b78da4e1db3d2467b147c71343aeb18878f259bbfde6acd0faa3c4b9196222f
DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26d8a52b6329500a1a18354148590fdb47988f200b0658a41e18b78694cd9f95f1322cce0ff289a795bf9459ab6d383d5ee13f9 SHA512 fa6dd453ea22beb113c53941ce750e214da3211b6fc14d8b0cb575b927cff14759c49fec4e9ada4a2fd4ebc0bb3b0b355a2454ca0e128a3213fc8be41f096af7
-DIST python-zeroconf-0.34.2.gh.tar.gz 125452 BLAKE2B 704ab1400a01eae93b1f706c2ccd4554b7ffbbcfcaebfc28bacf6e28354894185a7ed5cffddb3b96ff05dc3521d2507160a5f43c11a600c5b5043882d15c39e6 SHA512 958d01316ef307d08d68abe975f45d77e84cede8334f8ad023080b7d46f965f890b1c74de640807681d3aaa647e01902de01309e3520fba8ba18cb4b6af1f4ba
-DIST python-zeroconf-0.34.3.gh.tar.gz 125454 BLAKE2B d80c25fa8bb79b6c5a3d491efc0e891b08e808d9c2619d917a19d9d76ebdf13d32ddb684a3f68abd7ae6dce3597de30027557033a5ccacfe8dcc5bf624b45f25 SHA512 d9f1ab126dd68fdef2e2983a11efe7d3703bbacd7b74b9a82a781361b0282bf20d8c16bcf96beda7112958eab54e0b819f709d840a9e5f0f2da8c9003e9943fe
-DIST python-zeroconf-0.35.0.gh.tar.gz 126620 BLAKE2B 1c2a7e78c32305be0c35fcef513e26c1834dee71b7714479c70c44a09378fb96a15f39fb4d9de4a8bde607cc4ef67798b5e6cb09e613f1a86cd9934123ab2ca9 SHA512 440871dd5fa861950187bf0c4593b2212d91477d4adbd41a43fd3adec820543628d684dfc042e38e4b69cd94e8b23d10298e660da32f8c221faf16e03135b925
DIST python-zeroconf-0.35.1.gh.tar.gz 127099 BLAKE2B dc09dadaeaac64d8517de407ddcfffc4152e366430c492d4ab562c56afa3264c33a26373f249bbddd969bb28dbc5c1b7513e59c0ebb728c12a77fb9d428e4f0a SHA512 27386cd425928821080c9c6fd2babdcfc001cc4583ef4c699169e3818f6bb8536f712cf7959e6003a6aaf40e85b5337a8a5abcfdf686455dee577cfa61270fb7
-DIST python-zeroconf-0.36.0.gh.tar.gz 127299 BLAKE2B 66ee56eff026e427c3d0ce4353271a3232e0b3301cc364d9866f9beeedf9e41c9dcd97be82ce9fc0bdd79298d0fb2a89f51cb947f58cba8210be0f768032aaf6 SHA512 2f2bc44f5223a204ccf2106bf9fa3407640408c7199bddd68882b2024b07440e807a22e43b3aaa7eecc1f4fdefdf61f7a9b9a7655dd358355a43f03d67c13166
+DIST python-zeroconf-0.36.1.gh.tar.gz 128104 BLAKE2B a5f2fdf35dd8c51e727ad1f4cd9ba442f2b99fd7ecc6ce0ce9cb0331997f445be90bba17571cec5ec0f59b64268241abacb5aee39134427098902b8d592494c6 SHA512 c568dd836a101a47ef74318154cd6c7fe2eb93c674450596f8e6ec4b7cfb66740126cc994b8f4d98458dd64a16c971ebab29b0877366396b8f5fabd03341107c
+DIST python-zeroconf-0.36.2.gh.tar.gz 129052 BLAKE2B 4bdc4ac13064e162590af12da2d89cd566fbe749f1b11ebef210b2adbe7e33e75ff0e95d3ed11f7d045e016fff525c9a7b9124804d741160b0073016f4757d09 SHA512 2f2a7a87afa07907ed3aa3cd79d2f2e9b61e82193301f219f0505831349b003bca1ae2b6fc1dc71fcf6cb9cfb849413f9766ef88e3955fc569ad84fb9e5e5b60
diff --git a/dev-python/zeroconf/zeroconf-0.32.1.ebuild b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
deleted file mode 100644
index 8078abee7f30..000000000000
--- a/dev-python/zeroconf/zeroconf-0.32.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
- https://github.com/jstasiak/python-zeroconf/
- https://pypi.org/project/zeroconf/"
-SRC_URI="
- https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- local excludes=(
- # network
- tests/test_core.py::Framework::test_close_multiple_times
- tests/test_core.py::Framework::test_launch_and_close
- tests/test_core.py::Framework::test_launch_and_close_context_manager
- tests/test_core.py::Framework::test_launch_and_close_v4_v6
- tests/test_core.py::Framework::test_launch_and_close_v6_only
- tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
- )
-
- epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.33.4.ebuild b/dev-python/zeroconf/zeroconf-0.33.4.ebuild
index 0e1b2943b16e..8078abee7f30 100644
--- a/dev-python/zeroconf/zeroconf-0.33.4.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.33.4.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/zeroconf/zeroconf-0.34.2.ebuild b/dev-python/zeroconf/zeroconf-0.34.2.ebuild
deleted file mode 100644
index 0e1b2943b16e..000000000000
--- a/dev-python/zeroconf/zeroconf-0.34.2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
- https://github.com/jstasiak/python-zeroconf/
- https://pypi.org/project/zeroconf/"
-SRC_URI="
- https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- local excludes=(
- # network
- tests/test_core.py::Framework::test_close_multiple_times
- tests/test_core.py::Framework::test_launch_and_close
- tests/test_core.py::Framework::test_launch_and_close_context_manager
- tests/test_core.py::Framework::test_launch_and_close_v4_v6
- tests/test_core.py::Framework::test_launch_and_close_v6_only
- tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
- )
-
- epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.34.3.ebuild b/dev-python/zeroconf/zeroconf-0.34.3.ebuild
deleted file mode 100644
index 0e1b2943b16e..000000000000
--- a/dev-python/zeroconf/zeroconf-0.34.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
- https://github.com/jstasiak/python-zeroconf/
- https://pypi.org/project/zeroconf/"
-SRC_URI="
- https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- local excludes=(
- # network
- tests/test_core.py::Framework::test_close_multiple_times
- tests/test_core.py::Framework::test_launch_and_close
- tests/test_core.py::Framework::test_launch_and_close_context_manager
- tests/test_core.py::Framework::test_launch_and_close_v4_v6
- tests/test_core.py::Framework::test_launch_and_close_v6_only
- tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
- )
-
- epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.35.0.ebuild b/dev-python/zeroconf/zeroconf-0.35.0.ebuild
deleted file mode 100644
index 0e1b2943b16e..000000000000
--- a/dev-python/zeroconf/zeroconf-0.35.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
- https://github.com/jstasiak/python-zeroconf/
- https://pypi.org/project/zeroconf/"
-SRC_URI="
- https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- local excludes=(
- # network
- tests/test_core.py::Framework::test_close_multiple_times
- tests/test_core.py::Framework::test_launch_and_close
- tests/test_core.py::Framework::test_launch_and_close_context_manager
- tests/test_core.py::Framework::test_launch_and_close_v4_v6
- tests/test_core.py::Framework::test_launch_and_close_v6_only
- tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
- )
-
- epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.36.0.ebuild b/dev-python/zeroconf/zeroconf-0.36.0.ebuild
deleted file mode 100644
index 0e1b2943b16e..000000000000
--- a/dev-python/zeroconf/zeroconf-0.36.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
- https://github.com/jstasiak/python-zeroconf/
- https://pypi.org/project/zeroconf/"
-SRC_URI="
- https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- local excludes=(
- # network
- tests/test_core.py::Framework::test_close_multiple_times
- tests/test_core.py::Framework::test_launch_and_close
- tests/test_core.py::Framework::test_launch_and_close_context_manager
- tests/test_core.py::Framework::test_launch_and_close_v4_v6
- tests/test_core.py::Framework::test_launch_and_close_v6_only
- tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
- )
-
- epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.33.2.ebuild b/dev-python/zeroconf/zeroconf-0.36.1.ebuild
similarity index 100%
rename from dev-python/zeroconf/zeroconf-0.33.2.ebuild
rename to dev-python/zeroconf/zeroconf-0.36.1.ebuild
diff --git a/dev-python/zeroconf/zeroconf-0.33.3.ebuild b/dev-python/zeroconf/zeroconf-0.36.2.ebuild
similarity index 100%
rename from dev-python/zeroconf/zeroconf-0.33.3.ebuild
rename to dev-python/zeroconf/zeroconf-0.36.2.ebuild
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d6e35b3c8b18..a16b6e751604 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 c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.7.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.7.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.7.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="ruby25 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.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.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
-
-USE_RUBY="ruby25 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.1.3.2.ebuild b/dev-ruby/actioncable/actioncable-6.1.3.2.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.3.2.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="ruby25 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.1.4.ebuild b/dev-ruby/actioncable/actioncable-6.1.4.ebuild
deleted file mode 100644
index dbe3b94f8a3d..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.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=7
-
-USE_RUBY="ruby25 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/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 9e059161bb70..9caf787181b1 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,6 +1,2 @@
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild
deleted file mode 100644
index 9e55566737c6..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.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="ruby25 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\)/ 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.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.ebuild
deleted file mode 100644
index 9e55566737c6..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.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="ruby25 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\)/ 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.1.3.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.3.2.ebuild
deleted file mode 100644
index 06f3358e6aa4..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.3.2.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="ruby25 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 -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\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
- -e '/group :\(doc\|job\|rubocop\|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.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.4.ebuild
deleted file mode 100644
index 06f3358e6aa4..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.4.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="ruby25 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 -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\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
- -e '/group :\(doc\|job\|rubocop\|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 c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.7.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.7.ebuild
deleted file mode 100644
index bf9872d2db5b..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.7.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="ruby25 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.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.ebuild
deleted file mode 100644
index bf9872d2db5b..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.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=7
-USE_RUBY="ruby25 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.1.3.2.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.3.2.ebuild
deleted file mode 100644
index 054f20f77e74..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.3.2.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
-USE_RUBY="ruby25 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.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.4.ebuild
deleted file mode 100644
index 054f20f77e74..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.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=7
-USE_RUBY="ruby25 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/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.7.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.7.ebuild
deleted file mode 100644
index db3d2851b140..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.7.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
-
-USE_RUBY="ruby25 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 ~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
-
- 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.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.ebuild
deleted file mode 100644
index ff28adad5b8d..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.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=7
-
-USE_RUBY="ruby25 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 ~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
-
- 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.1.3.2.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.2.ebuild
deleted file mode 100644
index 74a56ac801f5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.3.2.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="ruby25 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 ~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.ebuild b/dev-ruby/actionpack/actionpack-6.1.4.ebuild
deleted file mode 100644
index 74a56ac801f5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.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=7
-
-USE_RUBY="ruby25 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 ~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/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 9e059161bb70..9caf787181b1 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,6 +1,2 @@
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
deleted file mode 100644
index f9de1b021062..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
+++ /dev/null
@@ -1,51 +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_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/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\)/ 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.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.ebuild
deleted file mode 100644
index f9de1b021062..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.ebuild
+++ /dev/null
@@ -1,51 +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_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/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\)/ 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.1.3.2.ebuild b/dev-ruby/actiontext/actiontext-6.1.3.2.ebuild
deleted file mode 100644
index 052bc4fa1448..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.3.2.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="ruby25 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/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\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :\(doc\|rubocop\|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.ebuild b/dev-ruby/actiontext/actiontext-6.1.4.ebuild
deleted file mode 100644
index 052bc4fa1448..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.4.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="ruby25 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/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\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :\(doc\|rubocop\|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 c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/actionview/actionview-6.0.3.7.ebuild b/dev-ruby/actionview/actionview-6.0.3.7.ebuild
deleted file mode 100644
index 1d7be633f345..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.7.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="ruby25 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 ~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.ebuild b/dev-ruby/actionview/actionview-6.0.4.ebuild
deleted file mode 100644
index 1d7be633f345..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.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="ruby25 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 ~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.1.3.2.ebuild b/dev-ruby/actionview/actionview-6.1.3.2.ebuild
deleted file mode 100644
index 14ddbdd81c38..000000000000
--- a/dev-ruby/actionview/actionview-6.1.3.2.ebuild
+++ /dev/null
@@ -1,67 +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_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 ~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.ebuild b/dev-ruby/actionview/actionview-6.1.4.ebuild
deleted file mode 100644
index 14ddbdd81c38..000000000000
--- a/dev-ruby/actionview/actionview-6.1.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=7
-
-USE_RUBY="ruby25 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 ~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 c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/activejob/activejob-6.0.3.7.ebuild b/dev-ruby/activejob/activejob-6.0.3.7.ebuild
deleted file mode 100644
index d50c12b194a0..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.7.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="ruby25 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.ebuild b/dev-ruby/activejob/activejob-6.0.4.ebuild
deleted file mode 100644
index d50c12b194a0..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.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="ruby25 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.1.3.2.ebuild b/dev-ruby/activejob/activejob-6.1.3.2.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.1.3.2.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="ruby25 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.ebuild b/dev-ruby/activejob/activejob-6.1.4.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.1.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=7
-
-USE_RUBY="ruby25 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/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.7.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.7.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.7.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="ruby25 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 ~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.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.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=7
-
-USE_RUBY="ruby25 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 ~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.3.2.ebuild b/dev-ruby/activemodel/activemodel-6.1.3.2.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.3.2.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="ruby25 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 ~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.ebuild b/dev-ruby/activemodel/activemodel-6.1.4.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.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=7
-
-USE_RUBY="ruby25 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 ~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 c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.7.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.7.ebuild
deleted file mode 100644
index d0489094f856..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.7.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="ruby25 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 ~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.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.ebuild
deleted file mode 100644
index d0489094f856..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.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="ruby25 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 ~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.1.3.2.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.2.ebuild
deleted file mode 100644
index a1ef44206920..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.3.2.ebuild
+++ /dev/null
@@ -1,83 +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"
-
-# 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 ~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.ebuild b/dev-ruby/activerecord/activerecord-6.1.4.ebuild
deleted file mode 100644
index a1ef44206920..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.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=7
-USE_RUBY="ruby25 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 ~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/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild
deleted file mode 100644
index 6220578fea14..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.7-r1.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="ruby25 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.3.7.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.7.ebuild
deleted file mode 100644
index 3712c85cbb9a..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.7.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="ruby25 ruby26"
-
-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-0.3.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.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.ebuild
deleted file mode 100644
index 6220578fea14..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.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=7
-
-USE_RUBY="ruby25 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.1.3.2.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.2.ebuild
deleted file mode 100644
index 6064db838572..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.3.2.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
-
-USE_RUBY="ruby25 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.0.2 =dev-ruby/mini_mime-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.ebuild b/dev-ruby/activestorage/activestorage-6.1.4.ebuild
deleted file mode 100644
index 28eafbf242a6..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.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=7
-
-USE_RUBY="ruby25 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/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.7.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.7.ebuild
deleted file mode 100644
index 4d732e6615fe..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.7.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="ruby25 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 ~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.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.ebuild
deleted file mode 100644
index 4d732e6615fe..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.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="ruby25 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 ~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.1.3.2.ebuild b/dev-ruby/activesupport/activesupport-6.1.3.2.ebuild
deleted file mode 100644
index 077b419f7711..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.3.2.ebuild
+++ /dev/null
@@ -1,72 +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="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 ~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/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.3: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\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ 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.ebuild b/dev-ruby/activesupport/activesupport-6.1.4.ebuild
deleted file mode 100644
index 077b419f7711..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.4.ebuild
+++ /dev/null
@@ -1,72 +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="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 ~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/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.3: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\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ 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/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index df38b7073f5e..8527aea2ac5c 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1 +1,2 @@
DIST arel-helpers-2.12.0.gem 21504 BLAKE2B f2897b70e679df8a58ace7b88204a3345a2f22bedcaf13ef27f4176a5f02a716e9c7a0b09c3d242c8bef96cc6423a513820d20b15999415d99eb3d61b3b93889 SHA512 6da9d69b49d18f70dd911a5f1cf6edb29055423b6179858ae65f8f826f9c98fae7b9d4a7d6f1365c5efe382adbaeb42f30898c2329b721941428b0a6f58b3aef
+DIST arel-helpers-2.12.1.gem 16896 BLAKE2B 32809d895c630d8c5d3d1bfadb70d4b37fdeebe41dd3be303abd20295cb06e210ad48db8996673d5ca851e247420bf65ccbe0a7b3da352943e56094b38937911 SHA512 6d10bd57d74ccf1780927aa1fdccb4697a2e9cdbdf93bcc392b9453890043a8a6a4b57bef25d43f1f7d1597ef92d938afa9c67c54140b9e0b36b7b23c2de1837
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild
new file mode 100644
index 000000000000..2ce0bc2f3056
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild
@@ -0,0 +1,38 @@
+# 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_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| (
+ dev-ruby/activerecord:6.1
+ dev-ruby/activerecord:6.0
+ dev-ruby/activerecord:5.2
+ )"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rr
+ dev-ruby/activerecord[sqlite]
+ dev-ruby/bundler
+)"
+
+all_ruby_prepare() {
+ sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
+ sed -e '/rake/ s/~>/>=/' -e '/appraisal/ s:^:#:' -e '/database_cleaner/ s/1.8/1.7/' -i arel-helpers.gemspec || die
+}
+
+each_ruby_test() {
+ bundle exec rspec spec || die
+}
diff --git a/dev-ruby/kramdown/kramdown-2.3.1.ebuild b/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
similarity index 100%
rename from dev-ruby/kramdown/kramdown-2.3.1.ebuild
rename to dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 3e89a1beffd9..8f21766f863d 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,3 +1,4 @@
DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
+DIST power_assert-2.0.1.tar.gz 17062 BLAKE2B 9c592c12e0722a3376fede86b1a609c4c5feec49dacdb74f5af96d7ee3024112525bdd57fd5d1763b3a599386ce6548d694f5a4b1207c356701c79046166ee42 SHA512 717d163050e45d889bbf50ee5caf4d91b143a0df45d8ed1be9588595fd485f05662d59ae6166d44b5cf987d6b2a1e77f40441f2aefd1051ff9cf679d3bcdddc6
diff --git a/dev-ruby/power_assert/power_assert-2.0.1.ebuild b/dev-ruby/power_assert/power_assert-2.0.1.ebuild
new file mode 100644
index 000000000000..f4ff5d42d4ac
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-2.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/ruby/power_assert"
+SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+ sed -i -e '1igem "test-unit"' \
+ -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+ # Avoid git dependency
+ sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid circular dependency on byebug when bootstrapping ruby
+ sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
+ rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+ # Avoid circular dependency on pry when bootstrapping ruby
+ sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^ end/ s:^:#:' test/block_test.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 2309e7080c50..ca58c71a200b 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
-DIST rails-6.0.3.7.gem 6656 BLAKE2B 25edf742dd7713b10649f567150b0271f9050b346c4f0ef50e687cbf86e3179ae74cf59b606ac7b4dd5cc6122f7a7dd4a8065b07a0afbbf2948284a7a3bb159b SHA512 15352bf9a50f9d48c8ece56e65e95ead9dc98ca7aa6892ebbfce4fa99434cb1f6c71388434d0cd80f031037e7094a8e528c252faba2658bd650027b61d868616
DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
-DIST rails-6.0.4.gem 6656 BLAKE2B 2fbc03243322b4e62cc66cd7ec5ba6595e56bf5d79b1e8bc118a1b58461b42e0bf6b37850559974d371fc31553982186a4483142c7fed47287b5674e6dbccef8 SHA512 8666882edaf418284f869cfcb9dcd733b3ebfc5d0799f5a98cd0f5d399cdfeca770a87f4253ac8db44eee1b799764914a230cda2205af210072944c8c1b886e4
-DIST rails-6.1.3.2.gem 6656 BLAKE2B fbbe4a7af8c48e26aa6c6ddd1cc1e9435523cd23423c3f2e4a58ae5f9d2abdd9ead9da19b6f152c164e4518d1f7f5bdbb321f9a5929c2ca425d28047fbfd7c02 SHA512 18d0ad80cedc92f0090b4f918a2005a94956613b4888b782c0249549f904fbcce8190de75b2d1b403cb9b3a430091f13e57969a59574e1f8335286970eba938b
DIST rails-6.1.4.1.gem 6656 BLAKE2B b41eb0898d3038f5412cf44b4f7d42ba5603bc5533915ff1a6e4937f2368323efc992b859c1ee7876f16c46ab3a945a6f29861d259dafa1788472af2c7597ea8 SHA512 789f44bc43d84ada313592a2dde046d853cdffa4c79f4b98669285647290cf2166b68c1b286902e87bfddf6e3b8f31b4bd1ca5f386fb598332adb64a05ce0f26
-DIST rails-6.1.4.gem 6656 BLAKE2B 6933051a8d31e48f1294efaa475e0739ced0e5aaa7ac36adb178dbe081da3eeb4e3cea162f648abf44dcdb000b9aaebe4b0da59b2224954e7ea5bef9195d3667 SHA512 21455a0abca2a4aacbcd24fa5650dbf69c2a16fab88493070038491aeae84ffdcefe5e44bfd89af03b88906b62cd54ebd29092dc9676711133bed52c50516cfd
diff --git a/dev-ruby/rails/rails-6.0.3.7.ebuild b/dev-ruby/rails/rails-6.0.3.7.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.0.3.7.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="ruby25 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.ebuild b/dev-ruby/rails/rails-6.0.4.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.0.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=7
-USE_RUBY="ruby25 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.1.3.2.ebuild b/dev-ruby/rails/rails-6.1.3.2.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.1.3.2.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="ruby25 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.1.4.ebuild b/dev-ruby/rails/rails-6.1.4.ebuild
deleted file mode 100644
index 130bcd4ae6cc..000000000000
--- a/dev-ruby/rails/rails-6.1.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=7
-USE_RUBY="ruby25 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/railties/Manifest b/dev-ruby/railties/Manifest
index c4787cee7548..1cb354781ace 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,7 +1,3 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.tgz 18594882 BLAKE2B e24ede90a572bc5ebd8244f45b987a62d50080af38e7e8b1689b9af88b66e194c0c3859e35ec2efbd306fc0c2f62a9d8aaa669fb73ddedd940c23aabc2719c2e SHA512 5a9a050ea44716cf72985643098a08716d191fe08d2cf4404fdf80709340c68d4ca083929c7118dad2532cc64a96c28e5dee3ac9541c10745d0f9d0583eda685
-DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-DIST rails-6.1.4.tgz 11003156 BLAKE2B a0068d221da9c2b3be73f45b84ca1c1c926dfab5b759364d25428291624be31dd664faff32930ec59d5902682950895e6a5b40bcaf6106ad274622741b8f316c SHA512 e88781c690b00441fda0d50514b3ce1dde2ba4c5b93c775a6f77d50bd9aa736631c4d8b1ca6f5d0e270b8ebe902f7945823df7d0d7513881fa6b35c03bcf388f
diff --git a/dev-ruby/railties/railties-6.0.3.7.ebuild b/dev-ruby/railties/railties-6.0.3.7.ebuild
deleted file mode 100644
index e1d845f8c3d6..000000000000
--- a/dev-ruby/railties/railties-6.0.3.7.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="ruby25 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 ~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/thor-0.18.1:0 )
- >=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.ebuild b/dev-ruby/railties/railties-6.0.4.ebuild
deleted file mode 100644
index e1d845f8c3d6..000000000000
--- a/dev-ruby/railties/railties-6.0.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=7
-USE_RUBY="ruby25 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 ~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/thor-0.18.1:0 )
- >=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.3.2.ebuild b/dev-ruby/railties/railties-6.1.3.2.ebuild
deleted file mode 100644
index c0b9e766ecfb..000000000000
--- a/dev-ruby/railties/railties-6.1.3.2.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="ruby25 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 ~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.ebuild b/dev-ruby/railties/railties-6.1.4.ebuild
deleted file mode 100644
index c0b9e766ecfb..000000000000
--- a/dev-ruby/railties/railties-6.1.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=7
-USE_RUBY="ruby25 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 ~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-util/Manifest.gz b/dev-util/Manifest.gz
index 83a641e07383..81d72951d0e2 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4e9442f6a4b6..a1dab85d5449 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1 +1,2 @@
DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
+DIST ccache-4.4.tar.xz 509516 BLAKE2B 6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43 SHA512 a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
diff --git a/dev-util/ccache/ccache-4.4.ebuild b/dev-util/ccache/ccache-4.4.ebuild
new file mode 100644
index 000000000000..39f7580581d8
--- /dev/null
+++ b/dev-util/ccache/ccache-4.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="app-text/asciidoc"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-4.0-objdump.patch
+ "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+ # mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+ use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_CCACHE=OFF
+ -DZSTD_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${ROOT:-/} == / ]]; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index f673d3c58361..57030654f604 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Toolchain Project
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 1259638cdb5a..81deb5a96113 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
cgdb/cgdb
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 457d5db0bdd7..e681c6e4473c 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,2 +1,3 @@
DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7
+DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
new file mode 100644
index 000000000000..c92bd4dea7d8
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+S="${WORKDIR}/${MY_P}/scripts"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+src_prepare() {
+ default
+
+ sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.pl ${PN}
+ doman ${PN}.1
+}
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 38c7c9c59197..a8d0e815dbf3 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,2 +1,3 @@
DIST clippy-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
+DIST clippy-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
DIST clippy-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
diff --git a/dev-util/clippy/clippy-8.0.1.ebuild b/dev-util/clippy/clippy-8.0.1.ebuild
new file mode 100644
index 000000000000..43689631b4e9
--- /dev/null
+++ b/dev-util/clippy/clippy-8.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="frr-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-single-r1
+
+DESCRIPTION="Standalone clippy tool built from FRR sources"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/frr-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ virtual/libelf:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-clippy-only
+}
+
+src_install() {
+ dobin lib/clippy
+}
diff --git a/dev-util/clippy/metadata.xml b/dev-util/clippy/metadata.xml
index af7e64c3e634..b6c4188cd812 100644
--- a/dev-util/clippy/metadata.xml
+++ b/dev-util/clippy/metadata.xml
@@ -2,12 +2,8 @@
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ jsmolic@gentoo.org
+ Jakov Smolić
FRRouting/frr
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
deleted file mode 100644
index 321f05302aa1..000000000000
--- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -4,6 +4,10 @@
- #
- # Find LAPACK library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- #
-@@ -140,6 +144,23 @@
-
- endmacro()
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+ mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -348,3 +369,5 @@
- endif()
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
deleted file mode 100644
index 6bad45b20876..000000000000
--- a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,9 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
-
diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
deleted file mode 100644
index bcf229ad398c..000000000000
--- a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/660980
-
---- cmake-3.11.4/Modules/FindBoost.cmake
-+++ cmake-3.11.4/Modules/FindBoost.cmake
-@@ -1680,7 +1680,7 @@
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
- # Gentoo
-- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
-+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}")
- # RPMs
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
- endif()
diff --git a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch
deleted file mode 100644
index bb60aaf35196..000000000000
--- a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
-From: Lars Wendler
-Date: Fri, 9 Jun 2017 01:47:55 +0200
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
-Updated by Lars Wendler (cmake-3.9.0_rc2)
----
- Modules/Platform/Darwin.cmake | 12 ++++++++----
- Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
- 2 files changed, 32 insertions(+), 9 deletions(-)
-
-Index: cmake-3.13.3/Modules/Platform/Darwin.cmake
-===================================================================
---- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake
-+++ cmake-3.13.3/Modules/Platform/Darwin.cmake
-@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
-
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
-- set(CMAKE_FIND_FRAMEWORK FIRST)
-+ set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
-
- # Older OS X linkers do not report their framework search path
-@@ -132,6 +132,8 @@ endif()
-
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
- endif()
- endif()
-
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
-- set(CMAKE_FIND_APPBUNDLE FIRST)
-+ set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- "~/Applications"
- "/Applications"
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake
-===================================================================
---- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake
-+++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake
-@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-- /usr/local /usr /
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-+ @GENTOO_HOST@/usr/local /usr /
-
- # CMake install location
- "${_CMAKE_INSTALL_DIR}"
-@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # X11
-- /usr/include/X11
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- )
-
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-- # X11
-- /usr/lib/X11
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
-+ )
-+
-+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
-+ @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
- )
-
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-- /usr/include
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
-+ @GENTOO_HOST@/usr/include
- )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-- /usr/include
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
-+ @GENTOO_HOST@/usr/include
- )
- list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
deleted file mode 100644
index 2808ed79f735..000000000000
--- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
-Forward-ported from 2.8.10 to 3.4.0-rc1
-
---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-@@ -26,7 +26,7 @@
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- set(CMAKE_SHARED_MODULE_PREFIX "lib")
--set(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- set(CMAKE_MODULE_EXISTS 1)
- set(CMAKE_DL_LIBS "")
-
-@@ -53,7 +53,7 @@
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 5f7cb7c88f4f..8a4cbf114356 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+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="doc"
BDEPEND="
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index e782d2cca8a4..cf13fffbb094 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
cpputest/cpputest
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 54b6d55766c9..bfcb00d62338 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -2,3 +2,4 @@ DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087b
DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
DIST cucumber-wire-6.1.0.gem 12800 BLAKE2B e03e120b1beeab52b2650df8f0e55eb01edb58162d2a31b41e7634b9d8d4b5277a499faf80ba9a179a73a1e92bd660fbe5d71202f39a7ed29e171cb58da268ee SHA512 a7931b90c3eabfca0c762ee8f30e9a9b2e44a649ff8eed11e52ccd187045768678eaf7570e58f4f1fba07ceb1e1c66bdcb8cf02f8fd04a264c89ff874815fabe
+DIST cucumber-wire-6.1.1.gem 12800 BLAKE2B 7e32aeae15bbc02884100f58eab9eb39df2ecb2d7a8fe58dd81c17eefcdb8d080dba6ca84dafcf2584351ce88132d73479a1dd48bec7ad53be7806019940106d SHA512 2f08d14170707930c2b6321232fe9398350ec1cc9e9a00ee174db058053fef4ec568f8a04247bf753c89d1e3430474a7ff25f84472d2dcd1ba3084f88c59d555
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild
new file mode 100644
index 000000000000..ec6f09281efd
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild
@@ -0,0 +1,26 @@
+# 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_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+ >=dev-util/cucumber-core-10.0.1:10
+ >=dev-util/cucumber-cucumber-expressions-12.1.1:12
+ >=dev-util/cucumber-messages-17.0.1:17
+"
+
+ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 4e832e78d2c5..b3f2105aa476 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1 +1,2 @@
DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
+DIST devhelp-40.1.tar.xz 318172 BLAKE2B 83f71b66538b700790961e3dd3c7c7a75199f499a1fb32eb01e62fd5d11e72ae4e860bcfab2615bd4d417d5c57b89dad7eb2f1de4930e39e544d42b57a193b97 SHA512 4c541db9a2222dce4064f401c1d0a9f3233e2dbab17206358dfcce360286f69698248d08172fb236a692b125d8cd3a5bb76b6377b01b52c3d096fa4528400acd
diff --git a/dev-util/devhelp/devhelp-40.1.ebuild b/dev-util/devhelp/devhelp-40.1.ebuild
new file mode 100644
index 000000000000..fc32178168aa
--- /dev/null
+++ b/dev-util/devhelp/devhelp-40.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=net-libs/webkit-gtk-2.24:4[introspection?]
+ >=gui-libs/amtk-5.0:5
+ gnome-base/gsettings-desktop-schemas
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gedit? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ )
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ dev-util/itstool
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/40.0-optional-introspection.patch
+)
+
+pkg_setup() {
+ use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dflatpak_build=false
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dplugin_emacs=true
+ $(meson_use gedit plugin_gedit)
+ -Dplugin_vim=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f7113ff18cf5..93e5d704151a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,4 @@
DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
DIST diffoscope-181.tar.gz 1602420 BLAKE2B ae5f40b7a687c6425444df816b0583e50a0c86a4c31b44034a365c18e448765587a093794d3aab930b979706655a661a3cd8b398e34604c7f3e556a9f918406d SHA512 de4132b936ce6c79e333ab5c835f4dfe30951fc91b70848f9ecc91cb5323b81a47fa25a6cec562cfd3d059d96809bd85dbe1b37971fffdc15303ac504514759a
+DIST diffoscope-182.tar.gz 1602751 BLAKE2B 0039dd91d5f6653cd2addb0193d9070e53fd785ace64ca11a2ffe80078ff07a43deba6ee4c16f29d9152d18130fc793a48086fba48ce0d60861f0bf71d1c375e SHA512 86333b443c18e6ec809742707d7242deb4977a20e2d864a873519120fb0fe0504a3198cc0f2ff66d6101182bdfd998a96a260a75da710c3ef43a1220c7126897
diff --git a/dev-util/diffoscope/diffoscope-182.ebuild b/dev-util/diffoscope/diffoscope-182.ebuild
new file mode 100644
index 000000000000..086eecc95294
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-182.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ app-text/docx2txt
+ media-libs/libcaca
+ )
+"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+ dev-python/libarchive-c[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ acl? ( sys-apps/acl )
+ binutils? ( sys-devel/binutils )
+ bzip2? ( app-arch/bzip2 )
+ libcaca? ( media-libs/libcaca )
+ colord? ( x11-misc/colord )
+ cpio? ( app-arch/cpio )
+ diff? ( sys-apps/diffutils )
+ docx? ( app-text/docx2txt )
+ dtc? ( sys-apps/dtc )
+ e2fsprogs? ( sys-fs/e2fsprogs )
+ file? ( sys-apps/file )
+ find? ( sys-apps/findutils )
+ gettext? ( sys-devel/gettext )
+ gif? ( media-libs/giflib )
+ gpg? ( app-crypt/gnupg )
+ haskell? ( dev-lang/ghc )
+ hdf5? ( sci-libs/hdf5 )
+ hex? ( app-editors/vim-core )
+ imagemagick? ( media-gfx/imagemagick )
+ iso? ( app-cdr/cdrtools )
+ java? ( virtual/jdk )
+ llvm? ( sys-devel/llvm )
+ lzma? ( app-arch/xz-utils )
+ mono? ( dev-lang/mono )
+ opendocument? ( app-text/odt2txt )
+ pascal? ( dev-lang/fpc )
+ pdf? (
+ app-text/pdftk
+ app-text/poppler
+ dev-python/PyPDF2[${PYTHON_USEDEP}]
+ )
+ postscript? ( app-text/ghostscript-gpl )
+ R? ( dev-lang/R )
+ rpm? ( app-arch/rpm )
+ sqlite? ( dev-db/sqlite:3 )
+ squashfs? ( sys-fs/squashfs-tools )
+ ssh? ( net-misc/openssh )
+ tar? ( app-arch/tar )
+ tcpdump? ( net-analyzer/tcpdump )
+ zip? ( app-arch/unzip )
+ zlib? ( app-arch/gzip )
+ zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local exclude=(
+ # test seems to use different tarball
+ tests/test_presenters.py::test_text_proper_indentation
+
+ # needs triage
+ tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+ # needs triage
+ tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+ # img2txt based failures, bug #797688
+ tests/comparators/test_ico_image.py::test_diff
+ tests/comparators/test_ico_image.py::test_diff_meta
+ tests/comparators/test_ico_image.py::test_diff_meta2
+ tests/comparators/test_ico_image.py::test_has_visuals
+ tests/comparators/test_jpeg_image.py::test_diff
+ tests/comparators/test_jpeg_image.py::test_compare_non_existing
+ tests/comparators/test_jpeg_image.py::test_diff_meta
+ tests/comparators/test_jpeg_image.py::test_has_visuals
+
+ # docx2txt based falures, bug #797688
+ tests/comparators/test_docx.py::test_diff
+ )
+ epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/flawfinder/files/flawfinder-2.0.18-setup.patch b/dev-util/flawfinder/files/flawfinder-2.0.18-setup.patch
new file mode 100644
index 000000000000..322a8175a5bc
--- /dev/null
+++ b/dev-util/flawfinder/files/flawfinder-2.0.18-setup.patch
@@ -0,0 +1,9 @@
+--- a/setup.cfg 2021-08-28 17:28:07.213901557 +0200
++++ b/setup.cfg 2021-08-28 17:29:34.009628777 +0200
+@@ -1,5 +1,5 @@
+ [metadata]
+-description-file = README.md
++description_file = README.md
+
+ [bdist_wheel]
+ universal=1
diff --git a/dev-util/flawfinder/flawfinder-2.0.18.ebuild b/dev-util/flawfinder/flawfinder-2.0.18.ebuild
index b4b8332321bf..ae56037d4dfa 100644
--- a/dev-util/flawfinder/flawfinder-2.0.18.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.18.ebuild
@@ -15,6 +15,8 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
src_prepare() {
sed -e "s/${PN}.1.gz/${PN}.1/g" -i setup.py || die 'sed failed'
default
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
new file mode 100644
index 000000000000..dcf762872a18
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
@@ -0,0 +1,43 @@
+From 419ae48d0e2cb932a6618e9012b4164e93e58279 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Sat, 28 Aug 2021 00:16:23 +0200
+Subject: [PATCH] IGC: CMakeLists: adjust minimum_version
+
+As CMake warns about possible compatibility problems,
+the minimum version should be updated, as it should be compatible.
+
+Otherwise, the warning is printed:
+Compatibility with CMake < 2.8.12 will be removed from a future version of CMake.
+
+Signed-off-by: Conrad Kostecki
+---
+ visa/CMakeLists.txt | 2 +-
+ visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
+index c70d80d5726..3e54bd93079 100644
+--- a/visa/CMakeLists.txt
++++ b/visa/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(WIN32)
+ cmake_minimum_required(VERSION 3.1)
+ cmake_policy(SET CMP0043 OLD)
+ else()
+- cmake_minimum_required(VERSION 2.8)
++ cmake_minimum_required(VERSION 2.8.12)
+ endif(WIN32)
+
+ # In the case where this is the IGC build we need to add a dummy custom target check_headers
+diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+index d3011ddae6a..e40313fc194 100644
+--- a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
++++ b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ if(WIN32)
+ cmake_minimum_required(VERSION 3.1)
+ else()
+- cmake_minimum_required(VERSION 2.8)
++ cmake_minimum_required(VERSION 2.8.12)
+ endif(WIN32)
+
+ project(GEDLibrary)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
new file mode 100644
index 000000000000..92683cdfb942
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
@@ -0,0 +1,27 @@
+From f883dc94360af37ce85c8a9215c861fdc0431dee Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Sat, 28 Aug 2021 00:09:09 +0200
+Subject: [PATCH] IGC: CMakeLists: add project
+
+If project is not added, CMake will warn about it:
+No project() command is present. The top-level CMakeLists.txt file
+must contain a literal, direct call to the project() command.
+
+Signed-off-by: Conrad Kostecki
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bfbcf52eca4..5b04555b21f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@
+
+ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
+
++project(IGC)
++
+ add_subdirectory(IGC)
+
+ list(APPEND IGC__IGC_TARGETS "igc_dll")
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch
new file mode 100644
index 000000000000..4a9a8988c5b4
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch
@@ -0,0 +1,37 @@
+From d0f801a178755504c2f8956841823b2aa6a124c4 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Sat, 28 Aug 2021 00:57:59 +0200
+Subject: [PATCH] IGC: CMakeLists: drop git
+
+Dropping git, as we don't have any git release.
+
+Signed-off-by: Conrad Kostecki
+---
+ visa/iga/IGALibrary/CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/visa/iga/IGALibrary/CMakeLists.txt b/visa/iga/IGALibrary/CMakeLists.txt
+index 061476d94..2fd44807c 100644
+--- a/visa/iga/IGALibrary/CMakeLists.txt
++++ b/visa/iga/IGALibrary/CMakeLists.txt
+@@ -14,17 +14,6 @@ set(CMAKE_CXX_STANDARD 14)
+
+ ##############################################
+ # compute the version string from the git repo
+-execute_process(
+- COMMAND git rev-parse --short HEAD
+- OUTPUT_VARIABLE GIT_COMMIT
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+-#
+-execute_process(
+- COMMAND git diff-index --quiet HEAD --
+- RESULT_VARIABLE GIT_DIRTY
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+-
+ set(IGA_VERSION_SUFFIX "")
+ if(GIT_COMMIT)
+ set(IGA_VERSION_DIRTY_TAG "")
+--
+2.33.0
+
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
new file mode 100644
index 000000000000..5f73442c79b4
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="10"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=sys-devel/lld-${LLVM_MAX_SLOT}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+ "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+ "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
+ "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+ "${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
+ "${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
+ # and the way IGC uses this definition causes problems for some users.
+ # See bug #718824 for more information.
+ ! use debug && append-cppflags -DNDEBUG
+
+ local mycmakeargs=(
+ # Those options are ensuring, that we are using
+ # the system LLVM with the correct slot.
+ -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+ -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+ -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+ -DIGC_OPTION__CLANG_MODE="Prebuilds"
+ -DIGC_OPTION__LLD_MODE="Prebuilds"
+ -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+ -DIGC_OPTION__LLVM_MODE="Prebuilds"
+ -DIGC_OPTION__LLVM_PREFERRED_VERSION="${LLVM_MAX_SLOT}"
+
+ # VectorCompiler needs work, as at the moment upstream
+ # only supports building vc-intrinsics in place.
+ -DIGC_BUILD__VC_ENABLED="NO"
+
+ # This will suspress some CMake warnings,
+ # which cannot be fixed at the moment.
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-util/lcov/lcov-1.15.ebuild b/dev-util/lcov/lcov-1.15.ebuild
index 525e22e2a13c..0b0725dbf679 100644
--- a/dev-util/lcov/lcov-1.15.ebuild
+++ b/dev-util/lcov/lcov-1.15.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
fi
inherit optfeature prefix
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index b6a66e33b837..396c3740d594 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
+DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
diff --git a/dev-util/lldb/lldb-13.0.0_rc2.ebuild b/dev-util/lldb/lldb-13.0.0_rc2.ebuild
new file mode 100644
index 000000000000..6b75f2b734ee
--- /dev/null
+++ b/dev-util/lldb/lldb-13.0.0_rc2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ lzma? ( app-arch/xz-utils:= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ !
+Date: Fri, 27 Aug 2021 10:17:14 -0400
+Subject: [PATCH] mcompile: treat load-average as a float
+
+`ninja -l` accepts a double. We should do the same.
+
+Bug: https://bugs.gentoo.org/810655
+---
+ mesonbuild/mcompile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
+index bb7ecae9b..e20485c76 100644
+--- a/mesonbuild/mcompile.py
++++ b/mesonbuild/mcompile.py
+@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None:
+ '-l', '--load-average',
+ action='store',
+ default=0,
+- type=int,
++ type=float,
+ help='The system load average to try to maintain (if supported).'
+ )
+ parser.add_argument(
+--
+2.33.0
+
diff --git a/dev-util/meson/meson-0.58.1.ebuild b/dev-util/meson/meson-0.58.2-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.58.1.ebuild
rename to dev-util/meson/meson-0.58.2-r1.ebuild
index 3056c22a3bd1..0b7b12ebfbb7 100644
--- a/dev-util/meson/meson-0.58.1.ebuild
+++ b/dev-util/meson/meson-0.58.2-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/meson/meson-0.58.2.ebuild b/dev-util/meson/meson-0.58.2.ebuild
deleted file mode 100644
index 3056c22a3bd1..000000000000
--- a/dev-util/meson/meson-0.58.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- 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"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- local disable_unittests=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- -e 's/test_pch_with_address_sanitizer/_&/'
-
- # https://github.com/mesonbuild/meson/issues/7203
- -e 's/test_templates/_&/'
-
- # Broken due to python2 wrapper
- -e 's/test_python_module/_&/'
- )
-
- sed -i "${disable_unittests[@]}" run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- # 'test cases/unit/73 summary' expects 80 columns
- export COLUMNS=80
-
- # If JAVA_HOME is not set, meson looks for javac in PATH.
- # If javac is in /usr/bin, meson assumes /usr/include is a valid
- # JDK include path. Setting JAVA_HOME works around this broken
- # autodection. If no JDK is installed, we should end up with an empty
- # value in JAVA_HOME, and the tests should get skipped.
- export JAVA_HOME=$(java-config -O 2>/dev/null)
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.59.1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.59.1.ebuild
rename to dev-util/meson/meson-0.59.1-r1.ebuild
index e2a175666ca3..5d637ceeeddc 100644
--- a/dev-util/meson/meson-0.59.1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 3d1bc23f8753..d7a6b71d1591 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,2 +1,3 @@
DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2713abca5a0a57b8e52cb662aabe37657c703ab39dbbd990332847ae3d9f31f4855708c17832b801f8ca6a6f12ab12b139711 SHA512 370d02044c61f2394e9a8a9772b30b996074e3b51461387a570aaf1c29488844fe9090d873b2679eb4a472135bac7a9ba5590daf9d79c006de17f709afcb74e1
+DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
diff --git a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
new file mode 100644
index 000000000000..46d065988f56
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/include
+ doins -r "${S}"/CL
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
index d347d42a40a6..8e372ddc4c43 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
@@ -37,7 +37,11 @@ RDEPEND+="
>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
"
BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
"
distutils_enable_tests setup.py
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
index fecb6baf36a3..5cce16c33f18 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
@@ -38,7 +38,11 @@ RDEPEND+="
>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
"
BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
"
distutils_enable_tests setup.py
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 9a255efb0571..5cce16c33f18 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1 optfeature
@@ -37,7 +38,11 @@ RDEPEND+="
>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
"
BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
"
distutils_enable_tests setup.py
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index b6666629264a..9d5989a40686 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,9 +4,9 @@
zmedico@gentoo.org
-
- jakov.smolic@sartura.hr
- Jakov Smolic
+
+ jsmolic@gentoo.org
+ Jakov Smolić
luka.perkov@sartura.hr
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index e807923ac0d7..79d4602d7174 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+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="doc"
# Notes from bug #766090
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
index 4a077b612df6..7baa5961051d 100644
--- a/dev-util/rbtools/rbtools-2.0.1.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.1.ebuild
@@ -45,3 +45,8 @@ src_prepare() {
# Avoid tests requiring unpackaged test data
rm -f rbtools/clients/tests/test_scanning.py || die
}
+
+python_test() {
+ distutils_install_for_testing
+ distutils-r1_python_test
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index c6d45dc28fc7..0ce3fdf45d72 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,2 +1,3 @@
DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
+DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
diff --git a/dev-util/umockdev/umockdev-0.16.2.ebuild b/dev-util/umockdev/umockdev-0.16.2.ebuild
new file mode 100644
index 000000000000..d57690e716cf
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.16.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ net-libs/libpcap[${MULTILIB_USEDEP}]
+ virtual/libudev:=[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+ >=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+ test? (
+ ${PYTHON_DEPS}
+ dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+ )
+"
+BDEPEND="
+ $(vala_depend)
+ app-arch/xz-utils
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ vala_src_prepare
+}
+
+multilib_src_configure() {
+ export VALAC="$(type -P valac-$(vala_best_api_version))"
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test --no-suite fails-valgrind
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 87cee5a9b447..e75fbd345d06 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 58e0bae94eee..c2f1e93dca68 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -220,11 +220,6 @@ fi
HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}"
: ${LICENSE:="GPL-2"}
-# This is the latest KV_PATCH of the deblob tool available from the
-# libre-sources upstream. If you bump this, you MUST regenerate the Manifests
-# for ALL kernel-2 consumer packages where deblob is available.
-: ${DEBLOB_MAX_VERSION:=38}
-
# No need to run scanelf/strip on kernel sources/headers (bug #134453).
RESTRICT="binchecks strip"
@@ -558,10 +553,9 @@ kernel_is() {
local v n=0
for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done
[[ ${n} -eq 1 ]] && detect_version
- unset v n
# Now we can continue
- local operator test value
+ local operator
case ${1#-} in
lt) operator="-lt"; shift;;
@@ -573,9 +567,10 @@ kernel_is() {
esac
[[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters"
- : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
- : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
- [ ${test} ${operator} ${value} ]
+ ver_test \
+ "${KV_MAJOR:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \
+ "${operator}" \
+ "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}"
}
# Capture the sources type and set DEPENDs
@@ -600,11 +595,6 @@ if [[ ${ETYPE} == sources ]]; then
# Bug #266157, deblob for libre support
if [[ -z ${K_PREDEBLOBBED} ]]; then
- # Bug #359865, force a call to detect_version if needed
- kernel_is ge 2 6 27 && \
- [[ -z ${K_DEBLOB_AVAILABLE} ]] && \
- kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
- K_DEBLOB_AVAILABLE=1
# deblob less than 5.10 require python 2.7
if kernel_is lt 5 10; then
K_DEBLOB_AVAILABLE=0
@@ -621,7 +611,6 @@ if [[ ${ETYPE} == sources ]]; then
# tree has been dropped from the kernel.
kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )"
- [[ ${EAPI} == 6 ]] && DEPEND+=" deblob? ( ${PYTHON_DEPS} )" ||
BDEPEND+=" deblob? ( ${PYTHON_DEPS} )"
if [[ -n KV_MINOR ]]; then
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 6da13cc0b2f5..8edd17c317d4 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -395,7 +395,7 @@ kernel_is() {
linux-info_get_any_version
# Now we can continue
- local operator test value
+ local operator
case ${1#-} in
lt) operator="-lt"; shift;;
@@ -407,9 +407,10 @@ kernel_is() {
esac
[[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters"
- : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
- : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
- [ ${test} ${operator} ${value} ]
+ ver_test \
+ "${KV_MAJOR:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \
+ "${operator}" \
+ "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}"
}
get_localversion() {
@@ -457,7 +458,7 @@ get_version_warning_done=
#
# The kernel version variables (KV_MAJOR, KV_MINOR, KV_PATCH, KV_EXTRA and KV_LOCAL) are also set.
#
-# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid
+# The KV_DIR is set using the KERNEL_DIR env var, the KV_OUT_DIR is set using a valid
# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the
# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build).
get_version() {
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 7e47a2e209d5..eda5e9aee013 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -20,12 +20,14 @@
# @ECLASS-VARIABLE: MODULES_OPTIONAL_USE
# @PRE_INHERIT
+# @DEFAULT_UNSET
# @DESCRIPTION:
# A string containing the USE flag to use for making this eclass optional
# The recommended non-empty value is 'modules'
# @ECLASS-VARIABLE: MODULES_OPTIONAL_USE_IUSE_DEFAULT
# @PRE_INHERIT
+# @DEFAULT_UNSET
# @DESCRIPTION:
# A boolean to control the IUSE default state for the MODULES_OPTIONAL_USE USE
# flag. Default value is unset (false). True represented by 1 or 'on', other
@@ -35,21 +37,26 @@
# @DESCRIPTION:
# A string containing the directory of the target kernel sources. The default value is
# "/usr/src/linux"
+: ${KERNEL_DIR:=/usr/src/linux}
# @ECLASS-VARIABLE: ECONF_PARAMS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# It's a string containing the parameters to pass to econf.
# If this is not set, then econf isn't run.
# @ECLASS-VARIABLE: BUILD_PARAMS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# It's a string with the parameters to pass to emake.
# @ECLASS-VARIABLE: BUILD_TARGETS
# @DESCRIPTION:
# It's a string with the build targets to pass to make. The default value is "clean module"
+: ${BUILD_TARGETS:=clean module}
# @ECLASS-VARIABLE: MODULE_NAMES
+# @DEFAULT_UNSET
# @DESCRIPTION:
# It's a string containing the modules to be built automatically using the default
# src_compile/src_install. It will only make ${BUILD_TARGETS} once in any directory.
@@ -94,12 +101,14 @@
# This can be explicitly enabled by setting any of the following variables.
# @ECLASS-VARIABLE: MODULESD__ENABLED
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This is used to disable the modprobe.d file generation otherwise the file will be
# always generated (unless no MODULESD__* variable is provided). Set to "no" to disable
# the generation of the file and the installation of the documentation.
# @ECLASS-VARIABLE: MODULESD__EXAMPLES
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This is a bash array containing a list of examples which should
# be used. If you want us to try and take a guess set this to "guess".
@@ -111,6 +120,7 @@
# where array_component is " options" (see modprobe.conf(5))
# @ECLASS-VARIABLE: MODULESD__ALIASES
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This is a bash array containing a list of associated aliases.
#
@@ -121,17 +131,20 @@
# where array_component is "wildcard " (see modprobe.conf(5))
# @ECLASS-VARIABLE: MODULESD__ADDITIONS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This is a bash array containing a list of additional things to
# add to the bottom of the file. This can be absolutely anything.
# Each entry is a new line.
# @ECLASS-VARIABLE: MODULESD__DOCS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This is a string list which contains the full path to any associated
# documents for . These files are installed in the live tree.
# @ECLASS-VARIABLE: KV_OBJ
+# @INTERNAL
# @DESCRIPTION:
# It's a read-only variable. It contains the extension of the kernel modules.
diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index ba7973d82c44..26967000748c 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -154,7 +154,7 @@ EXPORT_FUNCTIONS pkg_setup
# Example value:
# @CODE
# lua_targets_lua5-1? ( dev-lang/lua:5.1 )
-# lua_targets_lua5-3? ( dev-lang/lua:5.2 )
+# lua_targets_lua5-3? ( dev-lang/lua:5.3 )
# @CODE
# @ECLASS-VARIABLE: LUA_REQUIRED_USE
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 954f776cda2e..3b24f383d7aa 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -231,8 +231,8 @@ _lua_get_library_file() {
# as parameters.
#
# The optional first parameter may specify the requested Lua
-# implementation (either as LUA_TARGETS value, e.g. lua5-2,
-# or an ELUA one, e.g. lua5.2). If no implementation passed,
+# implementation (either as LUA_TARGETS value, e.g. lua5-4,
+# or an ELUA one, e.g. lua5.4). If no implementation passed,
# the current one will be obtained from ${ELUA}.
_lua_export() {
debug-print-function ${FUNCNAME} "${@}"
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index b6c309a3e55f..f1967ae6e015 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -157,7 +157,7 @@ fi
# Example value:
# @CODE
# lua_targets_lua5-1? ( dev-lang/lua:5.1 )
-# lua_targets_lua5-3? ( dev-lang/lua:5.2 )
+# lua_targets_lua5-3? ( dev-lang/lua:5.3 )
# @CODE
# @ECLASS-VARIABLE: LUA_REQUIRED_USE
diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass
index fc1ef5802f93..1ed95f99fa18 100644
--- a/eclass/meson-multilib.eclass
+++ b/eclass/meson-multilib.eclass
@@ -3,10 +3,10 @@
# @ECLASS: meson-multilib.eclass
# @MAINTAINER:
-# Author: Matt Turner
+# Matt Turner
# @AUTHOR:
-# Author: Michał Górny
-# Author: Matt Turner
+# Michał Górny
+# Matt Turner
# @SUPPORTED_EAPIS: 7 8
# @BLURB: meson wrapper for multilib builds
# @DESCRIPTION:
@@ -125,7 +125,7 @@ meson-multilib_src_install() {
}
multilib_src_install() {
- meson_src_install "${_meson_args[@]}"
+ meson_install "${_meson_args[@]}"
}
fi
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 8b22797da718..eaff26709a75 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -47,7 +47,7 @@ inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-_MESON_DEPEND=">=dev-util/meson-0.56.0
+_MESON_DEPEND=">=dev-util/meson-0.57.0
>=dev-util/ninja-1.8.2
dev-util/meson-format-array
"
@@ -404,11 +404,11 @@ meson_src_test() {
"$@" || die "tests failed"
}
-# @FUNCTION: meson_src_install
+# @FUNCTION: meson_install
# @USAGE: [extra meson install arguments]
# @DESCRIPTION:
-# This is the meson_src_install function.
-meson_src_install() {
+# Calls meson install with suitable arguments
+meson_install() {
debug-print-function ${FUNCNAME} "$@"
local mesoninstallargs=(
@@ -420,10 +420,17 @@ meson_src_install() {
set -- meson install "${mesoninstallargs[@]}"
echo "$@" >&2
"$@" || die "install failed"
+}
+
+# @FUNCTION: meson_src_install
+# @USAGE: [extra meson install arguments]
+# @DESCRIPTION:
+# This is the meson_src_install function.
+meson_src_install() {
+ debug-print-function ${FUNCNAME} "$@"
- pushd "${S}" > /dev/null || die
+ meson_install "$@"
einstalldocs
- popd > /dev/null || die
}
fi
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 2b4ae8880705..1419b5e164e9 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
index eafa95067079..94d4f0f6acfe 100644
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools desktop
-MY_P=${PN//-/_}-${PV}
+MY_P="${PN//-/_}-${PV}"
DESCRIPTION="Snipe terrorists from your orbital base"
-HOMEPAGE="http://icculus.org/oes/"
-SRC_URI="http://filesingularity.timedoctor.org/${MY_P}.tar.gz"
+HOMEPAGE="https://icculus.org/oes/"
+SRC_URI="https://icculus.org/oes/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="media-libs/libsdl[joystick,video]
+DEPEND="
+ media-libs/libsdl[joystick,video]
media-libs/sdl-image[png]
media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+DOCS=( AUTHORS ChangeLog readme.txt README TODO )
PATCHES=(
"${FILESDIR}"/${P}-datadir.patch
"${FILESDIR}"/${P}-gcc43.patch
)
+
src_prepare() {
default
@@ -36,7 +38,6 @@ src_prepare() {
}
src_install() {
- DOCS="AUTHORS ChangeLog readme.txt README TODO" \
- default
- make_desktop_entry snipe2d "Orbital Eunuchs Sniper"
+ default
+ make_desktop_entry snipe2d "Orbital Eunuchs Sniper" applications-games
}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 4564569bb2ba..f796b8a61d04 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 9e23433799f4..110a3b08ce58 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -3,5 +3,4 @@ DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab
DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2
DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314
-DIST pysol-music-4.50.tar.xz 2144764 BLAKE2B ce6203441efa4525633b22b289be1d20aaa3107baf2127f96a46df19ba43d4ddbe62ccb6e68488d9845de91678aed0b87d93524b97615def63940b738a32d005 SHA512 ef281db180d28ccdeada3124d8a2451011fceedacd7cde8bb29305953438081839cb9ec48f51cb44f2bebf7828e940d79993fd026844983cf270ba1d7c839a85
DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
diff --git a/games-board/pysolfc/pysolfc-2.12.0.ebuild b/games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
similarity index 84%
rename from games-board/pysolfc/pysolfc-2.12.0.ebuild
rename to games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
index c234eda859ad..62b6a5112a1e 100644
--- a/games-board/pysolfc/pysolfc-2.12.0.ebuild
+++ b/games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
@@ -19,8 +19,7 @@ DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
HOMEPAGE="https://pysolfc.sourceforge.io/"
SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
- !extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )
- sound? ( mirror://sourceforge/pysolfc/${PS_MUSIC_P}.tar.xz )"
+ !extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+ GPL-2+"
@@ -39,10 +38,7 @@ RDEPEND="
dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}]
dev-tcltk/tktable
)
- sound? (
- dev-python/pygame[${PYTHON_USEDEP}]
- media-libs/sdl2-mixer[mod]
- )
+ sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
')"
distutils_enable_tests unittest
@@ -56,11 +52,6 @@ python_install_all() {
insinto /usr/share/${MY_PN}
doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
- if use sound; then
- insinto /usr/share/${MY_PN}/music
- doins ../${PS_MUSIC_P}/data/music/*.{it,mod,s3m}
- fi
-
# html files are used at runtime, keep at default location
dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index cf9de0443445..0e8a23c016a8 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index ebdefbfb3fc0..0ef607994d30 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142 SHA512 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6 SHA512 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
+DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff SHA512 fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
new file mode 100644
index 000000000000..5815a612b2b1
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ debug? ( sys-libs/ncurses:0= )
+ fluidsynth? (
+ media-sound/fluid-soundfont
+ media-sound/fluidsynth
+ )
+ mt-32? ( media-libs/munt-mt32emu )
+ network? ( media-libs/sdl2-net )
+ opengl? ( virtual/opengl )
+ media-libs/libpng:0=
+ media-libs/libsdl2[joystick,opengl?,video,X]
+ media-libs/opusfile
+ sys-libs/zlib
+ !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+ default
+
+ # We do not have default.sf2, use actual name from fluid-soundfont
+ sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+ -i src/midi/midi_fluidsynth.cpp || die
+
+ # Disable license and docs install (handled by ebuild)
+ sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use alsa use_alsa)
+ $(meson_use debug)
+ -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+ $(meson_use fluidsynth use_fluidsynth)
+ $(meson_use mt-32 use_mt32emu)
+ $(meson_use network use_sdl2_net)
+ $(meson_use opengl use_opengl)
+ )
+ meson_src_configure
+}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ef9eaa6748dc..22d3da241453 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild
similarity index 57%
rename from games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
rename to games-puzzle/xbomb/xbomb-2.2b-r3.ebuild
index d43f0aec54a7..ac1174f80e21 100644
--- a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop toolchain-funcs
@@ -13,10 +13,15 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-DEPEND="x11-libs/libXaw"
+DEPEND="
+ acct-group/gamestat
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXt
+"
RDEPEND="
${DEPEND}
- acct-group/gamestat
+ media-fonts/font-misc-misc
"
PATCHES=(
@@ -27,28 +32,25 @@ PATCHES=(
src_prepare() {
default
+ sed -i -e '/strip/d' Makefile || die
sed -i \
- -e '/strip/d' \
- -e '/^CC=/d' \
- -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
- Makefile || die
- sed -i \
- -e "s:/var/tmp:/var/lib/${PN}:g" \
+ -e "s:/var/tmp:${EPREFIX}/var/games/${PN}:g" \
hiscore.c || die
}
-src_configure() {
- tc-export CC
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
- default
+ emake DESTDIR="${ED}" install
+ einstalldocs
- dodir /var/lib/${PN}
- touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
- fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
+ dodir /var/games/${PN}
+ touch "${ED}"/var/games/${PN}/${PN}{3,4,6}.hi || die "touch failed"
- fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
+ fowners :gamestat /var/games/${PN}{,/${PN}{3,4,6}.hi} /usr/bin/${PN}
+ fperms 660 /var/games/${PN}/${PN}{3,4,6}.hi
fperms g+s /usr/bin/${PN}
make_desktop_entry xbomb XBomb
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 5bbf9162feca..84be0682d102 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/files/fixed-font-path.patch b/games-roguelike/stone-soup/files/fixed-font-path.patch
deleted file mode 100644
index 5f6bd651bec8..000000000000
--- a/games-roguelike/stone-soup/files/fixed-font-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile 2020-12-11 23:37:30.506956304 -0600
-+++ b/Makefile 2020-12-11 23:40:02.925609235 -0600
-@@ -932,7 +932,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
- endif
- else
-- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -952,7 +952,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
- endif
- else
-- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
diff --git a/games-roguelike/stone-soup/files/gitless-1.patch b/games-roguelike/stone-soup/files/gitless-1.patch
deleted file mode 100644
index a7118dc13fce..000000000000
--- a/games-roguelike/stone-soup/files/gitless-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /Makefile 2020-06-18 17:49:19.339016246 -0500
-+++ /Makefile 2020-06-18 17:55:11.200700094 -0500
-@@ -1181,9 +1181,8 @@
-
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE := stone_soup
--SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
-
- export SRC_VERSION
diff --git a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
deleted file mode 100644
index a2948b23619c..000000000000
--- a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
-
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
- endif
-
- CFLAGS += $(PNG_INCLUDE)
-- LDFLAGS += $(PNG_LIB)
-+ LIBS += $(PNG_LIB)
-
- CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
-
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-
- $(TILEGEN): $(OBJECTS)
-- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
-
- .PHONY: all clean distclean
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
index 94bf17e4928a..6307e21c5b2a 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -82,6 +82,8 @@ PATCHES=(
pkg_setup() {
use editor && setup-wxwidgets
+
+ python-any-r1_pkg_setup
}
src_prepare() {
diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
similarity index 77%
rename from games-strategy/0ad/0ad-0.0.25_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index c4b1cf74eb71..567e01b8b03c 100644
--- a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -1,13 +1,18 @@
# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{7..9} )
inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-if [[ ${PV} == 9999 ]]; then
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+# Upstream signs releases (and only them) with app-crypt/minisign.
+# The (public) key can be found on https://play0ad.com/download/source.
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/0ad/0ad"
S="${WORKDIR}/${P}"
@@ -16,31 +21,34 @@ elif [[ ${PV} == *_pre* ]]; then
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
else
+ # Trailing whitespace for IUSE append below
+ IUSE="verify-sig "
+ MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
MY_P="0ad-${PV/_/-}"
SRC_URI="
http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+ verify-sig? (
+ http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
+ http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
+ )
"
S="${WORKDIR}/${MY_P}"
fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
+IUSE+="editor +lobby nvtt pch test"
+
RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
-CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
+CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
+CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
+
# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
# build and/or startup issues.
QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-# virtual/rust is for bundled SpiderMonkey
+# virtual/rust is for bundled SpiderMonkey.
# Build-time Python dependency is for SM, too.
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
BDEPEND="
${PYTHON_DEPS}
>=dev-util/premake-5.0.0_alpha12:5
@@ -48,7 +56,13 @@ BDEPEND="
virtual/rust
test? ( dev-lang/perl )
"
-# Removed dependency on nvtt as we use the bundled one
+# Upstream uses minisign which is not supported by verify-sign, bug #783066.
+# Signatures are only provided for releases.
+if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
+ BDEPEND+=" app-crypt/minisign"
+fi
+
+# Removed dependency on nvtt as we use the bundled one.
# bug #768930
DEPEND="
dev-libs/boost:=
@@ -80,6 +94,32 @@ PATCHES=(
pkg_setup() {
use editor && setup-wxwidgets
+
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
+ if use verify-sig; then
+ elog "Verifying both signatures using app-crypt/minisign."
+ minisign -V \
+ -P "${MINISIGN_KEY}" \
+ -x "${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
+ -m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
+ || die "Failed to verify engine distfile using minisign!"
+ minisign -V \
+ -P "${MINISIGN_KEY}" \
+ -x "${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \
+ -m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \
+ || die "Failed to verify data distfile using minisign!"
+ fi
+ # Unpack manually until an eclass supports minisign and unpacks
+ # if signatures match.
+ default
+ else
+ # Unpack distfiles without checking as this is no official release.
+ default
+ fi
}
src_prepare() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 466a2877ccf1..923eae80585e 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,4 +1,6 @@
DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
-DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730
-DIST 0ad-0.0.25-alpha-unix-data.tar.xz 1272283892 BLAKE2B 7bc08e52b44129fce6a78914d36bcb0c8bb3312645982054274e230a23edc34f9aa899d7ca8f52f3044b8c7efd0aea4b5d16fcd9d6e20e274538007885cfa1c2 SHA512 92fad341ceb1156a3facea291856ca2f719691bba1cf085de0544f3ae9300f46391efdd1c88bcf1aafd9a9c938b6bef3babbd50c850dc17fb0c9609dbabe37ad
+DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
+DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2
+DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1
+DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 803c1b1ebbfa..cdb1412da3a8 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 626ea09bfea9..a9506084fd73 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gdm/gdm-40.1.ebuild b/gnome-base/gdm/gdm-40.1.ebuild
index e02c54415f23..5112360b459b 100644
--- a/gnome-base/gdm/gdm-40.1.ebuild
+++ b/gnome-base/gdm/gdm-40.1.ebuild
@@ -23,7 +23,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth
RESTRICT="!test? ( test )"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
# dconf, dbus and g-s-d are needed at install time for dconf update
# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
index e0b9654b2502..61e996591618 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
flickr? ( gnome-online-accounts )
^^ ( elogind systemd )
" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
# meson.build depends on python unconditionally
BDEPEND="${PYTHON_DEPS}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
index 7548e8e2fc7f..e4a65565e587 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
# Note to developers:
# This is a wrapper for the core libraries used by GNOME
diff --git a/gnome-base/gnome-light/gnome-light-40.0.ebuild b/gnome-base/gnome-light/gnome-light-40.0.ebuild
index 80b1472485d0..ea16fff20336 100644
--- a/gnome-base/gnome-light/gnome-light-40.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-40.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="metapackage"
SLOT="2.0"
IUSE="cups +gnome-shell"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86"
# XXX: Note to developers:
# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
index 8f1bda21c005..996b1fdfbbb0 100644
--- a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc elogind systemd"
# There is a null backend available, thus ?? not ^^
REQUIRED_USE="?? ( elogind systemd )"
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
index 9734313d2ef0..199826b093c4 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
input_devices_wacom? ( udev )
wayland? ( udev )
"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
DEPEND="
>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild b/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
index 008ace54f8a8..5ac55b087d17 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
# libXfixes-5.0 needed for pointer barriers and #include
# FIXME:
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index 60fc234ea5aa..2915ac7e9125 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org"
LICENSE="LGPL-2+"
SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection test"
RESTRICT="!test? ( test )"
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-40.2.ebuild
index 2bcff26c1aaf..60b6475d5030 100644
--- a/gnome-base/nautilus/nautilus-40.2.ebuild
+++ b/gnome-base/nautilus/nautilus-40.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
>=dev-libs/glib-2.67.1:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 428d443f5dd8..da0a50f4e9b9 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index 5c22cb7452b6..ab7b1ca0cde6 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1 +1,2 @@
+DIST eiciel-0.9.13.1.tar.bz2 708191 BLAKE2B f80faf2f529db99fe60c78d60f854e8d92cc3fc3f1044517b5282a09175d80b695bfaee13b8f58fbfb2b7e1eff8a702f552231d75970ceedb3da813a8a95cea1 SHA512 91a79be7585a21addf47b23df7d03d6a44bdf541f52026b3124d6434e4fa379b9a1cd55eb9f164dba843c1fa73b669cca5d2a34d44b6c325dd0bdbaa701c7c9d
DIST eiciel-0.9.13.tar.bz2 707838 BLAKE2B 30702b20482984885dfdb222e631f7572f3199b93509baa48762c0925b1fd78e1601a1279e7454543ddc32e813288cd01f0fdc2cb0c2eb0c5812cefcf8cac29f SHA512 7b5fde27e2d28c69f02092896bb0065372f93319d8ff8ad285b8b0e52acbe6d43b96f7dc215d7210602c6f766b48d2e2c66361dd28ea0f567ed6faf3bbcfdd14
diff --git a/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild b/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
new file mode 100644
index 000000000000..5ea9779a81fb
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
+HOMEPAGE="https://rofi.roger-ferrer.org/eiciel/"
+SRC_URI="https://rofi.roger-ferrer.org/eiciel/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus xattr"
+
+DEPEND="
+ >=sys-apps/acl-2.2.32
+ dev-cpp/gtkmm:3.0
+ >=dev-cpp/glibmm-2.50:2
+ nautilus? ( >=gnome-base/nautilus-3 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.18.1
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --with-gnome-version=3 \
+ $(use_enable nautilus nautilus-extension) \
+ $(use_enable xattr user-attributes)
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
index a3cd86ee1363..e8bbad978bfd 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
@@ -16,7 +16,7 @@ SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
index acc40a80d796..272e56b1952c 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
index a0bd59db3a78..4f9401e1774a 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Mousetweaks"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
index 1e2838aca035..06440230a7f5 100644
--- a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/sushi/sushi-3.38.1.ebuild b/gnome-extra/sushi/sushi-3.38.1.ebuild
index 7e87e591fc9c..e8530d38474a 100644
--- a/gnome-extra/sushi/sushi-3.38.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.38.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
IUSE="office wayland +X"
REQUIRED_USE="|| ( wayland X )"
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 3d035f7fa626..77bb951dc867 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug libnotify webkit"
# TODO: X11 dependency is automagically enabled
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 602fade020b7..f067bae1ce4e 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 7d291953db2c..bd6fcd30889a 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1 +1,2 @@
DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
+DIST gtk-4.4.0.tar.xz 30008844 BLAKE2B 5fa6e8236772847961e09f282efed5386017e6ea7d0c78f310c90c93cc42b1c27fbc6c1a93f624b38365ecca8d6632af9b191ba2a3a4bcd8aa07907e842c85c9 SHA512 de0b6508df3fa4523a7e54cf417ac31292c833346409ff89fd4daf886edad16ffe60b6ed77a85451bd36b96098c8437d56c6fd42daca33c52db8dc57a25753b6
diff --git a/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch
new file mode 100644
index 000000000000..1292e85cefa1
--- /dev/null
+++ b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch
@@ -0,0 +1,29 @@
+From 552a4b2c82f41c1dbba410b825673cf67d089b68 Mon Sep 17 00:00:00 2001
+From: Kalev Lember
+Date: Mon, 23 Aug 2021 15:38:46 +0200
+Subject: [PATCH] build: Fix detection for pre-compiled css files
+
+The default theme changed from Adwaita to Default and this tripped up
+the logic to detect if the tarball builds contain pre-built css files or
+not. Fix this by looking at pre-compiled css files in themes/Default/
+instead of themes/Adwaita/.
+---
+ gtk/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/meson.build b/gtk/meson.build
+index fa66764c50..bfb5105fe5 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -842,7 +842,7 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml',
+
+ theme_deps = []
+ # For git checkouts, but not for tarballs...
+-if not fs.exists('theme/Adwaita/Adwaita.css')
++if not fs.exists('theme/Default/Default-light.css')
+ # ... build the theme files
+ sassc = find_program('sassc', required: false)
+ if not sassc.found()
+--
+2.31.1
+
diff --git a/gui-libs/gtk/gtk-4.4.0.ebuild b/gui-libs/gtk/gtk-4.4.0.ebuild
new file mode 100644
index 000000000000..f0a65fdf2fe6
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.4.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ gtk-doc? ( introspection )
+ test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/fribidi-0.19.7
+ >=dev-libs/glib-2.66.0:2
+ >=media-libs/graphene-1.9.1[introspection?]
+ >=media-libs/libepoxy-1.4[X(+)?]
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+ >=x11-libs/pango-1.47.0[introspection?]
+ >=media-libs/harfbuzz-2.1.0:=
+ x11-misc/shared-mime-info
+
+ colord? ( >=x11-misc/colord-0.1.9:0= )
+ cups? ( >=net-print/cups-2.0 )
+ ffmpeg? ( media-video/ffmpeg )
+ gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+ vulkan? ( media-libs/vulkan-loader:= )
+ wayland? (
+ >=dev-libs/wayland-1.16.91
+ >=dev-libs/wayland-protocols-1.21
+ media-libs/mesa[wayland]
+ >=x11-libs/libxkbcommon-0.2
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3
+ media-libs/fontconfig
+ media-libs/mesa[X(+)]
+ x11-libs/libX11
+ >=x11-libs/libXi-1.3
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.5
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+ X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg
+ >=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xsl-stylesheets
+ dev-libs/gobject-introspection-common
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.48
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+ gtk-doc? (
+ app-text/docbook-xml-dtd:4.3
+ dev-util/gi-docgen
+ )
+ test? (
+ dev-libs/glib:2
+ wayland? ( dev-libs/weston[headless] )
+
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-build-Fix-detection-for-pre-compiled-css-files.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ # GDK backends
+ $(meson_use X x11-backend)
+ $(meson_use wayland wayland-backend)
+ $(meson_use broadway broadway-backend)
+ -Dwin32-backend=false
+ $(meson_use aqua macos-backend)
+
+ # Media backends
+ $(meson_feature ffmpeg media-ffmpeg)
+ $(meson_feature gstreamer media-gstreamer)
+
+ # Print backends
+ $(meson_feature cups print-cups)
+
+ # Optional dependencies
+ $(meson_feature vulkan)
+ -Dcloudproviders=disabled # cloudprovider is not packaged in Gentoo yet
+ $(meson_feature sysprof)
+ -Dtracker=disabled # tracker3 is not packaged in Gentoo yet
+ $(meson_feature colord)
+ # Expected to fail with GCC < 11
+ # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+ $(meson_feature cpu_flags_x86_f16c f16c)
+
+ # Documentation and introspection
+ $(meson_use gtk-doc gtk_doc)
+ -Dman-pages=true
+ $(meson_feature introspection)
+
+ # Demos and binaries
+ $(meson_use examples build-examples)
+ $(meson_use examples demos)
+ $(meson_use test build-tests)
+ -Dinstall-tests=false
+ )
+ meson_src_configure
+}
+
+src_test() {
+ "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ if use X; then
+ einfo "Running tests under X"
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+ fi
+
+ if use wayland; then
+ einfo "Running tests under Weston"
+
+ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+ weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+ compositor=$!
+ export WAYLAND_DISPLAY=wayland-5
+
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+ exit_code=$?
+ kill ${compositor}
+ fi
+}
+
+src_install() {
+ meson_src_install
+
+ if use gtk-doc ; then
+ mkdir "${ED}"/usr/share/doc/${PF}/html || die
+
+ local docdirs=( gdk4 gsk4 gtk4 )
+ use wayland && docdirs+=( gdk4-wayland )
+ use X && docdirs+=( gdk4-x11 )
+
+ local d
+ for d in "${docdirs[@]}"; do
+ mv "${ED}"/usr/share/doc/{${d},${PF}/html/} || die
+ done
+ fi
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/gui-libs/libhandy/libhandy-1.2.3.ebuild b/gui-libs/libhandy/libhandy-1.2.3.ebuild
index 4caad0a11e8b..d3a9d885a019 100644
--- a/gui-libs/libhandy/libhandy-1.2.3.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
LICENSE="LGPL-2.1+"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
IUSE="examples glade gtk-doc +introspection test +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b2a66dcb9132..b3fce291a658 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
new file mode 100644
index 000000000000..d02846ace5aa
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
@@ -0,0 +1,53 @@
+From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir
+Date: Sun, 22 Aug 2021 20:02:52 +0200
+Subject: [PATCH] Only emit empty() in SessionFinished() when in
+ TabbedNavigation mode
+
+empty() is emitted so that MainWindow calls close() and we get rid of the
+colours-flashing bug when closing the last session/tab in a window, see
+commit bbec72250d080. However all that isn't relevant when we are in
+konsole Part mode, where there are no tabs or MainWindows.
+
+This fixes a crash in Dolphin when closing its window while the embedded
+Konsole Part is open. The crash would happen as calling
+ViewContainer::currentTabViewCount() would end up in the ViewSplitter code
+path, which is no-op in Konsole Part.
+
+To test:
+- Open dolphin, make sure the terminal panel isn't open to begin with
+- open the terminal panel
+- close the dolphin window while the terminal panel is open
+
+BUG: 441206
+FIXED-IN: 21.08.1
+---
+ src/ViewManager.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 92d2951fc..2ba77e9f0 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -494,11 +494,13 @@ void ViewManager::sessionFinished()
+ return;
+ }
+
+- // The last session/tab, and only one view (no splits), emit empty()
+- // so that close() is called in MainWindow, fixes #432077
+- if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
+- Q_EMIT empty();
+- return;
++ if (_navigationMethod == TabbedNavigation) {
++ // The last session/tab, and only one view (no splits), emit empty()
++ // so that close() is called in MainWindow, fixes #432077
++ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
++ Q_EMIT empty();
++ return;
++ }
+ }
+
+ auto *session = qobject_cast(sender());
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.04.3-r2.ebuild b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.04.3-r2.ebuild
rename to kde-apps/konsole/konsole-21.04.3-r3.ebuild
index c95192f968c4..8ebbdcdf1dd7 100644
--- a/kde-apps/konsole/konsole-21.04.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+ "${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
)
src_prepare() {
diff --git a/kde-apps/konsole/konsole-21.08.0-r4.ebuild b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.08.0-r4.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r5.ebuild
index d4600f096a87..22a1835a1ffc 100644
--- a/kde-apps/konsole/konsole-21.08.0-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 808510
+ "${FILESDIR}/${PN}-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 7b53a817adec..f80705df4176 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch
new file mode 100644
index 000000000000..056a2e8b1e5b
--- /dev/null
+++ b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch
@@ -0,0 +1,91 @@
+From 6e41104426a3ae59bcb90be708abcc3092155436 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr
+Date: Tue, 24 Aug 2021 21:06:47 +0200
+Subject: [PATCH] Fix automatic currency file sync after 24h
+
+Conversion plugin in Krunner depends on automatic refresh of currency
+table. std::call_once does not work there, because process is never
+stopped.
+
+BUG: 441337
+---
+ autotests/convertertest.cpp | 16 ++++++++++++++++
+ autotests/convertertest.h | 6 ++++++
+ src/currency.cpp | 9 ++++++---
+ 3 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/autotests/convertertest.cpp b/autotests/convertertest.cpp
+index aa0ccae..e36b7fe 100644
+--- a/autotests/convertertest.cpp
++++ b/autotests/convertertest.cpp
+@@ -8,9 +8,11 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ using namespace KUnitConversion;
++using namespace std::chrono_literals;
+
+ void ConverterTest::initTestCase()
+ {
+@@ -113,4 +115,18 @@ void ConverterTest::testCurrency()
+ qDeleteAll(threads);
+ }
+
++void ConverterTest::testCurrencyConversionTableUpdate()
++{
++ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
++
++ // Missing conversion table must lead to update of table
++ // note that this is the same code path as for last modified updates
++ QFile::remove(cache);
++ QVERIFY(Currency::lastConversionTableUpdate().isNull());
++ Converter c;
++ Value input = Value(1000, Eur);
++ Value v = c.convert(input, QStringLiteral("$"));
++ QVERIFY(!Currency::lastConversionTableUpdate().isNull());
++}
++
+ QTEST_MAIN(ConverterTest)
+diff --git a/autotests/convertertest.h b/autotests/convertertest.h
+index 21d5213..d3d6303 100644
+--- a/autotests/convertertest.h
++++ b/autotests/convertertest.h
+@@ -23,6 +23,12 @@ private Q_SLOTS:
+ void testConvert();
+ void testInvalid();
+ void testCurrency();
++ /**
++ * Checks that conversion tables are updated after timeout
++ *
++ * Regression test for https://bugs.kde.org/show_bug.cgi?id=441337
++ */
++ void testCurrencyConversionTableUpdate();
+ };
+
+ #endif // CONVERTERTEST_H
+diff --git a/src/currency.cpp b/src/currency.cpp
+index 038e928..ead7ce5 100644
+--- a/src/currency.cpp
++++ b/src/currency.cpp
+@@ -745,9 +745,12 @@ void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSki
+ Value CurrencyCategoryPrivate::convert(const Value &value, const Unit &to)
+ {
+ // TODO KF6 remove this blocking call and change behavior that explicit call to syncConversionTable is mandatory before
+- // right now, if a sync is performed at application start, then this call will not block anymore for 24 hours
+- static std::once_flag updateFlag;
+- std::call_once(updateFlag, &CurrencyCategoryPrivate::syncConversionTable, this, 24h);
++ // first access to converted data, also to make syncs more explicit
++ static QMutex updateFlag;
++ {
++ QMutexLocker locker(&updateFlag);
++ CurrencyCategoryPrivate::syncConversionTable(24h);
++ }
+
+ Value v = UnitCategoryPrivate::convert(value, to);
+ return v;
+--
+GitLab
+
diff --git a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch
new file mode 100644
index 000000000000..01ee8a6fa575
--- /dev/null
+++ b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch
@@ -0,0 +1,235 @@
+From 2a57f9d1c6b2f8d9e2babcdaca66f1cf2a3c5849 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr
+Date: Sat, 28 Aug 2021 11:42:06 +0200
+Subject: [PATCH] Fix initialization of currency values
+
+If there is already a recent currency.xml file provided then use this to
+initialize the currency converter.
+
+BUG: 441337
+---
+ autotests/CMakeLists.txt | 8 ++++
+ autotests/currencytableinittest.cpp | 33 +++++++++++++++
+ autotests/currencytableinittest.h | 26 ++++++++++++
+ autotests/currencytableinittest/currency.xml | 43 ++++++++++++++++++++
+ autotests/currencytableinittest/data.qrc | 5 +++
+ autotests/valuetest.cpp | 6 +++
+ src/currency.cpp | 10 +++--
+ 7 files changed, 128 insertions(+), 3 deletions(-)
+ create mode 100644 autotests/currencytableinittest.cpp
+ create mode 100644 autotests/currencytableinittest.h
+ create mode 100644 autotests/currencytableinittest/currency.xml
+ create mode 100644 autotests/currencytableinittest/data.qrc
+
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index ec457a5..8225bf2 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -8,3 +8,11 @@ ecm_add_tests(
+ convertertest.cpp
+ LINK_LIBRARIES KF5::UnitConversion KF5::I18n Qt5::Test
+ )
++
++qt5_add_resources(CURRENCY_TEST_RESOURCES currencytableinittest/data.qrc)
++ecm_add_test(
++ currencytableinittest.cpp
++ ${CURRENCY_TEST_RESOURCES}
++ TEST_NAME currencytableinittest
++ LINK_LIBRARIES KF5::UnitConversion KF5::I18n Qt5::Test
++)
+diff --git a/autotests/currencytableinittest.cpp b/autotests/currencytableinittest.cpp
+new file mode 100644
+index 0000000..c83709a
+--- /dev/null
++++ b/autotests/currencytableinittest.cpp
+@@ -0,0 +1,33 @@
++/*
++ * SPDX-FileCopyrightText: 2021 Andreas Cord-Landwehr
++ *
++ * SPDX-License-Identifier: LGPL-2.0-or-later
++ */
++
++#include "currencytableinittest.h"
++#include
++#include
++
++using namespace KUnitConversion;
++
++void CurrencyTableInitTest::testCategoryInit()
++{
++ QStandardPaths::setTestModeEnabled(true);
++ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
++
++ QVERIFY(QFile::exists(QLatin1String(":/currency.xml")));
++ if (QFile::exists(cache)) {
++ QFile::remove(cache);
++ }
++ // note: copy of file updates the file's modified timestamp and thus file is seen as recently downloaded file
++ QVERIFY(QFile::copy(QLatin1String(":/currency.xml"), cache));
++
++ Converter c;
++ Value input = Value(1000, Eur);
++ Value v = c.convert(input, QStringLiteral("$"));
++ qDebug() << "converted value to:" << v.number();
++ QVERIFY(v.isValid());
++ QVERIFY(!std::isnan(v.number()));
++}
++
++QTEST_MAIN(CurrencyTableInitTest)
+diff --git a/autotests/currencytableinittest.h b/autotests/currencytableinittest.h
+new file mode 100644
+index 0000000..0b835d0
+--- /dev/null
++++ b/autotests/currencytableinittest.h
+@@ -0,0 +1,26 @@
++/*
++ * SPDX-FileCopyrightText: 2021 Andreas Cord-Landwehr
++ *
++ * SPDX-License-Identifier: LGPL-2.0-or-later
++ */
++
++#ifndef CURRENCYTABLEINIT_TEST_H
++#define CURRENCYTABLEINIT_TEST_H
++
++#include
++#include
++#include
++
++using namespace KUnitConversion;
++
++class CurrencyTableInitTest : public QObject
++{
++ Q_OBJECT
++private Q_SLOTS:
++ /**
++ * Check that the currency converter is correctly initialized when currency.xml is recent and available
++ */
++ void testCategoryInit();
++};
++
++#endif
+diff --git a/autotests/currencytableinittest/currency.xml b/autotests/currencytableinittest/currency.xml
+new file mode 100644
+index 0000000..dca42d5
+--- /dev/null
++++ b/autotests/currencytableinittest/currency.xml
+@@ -0,0 +1,43 @@
++
++
++ Reference rates
++
++ European Central Bank
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+\ No newline at end of file
+diff --git a/autotests/currencytableinittest/data.qrc b/autotests/currencytableinittest/data.qrc
+new file mode 100644
+index 0000000..19f9d69
+--- /dev/null
++++ b/autotests/currencytableinittest/data.qrc
+@@ -0,0 +1,5 @@
++
++
++ currency.xml
++
++
+diff --git a/autotests/valuetest.cpp b/autotests/valuetest.cpp
+index 0b348d7..53be1b7 100644
+--- a/autotests/valuetest.cpp
++++ b/autotests/valuetest.cpp
+@@ -55,6 +55,12 @@ void ValueTest::testInvalid()
+
+ void ValueTest::testCurrencyNotDownloaded()
+ {
++ // ensure that no local conversion table is available
++ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
++ if (!QFile::exists(cache)) {
++ QFile::remove(cache);
++ }
++
+ auto pounds = Value(100, Gbp);
+ auto eur = pounds.convertTo(Eur);
+ QVERIFY(!eur.isValid());
+diff --git a/src/currency.cpp b/src/currency.cpp
+index ead7ce5..43161e2 100644
+--- a/src/currency.cpp
++++ b/src/currency.cpp
+@@ -47,6 +47,7 @@ public:
+ Value convert(const Value &value, const Unit &toUnit) override;
+ bool hasOnlineConversionTable() const override;
+ void syncConversionTable(std::chrono::seconds updateSkipSeconds) override;
++ bool m_initialized{false}; //!< indicates if units are prepared from currency table
+ };
+
+ bool CurrencyCategoryPrivate::hasOnlineConversionTable() const
+@@ -668,12 +669,12 @@ QDateTime Currency::lastConversionTableUpdate()
+ void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSkipPeriod)
+ {
+ // sync call is expected to be guarded as being called only once
+- auto updateCurrencyConversionTable = [this](const QString &cachePath) {
++ auto updateCurrencyConversionTable = [this](const QString &cachePath, bool performNetworkSync) {
+ qCDebug(LOG_KUNITCONVERSION) << "currency conversion table sync started";
+ static QMutex mutex;
+ QMutexLocker locker(&mutex);
+ bool updateError{false};
+- if (isConnected()) {
++ if (performNetworkSync && isConnected()) {
+ // Bug 345750: QNetworkReply does not work without an event loop and doesn't implement waitForReadyRead()
+ QEventLoop loop;
+ QNetworkAccessManager manager;
+@@ -733,12 +734,15 @@ void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSki
+ }
+ }
+ }
++ m_initialized = !updateError;
+ return !updateError;
+ };
+
+ QFileInfo info(cacheLocation());
+ if (!info.exists() || info.lastModified().secsTo(QDateTime::currentDateTime()) > updateSkipPeriod.count()) {
+- updateCurrencyConversionTable(cacheLocation());
++ updateCurrencyConversionTable(cacheLocation(), true);
++ } else if (!m_initialized) {
++ updateCurrencyConversionTable(cacheLocation(), false);
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
new file mode 100644
index 000000000000..1a8a5753d916
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( # KDE-bug 441337
+ "${FILESDIR}"/${P}-fix-24h-currency-sync.patch
+ "${FILESDIR}"/${P}-fix-currency-values-init.patch
+)
+
+src_test() {
+ # bug 623938 - needs internet connection
+ local myctestargs=(
+ -E "(convertertest)"
+ )
+
+ LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index cf2f3fe51343..4130b23ba079 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kwin/kwin-5.22.4-r1.ebuild b/kde-plasma/kwin/kwin-5.22.4-r3.ebuild
similarity index 99%
rename from kde-plasma/kwin/kwin-5.22.4-r1.ebuild
rename to kde-plasma/kwin/kwin-5.22.4-r3.ebuild
index 7e29327b54a2..90cf72f9d9ec 100644
--- a/kde-plasma/kwin/kwin-5.22.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.4-r3.ebuild
@@ -79,6 +79,7 @@ COMMON_DEPEND="
"
# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
RDEPEND="${COMMON_DEPEND}
+ =dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 24edd1220217..40ea276d7f4e 100644
Binary files a/lxde-base/Manifest.gz and b/lxde-base/Manifest.gz differ
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index c2e5d6be8cbd..a09eebe268f8 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86"
IUSE="debug elogind nls pam systemd"
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..0e23294b03a1
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools strip-linguas systemd
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXDM"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug elogind nls pam systemd"
+
+# Although cairo, gdk-pixbuf, and pango are not directly checked and often forced by gtk+
+# They are directly referenced in the C code of the greeter and config util
+DEPEND="
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ x11-libs/libX11
+ x11-libs/libxcb:0=
+ virtual/libcrypt:0=
+ pam? ( sys-libs/pam )"
+# We only use the pam modules and not actually link to the code
+RDEPEND="${DEPEND}
+ elogind? ( sys-auth/elogind[pam] )
+ systemd? ( sys-apps/systemd[pam] )
+"
+BDEPEND="
+ app-text/iso-codes
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+DOCS=( AUTHORS README TODO )
+
+REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
+
+src_prepare() {
+ # Upstream bug, tarball contains pre-made lxdm.conf
+ rm "${S}"/data/lxdm.conf || die
+
+ # Fix consolekit and selinux
+ eapply "${FILESDIR}/${P}-pam.patch"
+ # Apply all upstream fixes in git until 2016-11-11
+ eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
+ eapply_user
+
+ # this replaces the bootstrap/autogen script in most packages
+ eautoreconf
+
+ # process LINGUAS
+ if use nls; then
+ einfo "Running intltoolize ..."
+ intltoolize --force --copy --automake || die
+ strip-linguas -i "${S}/po" || die
+ fi
+}
+src_configure() {
+ econf --enable-password \
+ --with-x \
+ --with-xconn=xcb \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+ --disable-consolekit \
+ --enable-gtk3 \
+ $(use_enable nls) \
+ $(use_enable debug) \
+ $(use_with pam)
+}
+
+src_install() {
+ default_src_install
+
+ #Use Gentoo specific Xsession startup file
+ exeinto /etc/${PN}
+ doexe "${FILESDIR}"/Xsession
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 94a0949cb3ae..4697fde18ffc 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/geary/geary-40.0.ebuild b/mail-client/geary/geary-40.0-r1.ebuild
similarity index 98%
rename from mail-client/geary/geary-40.0.ebuild
rename to mail-client/geary/geary-40.0-r1.ebuild
index 5fa9874aafe5..c4a0e51c6f37 100644
--- a/mail-client/geary/geary-40.0.ebuild
+++ b/mail-client/geary/geary-40.0-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
>=gui-libs/libhandy-1.2.1:1=
>=dev-libs/libpeas-1.24.0[gtk]
>=app-crypt/libsecret-0.11
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
>=net-libs/libsoup-2.48:2.4
>=dev-libs/libxml2-2.7.8:2
ytnef? ( >=net-mail/ytnef-1.9.3 )
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1d1970630919..d374a7e40f51 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index b38ddeefb19d..a244254cbfea 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -1,4 +1,2 @@
-DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
-DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
diff --git a/mail-filter/libmilter/files/libmilter-build-system.patch b/mail-filter/libmilter/files/libmilter-build-system.patch
deleted file mode 100644
index d9991d3d409b..000000000000
--- a/mail-filter/libmilter/files/libmilter-build-system.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.3/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/defines.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -30,12 +30,12 @@
-
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
-
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4 sendmail-8.14.3/devtools/M4/UNIX/manpage.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4 2006-09-08 00:13:07.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/manpage.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2009-09-20 09:53:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:18:35.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
-
- bldFINISH
diff --git a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
deleted file mode 100644
index 5ceac845b90e..000000000000
--- a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libmilter/sm_gethost.c 2014-03-05 01:59:45.000000000 +0100
-+++ b/libmilter/sm_gethost.c 2019-11-14 18:59:41.885353232 +0100
-@@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags,
- {
- bool resv6 = true;
- struct hostent *h;
--
-+#ifdef RES_USE_INET6
- if (family == AF_INET6)
- {
- /* From RFC2133, section 6.1 */
- resv6 = bitset(RES_USE_INET6, _res.options);
- _res.options |= RES_USE_INET6;
- }
-+#endif
- SM_SET_H_ERRNO(0);
- h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- if (family == AF_INET6 && !resv6)
- _res.options &= ~RES_USE_INET6;
--
-+#endif
- /* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
- {
diff --git a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
deleted file mode 100644
index 3348e921926c..000000000000
--- a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
---- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200
-+++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200
-@@ -80,10 +80,10 @@
- install-cf: install-sendmail-cf install-submit-cf
-
- install-sendmail-cf: $(CF).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
-
- install-submit-cf: $(SUBMIT).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
-
- depend:
-
-diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -30,12 +30,12 @@
-
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
-
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
---- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200
-+++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200
-@@ -30,7 +30,7 @@
- force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-mail.local: mail.local
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
---- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200
-+++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200
-@@ -31,7 +31,7 @@
- force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-rmail: rmail
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100
-+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200
-@@ -14,9 +14,9 @@
-
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system
- define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
-+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
--`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- )dnl
-
- # location of sendmail statistics file (usually /etc/mail/ or /var/log)
-@@ -43,21 +43,21 @@
- statistics:
- ${CP} /dev/null statistics
-
--${DESTDIR}/etc/mail/submit.cf:
-+"${DESTDIR}/etc/mail/submit.cf":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
- cd ${SRCDIR}/cf/cf && make install-submit-cf
-
- MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
-
--${DESTDIR}${MSPQ}:
-+"${DESTDIR}${MSPQ}":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
- @echo "as explained in sendmail/SECURITY."
-- mkdir -p ${DESTDIR}${MSPQ}
-- chown ${MSPQOWN} ${DESTDIR}${MSPQ}
-- chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
-- chmod 0770 ${DESTDIR}${MSPQ}
-+ mkdir -p "${DESTDIR}${MSPQ}"
-+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
-+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
-+ chmod 0770 "${DESTDIR}${MSPQ}"
-
- divert(0)
-
-@@ -68,30 +68,30 @@
- divert(bldTARGETS_SECTION)
-
- install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
-- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
-+ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
- for i in ${sendmailTARGET_LINKS}; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
- done
-
--define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- install-sm-mta: bldCURRENT_PRODUCT
-- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
-+ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
- for i in confMTA_LINKS; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
- done
-
- install-hf:
-- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
-+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
-
- install-st: statistics
-- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
-- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
-+ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
-+ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
-
--install-submit-st: statistics ${DESTDIR}${MSPQ}
-- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
-+install-submit-st: statistics "${DESTDIR}${MSPQ}"
-+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
-
- divert(0)
- bldPRODUCT_END
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
deleted file mode 100644
index 31d0b281a4e3..000000000000
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-# This library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-SENDMAIL_VER=8.14.5
-
-DESCRIPTION="The Sendmail Filter API (Milter)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6 poll"
-
-DEPEND="!mail-mta/sendmail
- !mail-mta/sendmail"
-RDEPEND="!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-build-system.patch
- eapply "${FILESDIR}"/${PN}-sharedlib.patch
- default
-
- local CC="$(tc-getCC)"
- local ENVDEF="-DNETUNIX -DNETINET"
- use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
- use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
-
- sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
- -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
- -e "s:@@CC@@:${CC}:" \
- -e "s:@@ENVDEF@@:${ENVDEF}:" \
- "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
- || die "failed to generate site.config.m4"
-}
-
-src_compile() {
- pushd libmilter
- emake -j1 MILTER_SOVER=${PV}
- popd
-}
-
-src_install() {
- local MY_LIBDIR=/usr/$(get_libdir)
- dodir "${MY_LIBDIR}"
- emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
- LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
- MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
- MSPQOWN=root CFOWN=root CFGRP=0 \
- MILTER_SOVER=${PV} \
- install -C obj.*/libmilter
-
- dodoc libmilter/README
- dodoc libmilter/docs/*
-}
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
deleted file mode 100644
index b9a1147970d6..000000000000
--- a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-# This library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-SENDMAIL_VER=8.15.2
-
-DESCRIPTION="The Sendmail Filter API (Milter)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6 poll"
-
-DEPEND="!mail-mta/sendmail
- !mail-mta/sendmail"
-RDEPEND="!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
-
-# build system patch copied from sendmail ebuild
-# glibc patch from opensuse
-PATCHES=(
- "${FILESDIR}/sendmail-8.14.6-build-system.patch"
- "${FILESDIR}/${PN}-sharedlib.patch"
- "${FILESDIR}/${PN}-glibc-2.30.patch"
- )
-
-src_prepare() {
- default
-
- local CC="$(tc-getCC)"
- local ENVDEF="-DNETUNIX -DNETINET"
- use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
- use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
-
- if use elibc_musl; then
- use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE"
-
- eapply "${FILESDIR}/${PN}-musl-stack-size.patch"
- eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch"
- fi
-
- sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
- -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
- -e "s:@@CC@@:${CC}:" \
- -e "s:@@ENVDEF@@:${ENVDEF}:" \
- "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
- || die "failed to generate site.config.m4"
-}
-
-src_compile() {
- pushd libmilter
- emake -j1 MILTER_SOVER=${PV}
- popd
-}
-
-src_install() {
- local MY_LIBDIR=/usr/$(get_libdir)
- dodir "${MY_LIBDIR}"
- emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
- LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
- MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
- MSPQOWN=root CFOWN=root CFGRP=0 \
- MILTER_SOVER=${PV} \
- install -C obj.*/libmilter
-
- dodoc libmilter/README
- dodoc libmilter/docs/*
-}
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
deleted file mode 100644
index 28b2f852f39a..000000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6b615e345037408b88b2ffd1acd03239af8a858 Mon Sep 17 00:00:00 2001
-From: Marcin Seremak
-Date: Tue, 30 Jul 2019 08:05:28 +0200
-Subject: [PATCH] Fix multiple addresses in From vulnerability
-
----
- libopendmarc/tests/test_finddomain.c | 1 +
- opendmarc/opendmarc.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libopendmarc/tests/test_finddomain.c b/libopendmarc/tests/test_finddomain.c
-index 50cf405..8447463 100644
---- a/libopendmarc/tests/test_finddomain.c
-+++ b/libopendmarc/tests/test_finddomain.c
-@@ -23,6 +23,7 @@ main(int argc, char **argv)
- /* 11 */ {"(,) joe@joe.com", "joe.com"},
- /* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
- /* 12 */ {"From: Davide D'Marco ", "blah.com"},
-+ /* 13 */ {"blah.com", "blah.com"},
- {NULL, NULL},
- };
- u_char dbuf[256];
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index 419c15a..9b7fe3a 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
- strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
-
- ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
-- from->hdr_value);
-+ dfc->mctx_fromdomain);
- if (ostatus != DMARC_PARSE_OKAY)
- {
- if (conf->conf_dolog)
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
deleted file mode 100644
index 334c11d5302f..000000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001
-From: "Murray S. Kucherawy"
-Date: Wed, 5 Aug 2020 21:56:01 +0000
-Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the
- buffer passed to opendmarc_xml().
-
----
- libopendmarc/opendmarc_xml.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libopendmarc/opendmarc_xml.c b/libopendmarc/opendmarc_xml.c
-index 26bb9dc..b3ac55a 100644
---- a/libopendmarc/opendmarc_xml.c
-+++ b/libopendmarc/opendmarc_xml.c
-@@ -158,7 +158,7 @@ opendmarc_xml(char *b, size_t blen, char *e, size_t elen)
- if (*cp != '<')
- continue;
- ++cp;
-- for(sp = cp; *sp != '\0'; ++sp)
-+ for (sp = cp; *sp != '\0'; ++sp)
- {
- if (*sp == '?')
- break;
-@@ -546,7 +546,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- if (fname == NULL)
- {
- xerror = errno;
-- (void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL");
-+ (void) snprintf(err_buf, err_len, "%s", "File name was NULL");
- errno = EINVAL;
- return NULL;
- }
-@@ -572,7 +572,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- return NULL;
- }
-
-- bufp = calloc(statb.st_size, 1);
-+ bufp = calloc(statb.st_size + 1, 1);
- if (bufp == NULL)
- {
- xerror = errno;
diff --git a/mail-filter/rspamd/rspamd-2.7-r102.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-2.7-r102.ebuild
rename to mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 3bb3d9202b2e..8a361f82f03e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..2} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
@@ -36,7 +36,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/icu:=
dev-libs/libev
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-3.0.ebuild b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-3.0.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r2.ebuild
index 1a472d6db57b..efe18dc57b00 100644
--- a/mail-filter/rspamd/rspamd-3.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index ebf109b74cd2..7bcf4740c473 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 2108d4498e04..f17188f985c7 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 4ee9a044860f..a244254cbfea 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,3 +1,2 @@
-DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
diff --git a/mail-mta/sendmail/files/libmilter-sharedlib.patch b/mail-mta/sendmail/files/libmilter-sharedlib.patch
deleted file mode 100644
index 43ec78612190..000000000000
--- a/mail-mta/sendmail/files/libmilter-sharedlib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100
-+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200
-@@ -0,0 +1,39 @@
-+divert(-1)
-+#
-+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
-+# All rights reserved.
-+#
-+# By using this file, you agree to the terms and conditions set
-+# forth in the LICENSE file which can be found at the top level of
-+# the sendmail distribution.
-+#
-+#
-+# Definitions for Makefile construction for sendmail
-+#
-+divert(0)dnl
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
-+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
-+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl
-+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
-+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
-+
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
-+divert(bldTARGETS_SECTION)
-+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS}
-+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'}
-+ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a
-+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-+
-+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}"
-+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so"
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-+
-+bldCURRENT_PRODUCT-clean:
-+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES}
-+
-+divert(0)
-+COPTS+= confCCOPTS_SO
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200
-@@ -9,7 +9,7 @@
- SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
- PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
-
--bldPRODUCT_START(`library', `libmilter')
-+bldPRODUCT_START(`milterlibrary', `libmilter')
- define(`bldINSTALLABLE', `true')
- define(`LIBMILTER_EXTRAS', `errstring.c strl.c')
- APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf')
diff --git a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
deleted file mode 100644
index 3348e921926c..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
---- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200
-+++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200
-@@ -80,10 +80,10 @@
- install-cf: install-sendmail-cf install-submit-cf
-
- install-sendmail-cf: $(CF).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
-
- install-submit-cf: $(SUBMIT).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
-
- depend:
-
-diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -30,12 +30,12 @@
-
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
-
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
---- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200
-+++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200
-@@ -30,7 +30,7 @@
- force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-mail.local: mail.local
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
---- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200
-+++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200
-@@ -31,7 +31,7 @@
- force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-rmail: rmail
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100
-+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200
-@@ -14,9 +14,9 @@
-
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system
- define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
-+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
--`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- )dnl
-
- # location of sendmail statistics file (usually /etc/mail/ or /var/log)
-@@ -43,21 +43,21 @@
- statistics:
- ${CP} /dev/null statistics
-
--${DESTDIR}/etc/mail/submit.cf:
-+"${DESTDIR}/etc/mail/submit.cf":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
- cd ${SRCDIR}/cf/cf && make install-submit-cf
-
- MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
-
--${DESTDIR}${MSPQ}:
-+"${DESTDIR}${MSPQ}":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
- @echo "as explained in sendmail/SECURITY."
-- mkdir -p ${DESTDIR}${MSPQ}
-- chown ${MSPQOWN} ${DESTDIR}${MSPQ}
-- chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
-- chmod 0770 ${DESTDIR}${MSPQ}
-+ mkdir -p "${DESTDIR}${MSPQ}"
-+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
-+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
-+ chmod 0770 "${DESTDIR}${MSPQ}"
-
- divert(0)
-
-@@ -68,30 +68,30 @@
- divert(bldTARGETS_SECTION)
-
- install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
-- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
-+ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
- for i in ${sendmailTARGET_LINKS}; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
- done
-
--define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- install-sm-mta: bldCURRENT_PRODUCT
-- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
-+ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
- for i in confMTA_LINKS; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
- done
-
- install-hf:
-- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
-+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
-
- install-st: statistics
-- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
-- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
-+ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
-+ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
-
--install-submit-st: statistics ${DESTDIR}${MSPQ}
-- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
-+install-submit-st: statistics "${DESTDIR}${MSPQ}"
-+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
-
- divert(0)
- bldPRODUCT_END
diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch
deleted file mode 100644
index 03281d1990fe..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/700108
-
---- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig 2014-03-04 19:59:45.000000000 -0500
-+++ sendmail-8.15.2-r1/libmilter/sm_gethost.c 2019-11-15 09:32:25.812406080 -0500
-@@ -51,18 +51,21 @@
- {
- bool resv6 = true;
- struct hostent *h;
--
-+#ifdef RES_USE_INET6
- if (family == AF_INET6)
- {
- /* From RFC2133, section 6.1 */
- resv6 = bitset(RES_USE_INET6, _res.options);
- _res.options |= RES_USE_INET6;
- }
-+#endif
- SM_SET_H_ERRNO(0);
- h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- if (family == AF_INET6 && !resv6)
- _res.options &= ~RES_USE_INET6;
-
-+#endif
- /* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
- {
---- sendmail-8.15.2-r2/sendmail/conf.c.orig 2019-11-14 17:36:41.262218822 -0500
-+++ sendmail-8.15.2-r2/sendmail/conf.c 2019-11-15 09:57:43.550284580 -0500
-@@ -4243,18 +4243,21 @@
-
- # else /* HAS_GETHOSTBYNAME2 */
- bool resv6 = true;
--
-+#ifdef RES_USE_INET6
- if (family == AF_INET6)
- {
- /* From RFC2133, section 6.1 */
- resv6 = bitset(RES_USE_INET6, _res.options);
- _res.options |= RES_USE_INET6;
- }
-+#endif
- SM_SET_H_ERRNO(0);
- h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- if (!resv6)
- _res.options &= ~RES_USE_INET6;
-
-+#endif
- /* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
- {
diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch b/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch
deleted file mode 100644
index 54a67548941d..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch
+++ /dev/null
@@ -1,182 +0,0 @@
---- sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 15:20:59.953546417 +0100
-+++ sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 17:26:43.868521378 +0100
-@@ -63,14 +63,28 @@ static unsigned char dh512_g[] =
- static DH *
- get_dh512()
- {
-- DH *dh = NULL;
-+ DH *dh;
-+ BIGNUM *p, *g;
-
- if ((dh = DH_new()) == NULL)
- return NULL;
-- dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
-- dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
-- if ((dh->p == NULL) || (dh->g == NULL))
-+ p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
-+ g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
-+ if (p == NULL || g == NULL)
-+ {
-+ BN_free(p);
-+ BN_free(g);
-+ DH_free(dh);
- return NULL;
-+ }
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+ DH_set0_pqg(dh, p, NULL, g);
-+#else
-+ dh->p = p;
-+ dh->g = g;
-+#endif
-+
- return dh;
- }
-
-@@ -117,16 +131,27 @@ get_dh2048()
- };
- static unsigned char dh2048_g[]={ 0x02, };
- DH *dh;
-+ BIGNUM *p, *g;
-
- if ((dh=DH_new()) == NULL)
- return(NULL);
-- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-- if ((dh->p == NULL) || (dh->g == NULL))
-+ p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-+ g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-+ if (p == NULL || g == NULL)
- {
-+ BN_free(p);
-+ BN_free(g);
- DH_free(dh);
-- return(NULL);
-+ return NULL;
- }
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+ DH_set0_pqg(dh, p, NULL, g);
-+#else
-+ dh->p = p;
-+ dh->g = g;
-+#endif
-+
- return(dh);
- }
- # endif /* !NO_DH */
-@@ -715,6 +740,54 @@ static char server_session_id_context[]
- # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 0
- #endif
-
-+static RSA *
-+generate_rsa_key(bits, e)
-+ int bits;
-+ unsigned long e;
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L
-+ return RSA_generate_key(bits, e, NULL, NULL);
-+#else
-+ BIGNUM *bne;
-+ RSA *rsa = NULL;
-+
-+ bne = BN_new();
-+ if (bne && BN_set_word(bne, e) != 1)
-+ rsa = RSA_new();
-+ if (rsa && RSA_generate_key_ex(rsa, bits, bne, NULL) != 1)
-+ {
-+ RSA_free(rsa);
-+ rsa = NULL;
-+ }
-+ BN_free(bne);
-+ return rsa;
-+#endif
-+}
-+
-+static DSA *
-+generate_dsa_parameters(bits, seed, seed_len, counter_ret, h_ret)
-+ int bits;
-+ unsigned char *seed;
-+ int seed_len;
-+ int *counter_ret;
-+ unsigned long *h_ret;
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L
-+ return DSA_generate_parameters(bits, seed, seed_len, counter_ret,
-+ h_ret, NULL, NULL);
-+#else
-+ DSA *dsa = DSA_new();
-+
-+ if (dsa && DSA_generate_parameters_ex(dsa, bits, seed, seed_len,
-+ counter_ret, h_ret, NULL) != 1)
-+ {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ return dsa;
-+#endif
-+}
-+
- bool
- inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam)
- SSL_CTX **ctx;
-@@ -926,7 +999,7 @@ inittls(ctx, req, options, srv, certfile
- {
- /* get a pointer to the current certificate validation store */
- store = SSL_CTX_get_cert_store(*ctx); /* does not fail */
-- crl_file = BIO_new(BIO_s_file_internal());
-+ crl_file = BIO_new(BIO_s_file());
- if (crl_file != NULL)
- {
- if (BIO_read_filename(crl_file, CRLFile) >= 0)
-@@ -1003,8 +1076,7 @@ inittls(ctx, req, options, srv, certfile
- if (bitset(TLS_I_RSA_TMP, req)
- # if SM_CONF_SHM
- && ShmId != SM_SHM_NO_ID &&
-- (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
-- NULL)) == NULL
-+ (rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4)) == NULL
- # else /* SM_CONF_SHM */
- && 0 /* no shared memory: no need to generate key now */
- # endif /* SM_CONF_SHM */
-@@ -1210,8 +1282,8 @@ inittls(ctx, req, options, srv, certfile
- sm_dprintf("inittls: Generating %d bit DH parameters\n", bits);
-
- /* this takes a while! */
-- dsa = DSA_generate_parameters(bits, NULL, 0, NULL,
-- NULL, 0, NULL);
-+ dsa = generate_dsa_parameters(bits, NULL, 0, NULL,
-+ NULL);
- dh = DSA_dup_DH(dsa);
- DSA_free(dsa);
- }
-@@ -1747,7 +1819,7 @@ tmp_rsa_key(s, export, keylength)
-
- if (rsa_tmp != NULL)
- RSA_free(rsa_tmp);
-- rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL);
-+ rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4);
- if (rsa_tmp == NULL)
- {
- if (LogLevel > 0)
-@@ -1974,11 +2046,20 @@ x509_verify_cb(ok, ctx)
- {
- if (LogLevel > 13)
- tls_verify_log(ok, ctx, "x509");
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+ if (X509_STORE_CTX_get_error(ctx) ==
-+ X509_V_ERR_UNABLE_TO_GET_CRL)
-+ {
-+ X509_STORE_CTX_set_error(ctx, 0);
-+ return 1; /* override it */
-+ }
-+#else
- if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL)
- {
- ctx->error = 0;
- return 1; /* override it */
- }
-+#endif
- }
- return ok;
- }
diff --git a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
deleted file mode 100644
index 8d93817d07da..000000000000
--- a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Bug #354611
---- sendmail/tls.c.orig 2010-05-26 21:54:30.000000000 -0600
-+++ sendmail/tls.c 2010-05-26 21:54:36.000000000 -0600
-@@ -723,11 +723,12 @@
- {
- if (BIO_read_filename(crl_file, CRLFile) >= 0)
- {
-- crl = PEM_read_bio_X509_CRL(crl_file, NULL,
-- NULL, NULL);
-+ while((crl = PEM_read_bio_X509_CRL(crl_file, NULL, NULL, NULL)))
-+ {
-+ X509_STORE_add_crl(store, crl);
-+ X509_CRL_free(crl);
-+ }
- BIO_free(crl_file);
-- X509_STORE_add_crl(store, crl);
-- X509_CRL_free(crl);
- X509_STORE_set_flags(store,
- X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
- X509_STORE_set_verify_cb_func(store,
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
deleted file mode 100644
index 6115996d21a3..000000000000
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets"
-
-DEPEND="net-mail/mailbase
- sys-devel/m4
- sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
- tcpd? ( sys-apps/tcp-wrappers )
- ssl? (
- dev-libs/openssl:0=
- )
- ldap? ( net-nds/openldap )
- >=sys-libs/db-3.2
- !net-mail/vacation
- "
-RDEPEND="${DEPEND}
- >=net-mail/mailbase-0.00
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/postfix
- !mail-mta/opensmtpd
- !mail-mta/qmail-ldap
- !=mail-mta/ssmtp-2.64-r2[mta]"
-
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-# libmilter library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-LIBMILTER_VER=1.0.2
-
-pkg_setup() {
- enewgroup smmsp 209
- enewuser smmsp 209 -1 /var/spool/mqueue smmsp
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
- eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
- eapply "${FILESDIR}"/libmilter-sharedlib.patch
- eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch
- eapply "${FILESDIR}"/${P}-openssl-1.1.0-fix.patch
- eapply "${FILESDIR}"/${P}-glibc-2.30.patch
-
- local confCC="$(tc-getCC)"
- local confCCOPTS="${CFLAGS}"
- local confLDOPTS="${LDFLAGS}"
- local confMAPDEF="-DMAP_REGEX"
- local conf_sendmail_LIBS=""
- use sasl && confLIBS="${confLIBS} -lsasl2" \
- && confENVDEF="${confENVDEF} -DSASL=2" \
- && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
- && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
- use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
- && confLIBS="${confLIBS} -lwrap"
- use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
- && confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
- && confLIBS="${confLIBS} -lssl -lcrypto" \
- && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
- use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
- && confLIBS="${confLIBS} -lldap -llber"
- use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
- use nis && confENVDEF="${confENVDEF} -DNIS"
- use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
- sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
- -e "s/@@confLDOPTS@@/${confLDOPTS}/" \
- -e "s/@@confCC@@/${confCC}/" \
- -e "s/@@confMAPDEF@@/${confMAPDEF}/" \
- -e "s/@@confENVDEF@@/${confENVDEF}/" \
- -e "s/@@confLIBS@@/${confLIBS}/" \
- -e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
- "${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
- echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die
-
- eapply_user
-}
-
-src_compile() {
- sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script"
- pushd libmilter
- sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
- popd
-}
-
-src_install() {
- local MY_LIBDIR=/usr/$(get_libdir)
- local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
- dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
- dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
- dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
- keepdir /var/spool/{clientmqueue,mqueue}
- for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
- do
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
- MSPQOWN=root CFOWN=root CFGRP=root \
- install -C "${MY_OBJDIR}/${dir}" \
- || die "install failed"
- done
- for dir in rmail mail.local
- do
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
- MSPQOWN=root CFOWN=root CFGRP=root \
- force-install -C "${MY_OBJDIR}/${dir}" \
- || die "install failed"
- done
-
- make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
- MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
- LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
- MSPQOWN=root CFOWN=root CFGRP=root \
- MILTER_SOVER=${LIBMILTER_VER} \
- install -C "${MY_OBJDIR}/libmilter" \
- || die "install failed"
-
- fowners root:smmsp /usr/sbin/sendmail
- fperms 2555 /usr/sbin/sendmail
- fowners smmsp:smmsp /var/spool/clientmqueue
- fperms 770 /var/spool/clientmqueue
- fperms 700 /var/spool/mqueue
- dosym ../sbin/makemap /usr/bin/makemap
- dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
- newdoc sendmail/README README.sendmail
- newdoc sendmail/SECURITY SECURITY
- newdoc sendmail/TUNING TUNING
- newdoc smrsh/README README.smrsh
- newdoc libmilter/README README.libmilter
-
- newdoc cf/README README.cf
- newdoc cf/cf/README README.install-cf
- cp -pPR cf/* "${D}"/usr/share/sendmail-cf
-
- docinto contrib
- dodoc contrib/*
-
- insinto /etc/mail
- if use mbox
- then
- newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
- else
- newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
- fi
- m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
- > "${D}"/etc/mail/sendmail.cf
- echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
- > "${D}"/etc/mail/submit.mc
- cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
- echo "# local-host-names - include all aliases for your machine here" \
- > "${D}"/etc/mail/local-host-names
- cat <<- EOF > "${D}"/etc/mail/trusted-users
- # trusted-users - users that can send mail as others without a warning
- # apache, mailman, majordomo, uucp are good candidates
- EOF
- cat <<- EOF > "${D}"/etc/mail/access
- # Check the /usr/share/doc/sendmail/README.cf file for a description
- # of the format of this file. (search for access_db in that file)
- # The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
- # package.
- #
-
- EOF
- cat <<- EOF > "${D}"/etc/conf.d/sendmail
- # Config file for /etc/init.d/sendmail
- # add start-up options here
- SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
- CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
- KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
- EOF
- if use sasl; then
- dodir /etc/sasl2
- cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
- pwcheck_method: saslauthd
- mech_list: PLAIN LOGIN
-
- EOF
- fi
-
- doinitd "${FILESDIR}"/sendmail
- systemd_dounit "${FILESDIR}"/sendmail.service
- systemd_dounit "${FILESDIR}"/sm-client.service
-
- keepdir /usr/adm/sm.bin
-}
diff --git a/mail-mta/sendmail/sendmail-8.17.1.ebuild b/mail-mta/sendmail/sendmail-8.17.1-r1.ebuild
similarity index 98%
rename from mail-mta/sendmail/sendmail-8.17.1.ebuild
rename to mail-mta/sendmail/sendmail-8.17.1-r1.ebuild
index cfb7fea30f81..6df07e689c46 100644
--- a/mail-mta/sendmail/sendmail-8.17.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.17.1-r1.ebuild
@@ -52,7 +52,8 @@ src_prepare() {
eapply_user
local confCCOPTS="${CFLAGS}"
- local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1"
+ # See bug #808954 for FLOCK
+ local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1 -DHASFLOCK=1"
local confLDOPTS="${LDFLAGS}"
local confLIBS=
local confMAPDEF="-DMAP_REGEX"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5dd6d4f39776..d584718919a1 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index 25f27559441b..3c46d2b48118 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/freefont/${PN}-ttf-${PV}.zip
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RESTRICT="strip binchecks"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4bcef5bec73d..9046c1c1fd9e 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 6a8df65e8958..9e7700af286c 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić