diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3bb72be88a2b..5bc694744bfc 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 6b58b6669678..4989c8bfb8a7 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/pcap/metadata.xml b/acct-group/pcap/metadata.xml
index 2c2a7923cfc8..481196634b10 100644
--- a/acct-group/pcap/metadata.xml
+++ b/acct-group/pcap/metadata.xml
@@ -1,8 +1,16 @@
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
+ bman@gentoo.org
+ Aaron Bauman
+
+
+ sam@gentoo.org
+ Sam James
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 0c4f4611d57d..2ac8977374db 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/pcap/metadata.xml b/acct-user/pcap/metadata.xml
index 2c2a7923cfc8..481196634b10 100644
--- a/acct-user/pcap/metadata.xml
+++ b/acct-user/pcap/metadata.xml
@@ -1,8 +1,16 @@
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
+ bman@gentoo.org
+ Aaron Bauman
+
+
+ sam@gentoo.org
+ Sam James
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 04f9402943e0..43c23f71d286 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/ansible-2.10.1.ebuild b/app-admin/ansible/ansible-2.10.1.ebuild
index e354669aeae1..3bfcb1fab2c6 100644
--- a/app-admin/ansible/ansible-2.10.1.ebuild
+++ b/app-admin/ansible/ansible-2.10.1.ebuild
@@ -57,8 +57,6 @@ DEPEND="
dev-vcs/git
)"
-PATCHES=( "${FILESDIR}/ansible-2.10.0-CVE-2020-25635-6.patch" )
-
python_compile() {
export ANSIBLE_SKIP_CONFLICT_CHECK=1
distutils-r1_python_compile
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/app-admin/fam/metadata.xml
+++ b/app-admin/fam/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
index 1f15fbbf8995..6f49eba8f496 100644
--- a/app-admin/killproc/metadata.xml
+++ b/app-admin/killproc/metadata.xml
@@ -1,7 +1,5 @@
-
- jer@gentoo.org
-
+
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
index 3497f56287b0..90fbd3a73070 100644
--- a/app-admin/lib_users/metadata.xml
+++ b/app-admin/lib_users/metadata.xml
@@ -1,10 +1,6 @@
-
+
-
- jer@gentoo.org
- Jeroen Roovers
-
klausman@gentoo.org
Tobias Klausman
diff --git a/app-admin/monit/monit-5.27.1.ebuild b/app-admin/monit/monit-5.27.1.ebuild
index 6de7d5744764..683c01698512 100644
--- a/app-admin/monit/monit-5.27.1.ebuild
+++ b/app-admin/monit/monit-5.27.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="ipv6 libressl pam ssl"
RDEPEND="
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index e98dc8130cb5..e722769a3ce1 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,6 +1,6 @@
-DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7bdc8d5676bd70f9dd143647c62b63aba2052e7f223041b7dd6859cd923398ad22f9d2d1302b8f18b4c69fe7aafb SHA512 95445dff498bea2bc8e3f32749131302481166c8591f11a5f76a7786c3286cb608049a743bc4878c8fbd4e4d22d4949f243f57f1e53725e7076d39aea5ceea20
+DIST salt-2019.2.7.tar.gz 14576515 BLAKE2B 4b2476c874a806de8664abd7852d5f856fc1946cc021d3ec8d206f69ec3cd809fe156d4d916d00304c36aad1dfab3a60309eb87d21ce7bb9afc7e8ea77ac23aa SHA512 e9a0d1ada0172239a31c6a8a628e71367aba072c06fe5420f4b864b9c67da89edd03f95abd46fd9ae414c2262b4e7e5c7f53c606f9f3f58e4c84129f2ed43c9e
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
-DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208
-DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e957e026bacd228af9f1ed500f88f7fb543833f2398d64fe7e4546f0f29d7c65362464097bf89424174e76c954 SHA512 d59b6c3580d3379192f36e462385c74b53b0b385e63b3db7734003d0a71df8f88593a59eeccd86b1dc15800e46d050094e7a88f2636673770ddc952d0110ca29
-DIST salt-3002.tar.gz 15741439 BLAKE2B 7463cfe558515697177fedb25fdf9f2e2819b62e3a96c8196b4243a4f2a59a202ac5a3869138b2df00fb47238329ba102396b464379f09d2a79c8c0a672638fb SHA512 7a3ed78b301e9c1ef65c8e6aeeaebc2376b3942e94e38b0591860fa1d9213c6c0f85db4d932b4c7c9d20717027a686690973d0dfd2aff17f44abae0ec0e97d31
+DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
+DIST salt-3001.2.tar.gz 14549535 BLAKE2B 1a69d3af0b9522943b226006b7a48b51b3de5f638aa0afe3aef12ddafd39fe0c30fc883922b2b05e789a83f07e521e4eb8dda5f8671ad0cafd1caf409f5a7f20 SHA512 5b05ed333f621965b4e94c0050118c037cf17ed142bb11c7985bf2a693be4cbcee41d6d43cb8c8ab043804f00b4332492ac03e8ca79c8de545ab8b7df7102558
+DIST salt-3002.1.tar.gz 15753988 BLAKE2B d084dc650b8bc92b4ebdb145a41a39bfbd034064fad65e364260eca84d7105fb645ad8f6cea2cc1b6affb1abf21a9858ab6fb526eaf4ecd8f76c70d1384c7edc SHA512 8fc02d0b47dad60f96eb4442b0e8a31f04d796f12b845c8142135593af4c7ea9c2d9335a3f520f8858951f87b0e8cc6be70d383fde2d93a6d529e077bcc87114
diff --git a/app-admin/salt/salt-2019.2.5-r1.ebuild b/app-admin/salt/salt-2019.2.7.ebuild
similarity index 100%
rename from app-admin/salt/salt-2019.2.5-r1.ebuild
rename to app-admin/salt/salt-2019.2.7.ebuild
diff --git a/app-admin/salt/salt-3000.3.ebuild b/app-admin/salt/salt-3000.5.ebuild
similarity index 100%
rename from app-admin/salt/salt-3000.3.ebuild
rename to app-admin/salt/salt-3000.5.ebuild
diff --git a/app-admin/salt/salt-3001.1-r2.ebuild b/app-admin/salt/salt-3001.2.ebuild
similarity index 99%
rename from app-admin/salt/salt-3001.1-r2.ebuild
rename to app-admin/salt/salt-3001.2.ebuild
index e5a0fb3ec15b..1e5f20dbb506 100644
--- a/app-admin/salt/salt-3001.1-r2.ebuild
+++ b/app-admin/salt/salt-3001.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
diff --git a/app-admin/salt/salt-3002.ebuild b/app-admin/salt/salt-3002.1.ebuild
similarity index 100%
rename from app-admin/salt/salt-3002.ebuild
rename to app-admin/salt/salt-3002.1.ebuild
diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index 752696ecc3b4..162fd31a7375 100644
--- a/app-admin/sudo/sudo-1.9.3_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
fi
fi
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index a8fb43312942..efcd58fe0b9b 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,8 +1,8 @@
-
-jer@gentoo.org
-Jeroen Roovers
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index ae4527cdd665..3db41da400fb 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -792,3 +792,4 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa2
DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e6643578c7ebc214669982dbe9e5bdfdabe58af1a82b778503fcaef7df47ff2da0a1f09e0b8dd969c9ff413c16fbdba27778 SHA512 64ee5e74e592265e47778dbc5ad2decc61f5e79514c26782128931be180131ef2ab611dbf4cf46875419157b2957b54688ed4026a80812faf3678cb26c2d7f27
DIST terraform-0.13.4.tar.gz 12800024 BLAKE2B af158e318c335d750e4fdefa4ce18e150202aeadf26f389ef27dd83669946957799e9e3f38e6cba0bc48ab96721109fb408b01493e733159c15a57ba6a767e96 SHA512 e02cb2a9967a923b918e64acd2ffa6f8a8a03676e5207d238a6cf215f4e5cb0e1db3ac9760792187757a8f18d9d23cbfd44c1ce5d6d5bacf70786ef473824dc3
+DIST terraform-0.13.5.tar.gz 12802967 BLAKE2B a70c3209a17e75c8c5f68deacade8e7b1b85c68d1d978933ab1fa32d6b64b2298f9ea5fe11fdc040ba40c7b73480d6da4020b58602e9a5f963ef0dd287540ed7 SHA512 d8af93023275b5aa50ef0dbb66fcc834593ad598300a1c38bfcf2b9bd43bc84eab81a5e63bef29701b2a078019e4b7223cae2a846ef7680a6105b5f90790b41c
diff --git a/app-admin/terraform/terraform-0.13.5.ebuild b/app-admin/terraform/terraform-0.13.5.ebuild
new file mode 100644
index 000000000000..b9df790c598c
--- /dev/null
+++ b/app-admin/terraform/terraform-0.13.5.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+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"
+ "cloud.google.com/go v0.45.1/go.mod"
+ "cloud.google.com/go/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
+ "github.com/Azure/azure-sdk-for-go v45.0.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"
+ "github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.0"
+ "github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/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"
+ "github.com/Azure/go-autorest/autorest/mocks v0.4.0/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"
+ "github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+ "github.com/Azure/go-autorest/logger v0.2.0"
+ "github.com/Azure/go-autorest/logger v0.2.0/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"
+ "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"
+ "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/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/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+ "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/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-textseg v1.0.0"
+ "github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+ "github.com/apparentlymart/go-textseg/v12 v12.0.0"
+ "github.com/apparentlymart/go-textseg/v12 v12.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.0"
+ "github.com/apparentlymart/go-versions v1.0.0/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"
+ "github.com/aws/aws-sdk-go v1.31.9/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"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/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/boltdb/bolt v1.3.1"
+ "github.com/boltdb/bolt v1.3.1/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/coreos/bbolt v1.3.0"
+ "github.com/coreos/bbolt v1.3.0/go.mod"
+ "github.com/coreos/etcd v3.3.10+incompatible"
+ "github.com/coreos/etcd v3.3.10+incompatible/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-20181012123002-c6f51f82210d"
+ "github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/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"
+ "github.com/dimchansky/utfbom v1.1.0/go.mod"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/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.1-0.20191026205805-5f8ba28d4473/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/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"
+ "github.com/ghodss/yaml v1.0.0/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"
+ "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.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-20180513044358-24b0969c4cb7"
+ "github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/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"
+ "github.com/golang/mock v1.3.1/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.4"
+ "github.com/golang/protobuf v1.3.4/go.mod"
+ "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+ "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/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"
+ "github.com/google/go-cmp v0.3.1/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/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/uuid v1.0.0/go.mod"
+ "github.com/google/uuid v1.1.1"
+ "github.com/google/uuid v1.1.1/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.0"
+ "github.com/gorilla/websocket v1.4.0/go.mod"
+ "github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/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.8.5"
+ "github.com/grpc-ecosystem/grpc-gateway v1.8.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"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/go-azure-helpers v0.12.0"
+ "github.com/hashicorp/go-azure-helpers v0.12.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.4.2-0.20200106182914-9813cbd4eb02"
+ "github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
+ "github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+ "github.com/hashicorp/go-hclog v0.9.2"
+ "github.com/hashicorp/go-hclog v0.9.2/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"
+ "github.com/hashicorp/go-multierror v1.0.0/go.mod"
+ "github.com/hashicorp/go-plugin v1.3.0"
+ "github.com/hashicorp/go-plugin v1.3.0/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.8.1"
+ "github.com/hashicorp/go-tfe v0.8.1/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"
+ "github.com/hashicorp/go-version v1.2.0/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.6.0"
+ "github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
+ "github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
+ "github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/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-20191212124732-c6ae6269b9d7"
+ "github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+ "github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
+ "github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
+ "github.com/hashicorp/vault v0.10.4"
+ "github.com/hashicorp/vault v0.10.4/go.mod"
+ "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+ "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/imdario/mergo v0.3.5/go.mod"
+ "github.com/imdario/mergo v0.3.9"
+ "github.com/imdario/mergo v0.3.9/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"
+ "github.com/jmespath/go-jmespath v0.3.0/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.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/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/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
+ "github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
+ "github.com/kisielk/errcheck v1.2.0/go.mod"
+ "github.com/kisielk/gotool v1.0.0/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.0.0"
+ "github.com/lib/pq v1.0.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"
+ "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.1"
+ "github.com/mattn/go-colorable v0.1.1/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.5"
+ "github.com/mattn/go-isatty v0.0.5/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.0.0"
+ "github.com/mitchellh/cli v1.0.0/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/prefixedio v0.0.0-20190213213902-5733675afd51"
+ "github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+ "github.com/mitchellh/reflectwalk v1.0.0"
+ "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/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-20180916011732-0a3d74bf9ce4"
+ "github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/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 v0.9.3-0.20190127221311-3c4408c8b829"
+ "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.2.0"
+ "github.com/prometheus/common v0.2.0/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+ "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+ "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/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"
+ "github.com/sirupsen/logrus v1.2.0/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/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.5.1"
+ "github.com/stretchr/testify v1.5.1/go.mod"
+ "github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+ "github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/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-20171017195756-830351dc03c6"
+ "github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+ "github.com/tombuildsstuff/giovanni v0.12.0"
+ "github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
+ "github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+ "github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+ "github.com/ulikunitz/xz v0.5.5"
+ "github.com/ulikunitz/xz v0.5.5/go.mod"
+ "github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+ "github.com/vmihailenco/msgpack v4.0.1+incompatible"
+ "github.com/vmihailenco/msgpack v4.0.1+incompatible/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-20160813154853-07dd2e8dfe18"
+ "github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+ "github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+ "github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/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.5.1"
+ "github.com/zclconf/go-cty v1.5.1/go.mod"
+ "github.com/zclconf/go-cty-yaml v1.0.2"
+ "github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0"
+ "go.opencensus.io v0.22.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.9.1"
+ "go.uber.org/zap v1.9.1/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-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"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+ "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+ "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+ "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/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/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+ "golang.org/x/mod v0.2.0"
+ "golang.org/x/mod v0.2.0/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-20190125091013-d26f9f9a57f3/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-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-20200202094626-16171245cfb2"
+ "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+ "golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+ "golang.org/x/net v0.0.0-20200602114024-627f9648deb9/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"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/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/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+ "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-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-20191128015809-6d18c012aee9"
+ "golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+ "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/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"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+ "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+ "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+ "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/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-20190628153133-6cdbf07be9d0/go.mod"
+ "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+ "golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
+ "golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+ "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/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"
+ "google.golang.org/api v0.9.0/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"
+ "google.golang.org/appengine v1.6.1/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"
+ "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/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.27.1"
+ "google.golang.org/grpc v1.27.1/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.27/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"
+ "gopkg.in/yaml.v2 v2.2.8/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"
+ "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"
+ "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
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+ go build \
+ -work -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-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index 740b2bc5107f..17e34c59b9bb 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/metadata.xml
@@ -2,8 +2,8 @@
- jer@gentoo.org
- Jeroen Roovers
+ polynomial-c@gentoo.org
+ Lars Wendler
A interactive who program that displays information about the users currently logged into the machine.
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2dd0af8c6c26..faf7aac5d5ac 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml
index f7244bcd0e2b..bfb9769e554a 100644
--- a/app-arch/dpkg/metadata.xml
+++ b/app-arch/dpkg/metadata.xml
@@ -1,12 +1,12 @@
-
-deb-tools@gentoo.org
-Gentoo Debian Tools Project
-
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
+
diff --git a/app-arch/mt-st/metadata.xml b/app-arch/mt-st/metadata.xml
index 5fa14a0aa1e3..ebdcf9258f07 100644
--- a/app-arch/mt-st/metadata.xml
+++ b/app-arch/mt-st/metadata.xml
@@ -1,10 +1,7 @@
-
+
-
- jer@gentoo.org
- Jeroen Roovers
-
+
iustin/mt-st
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 7d16ebd912cc..ba3a3d05c2f7 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml
index f8bd6f3f34f9..2b8a10f16075 100644
--- a/app-benchmarks/nbench/metadata.xml
+++ b/app-benchmarks/nbench/metadata.xml
@@ -2,7 +2,12 @@
- jer@gentoo.org
- Jeroen Roovers
+ conikost@gentoo.org
+ Conrad Kostecki
+
+ NBench, later known as BYTEmark, is a synthetic computing benchmark program
+ developed in the mid-1990s by the now defunct BYTE magazine
+ intended to measure a computer's CPU, FPU, and Memory System speed.
+
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3d519ae19eb8..78adf57920b8 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/openpgp-keys-kernel/Manifest b/app-crypt/openpgp-keys-kernel/Manifest
new file mode 100644
index 000000000000..724f68499187
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/Manifest
@@ -0,0 +1,2 @@
+DIST gregkh@kernel.org.key 3527 BLAKE2B 7ace705a7cf4727f4ee659774025867ddebf3c6706a23e6bba99adc681101f0a935870f1bdf505735f4842009816ce19d83e05e399a6dc65866ea3588c3b73f1 SHA512 6adc7c22cdf1902a537b6af3f4d006f1f56d0a246d595dd615be14b5121898ed5091dff30043b824a307c0294bb16424103bf697cfe6f7ecee6666f2199cdcd0
+DIST torvalds@kernel.org.key 1572 BLAKE2B 4f6ca50c692f6b2b89097cebe54d20b90160039cf7a396f91dff11259668d4a9a0da08293eafe63ad843a128f8e869c7c59f4a27501fe2cd04e11f16f6fa8ae8 SHA512 039ee4d7a304703020b386672fac66b8304c71ad1dfea60820f9ba13c42fddc01c0bacc26ea792dd6ee4dc10008149d21102c261df61452e6a87abeb9f2fcfd5
diff --git a/app-crypt/openpgp-keys-kernel/metadata.xml b/app-crypt/openpgp-keys-kernel/metadata.xml
new file mode 100644
index 000000000000..57fd2b433042
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ dist-kernel@gentoo.org
+
+
+
diff --git a/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
new file mode 100644
index 000000000000..92a4141ecf78
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign Linux kernel releases"
+HOMEPAGE="http://miniupnp.free.fr/files/"
+SRC_URI="
+ https://kernel.org/.well-known/openpgpkey/hu/e3n9xnm94c5apezqnj1pmrfuaoyfm8cf?l=gregkh
+ -> gregkh@kernel.org.key
+ https://kernel.org/.well-known/openpgpkey/hu/pf113mfnx1f3eb1yiwhsipa91xfc7o4x?l=torvalds
+ -> torvalds@kernel.org.key
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+ local files=( ${A} )
+ insinto /usr/share/openpgp-keys
+ newins - kernel.org.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 473c882da765..788dda9421f0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/kile/kile-2.9.93-r1.ebuild b/app-editors/kile/kile-2.9.93-r1.ebuild
index 7de438c25b80..23b5ae2d2557 100644
--- a/app-editors/kile/kile-2.9.93-r1.ebuild
+++ b/app-editors/kile/kile-2.9.93-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kile https://kile.sourceforge.io/"
if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="FDL-1.2 GPL-2"
diff --git a/app-editors/sandy/metadata.xml b/app-editors/sandy/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/app-editors/sandy/metadata.xml
+++ b/app-editors/sandy/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 381d84ab721d..7137481260eb 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-compose/docker-compose-1.27.4.ebuild b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
index 21b5b42471fc..14c165fca24f 100644
--- a/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 01e94885536a..e79f30e1a38e 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index 4230b7a7138f..9149d9e377b4 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
index 7bdab3f7755a..c28c3f4bd680 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
index 5c7b46177e7c..62f9a48cb0ac 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
index 8b63f929ae44..abf180f4e754 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 2cf1b903b2d9..23e8cb103602 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
index 6a77e0dc6823..cdd15de53f01 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 1f5e7d08ada6..f7411584a948 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -40,5 +40,5 @@ src_configure() {
-DENABLE_GTK3=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 9ef906f089f5..e8947d258263 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -40,5 +40,5 @@ src_configure() {
-DENABLE_GTK3=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index fdbf7d7716b5..e203a031e17f 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
index 0c3f83a8582d..a8d7517f6eb4 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 0517f4e0d2dc..406a2119dda1 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index 9c1255da7ca4..4b6a0c84a683 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index c8f903b0e905..8f420c466aae 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -55,5 +55,5 @@ src_configure() {
-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
index 5edbbf830dd2..9d7e431899aa 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -55,5 +55,5 @@ src_configure() {
-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index a9b7dd0fb6c1..910333931280 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,3 +1,2 @@
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
deleted file mode 100644
index 0bceb38318b3..000000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/553796
-
-Author: Peter Levine
-
---- a/src/slm/tslmpack/common.h
-+++ b/src/slm/tslmpack/common.h
-@@ -53,10 +53,10 @@
- typedef std::map RealIndexMap; // map real values to their indices
- typedef std::map TLexicon; // map word to wid
-
--#define EffectivePr(a) (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a)))))
--#define OriginalPr(b) (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b)))))
--#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a))))
--#define OriginalBow(b) (float((usingLogPr) ? (-log((b))) : ((b))))
-+#define EffectivePr(a) (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a)))))
-+#define OriginalPr(b) (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b)))))
-+#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a))))
-+#define OriginalBow(b) (float((usingLogPr) ? (-logf((b))) : ((b))))
-
- #endif //_SLM_PACK_COMMON_H
-
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
deleted file mode 100644
index 36e69d2deda3..000000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.debian.org/790287
-https://code.google.com/p/sunpinyin/issues/detail?id=327
-
-Author: Guo Yixuan
-
---- a/man/SConscript
-+++ b/man/SConscript
-@@ -1,7 +1,7 @@
- import os
- Import('env')
-
--pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET')
-+pod2man = Builder(action = 'pod2man $SOURCE $TARGET')
- env.Append(BUILDERS = {'Man': pod2man})
-
- env.Man('mmseg.1', 'mmseg.pod')
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
deleted file mode 100644
index 34f908fd9808..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="A Statistical Language Model based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-PDEPEND="<=app-i18n/sunpinyin-data-20130220"
-
-PATCHES=(
- "${FILESDIR}"/${P/_pre*}-gcc-6.patch
- "${FILESDIR}"/${P/_pre*}-pod2man.patch
-)
-
-src_prepare() {
- sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
-
- default
- tc-export CXX
-}
-
-src_compile() {
- escons \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- escons --install-sandbox="${D}" install
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0b1ad573877e..0e808fbdf270 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cmatrix/metadata.xml b/app-misc/cmatrix/metadata.xml
index fed47a353275..efcd58fe0b9b 100644
--- a/app-misc/cmatrix/metadata.xml
+++ b/app-misc/cmatrix/metadata.xml
@@ -1,7 +1,8 @@
-
-jer@gentoo.org
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
diff --git a/app-misc/figlet/metadata.xml b/app-misc/figlet/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/app-misc/figlet/metadata.xml
+++ b/app-misc/figlet/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/app-misc/lsx/metadata.xml b/app-misc/lsx/metadata.xml
index 6f49eba8f496..efcd58fe0b9b 100644
--- a/app-misc/lsx/metadata.xml
+++ b/app-misc/lsx/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 644d6855e0f3..67ab75383cd6 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/euses/metadata.xml b/app-portage/euses/metadata.xml
index f62a0f06e2e9..c6a119862d54 100644
--- a/app-portage/euses/metadata.xml
+++ b/app-portage/euses/metadata.xml
@@ -1,10 +1,6 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
tools-portage@gentoo.org
Gentoo Portage tools team
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 4824a338f015..9a52120f60d9 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bashish/metadata.xml b/app-shells/bashish/metadata.xml
index 6d4250d4c68e..64e42032473e 100644
--- a/app-shells/bashish/metadata.xml
+++ b/app-shells/bashish/metadata.xml
@@ -1,10 +1,7 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
bashish
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2622ffdd0e0d..9c484f14b496 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index f5037f14a3cb..6f49eba8f496 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 96ba50990142..7d709d04f8f4 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/metadata.xml
@@ -1,10 +1,6 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
jnrowe@gmail.com
James Rowe
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index aa1c918e2462..268a79f76600 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,9 +1,7 @@
-
+
-
- jer@gentoo.org
-
+
jpmens/jo
diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
index ece6b81bfbdf..7a38bb900964 100644
--- a/app-text/pinfo/metadata.xml
+++ b/app-text/pinfo/metadata.xml
@@ -1,7 +1,5 @@
-
- jer@gentoo.org
-
+
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
index d5f156b045c3..63ca2d1443d9 100644
--- a/app-text/wscr/metadata.xml
+++ b/app-text/wscr/metadata.xml
@@ -1,9 +1,7 @@
-
-jer@gentoo.org
-
+
WSCR is a program to solve word jumbles, print all
permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words
or a user-specified wordlist file
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 5b20144afe9c..22f003c9c96c 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/stm32flash/metadata.xml b/dev-embedded/stm32flash/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/dev-embedded/stm32flash/metadata.xml
+++ b/dev-embedded/stm32flash/metadata.xml
@@ -1,8 +1,5 @@
-
-jer@gentoo.org
-Jeroen Roovers
-
+
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index efff05fa93fc..5b0b6a473757 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/tiled-1.4.2.ebuild b/dev-games/tiled/tiled-1.4.2.ebuild
index fc9a62d7bd92..b355ebdb4fb8 100644
--- a/dev-games/tiled/tiled-1.4.2.ebuild
+++ b/dev-games/tiled/tiled-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 83edf94f4721..78c09d7c4041 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/maven-bin/maven-bin-3.6.3.ebuild b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
index 090684d78555..e6cf194b7619 100644
--- a/dev-java/maven-bin/maven-bin-3.6.3.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
DEPEND="
>=virtual/jdk-1.8
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
index 848b9d54cb84..f370da59b91b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0a31621e6960..9d0dbffc40c0 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cl/metadata.xml b/dev-libs/cl/metadata.xml
index b2f11e650c2a..f60477966bfd 100644
--- a/dev-libs/cl/metadata.xml
+++ b/dev-libs/cl/metadata.xml
@@ -1,10 +1,7 @@
-
+
-
- jer@gentoo.org
- Jeroen Roovers
-
+
tonyrog/cl
diff --git a/dev-libs/dmalloc/metadata.xml b/dev-libs/dmalloc/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/dev-libs/dmalloc/metadata.xml
+++ b/dev-libs/dmalloc/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 78451ccf1300..d7f4026a4918 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -1,21 +1,21 @@
-
+
-
-jer@gentoo.org
-Jeroen Roovers
-
-
-cpe:/a:niels_provos:libevent
-libevent/libevent
-levent
-
-
+
+ mgorny@gentoo.org
+ Michał Górny
+
+
+ cpe:/a:niels_provos:libevent
+ libevent/libevent
+ levent
+
+
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index b21799d14162..fb59d193d192 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
src_prepare() {
sed -i \
diff --git a/dev-libs/liblinear/metadata.xml b/dev-libs/liblinear/metadata.xml
index 97b5450a7dc9..33332f22c172 100644
--- a/dev-libs/liblinear/metadata.xml
+++ b/dev-libs/liblinear/metadata.xml
@@ -1,11 +1,11 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
-
- cjlin1/liblinear
-
+
+ sam@gentoo.org
+ Sam James
+
+
+ cjlin1/liblinear
+
diff --git a/dev-libs/libstrl/metadata.xml b/dev-libs/libstrl/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/dev-libs/libstrl/metadata.xml
+++ b/dev-libs/libstrl/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 125e4a565071..79d3a05ac5ad 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -5,9 +5,6 @@
kde@gentoo.org
Gentoo KDE Project
-
- jer@gentoo.org
-
libuv is a platform layer for node.js. Its purpose is to abstract
IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems.
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index bd7e0b0e7ad8..e3dd8f55a177 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,2 +1,3 @@
DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14 SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
+DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild b/dev-libs/re2/re2-0.2020.11.01.ebuild
new file mode 100644
index 000000000000..55f22b8e2cd7
--- /dev/null
+++ b/dev-libs/re2/re2-0.2020.11.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="9"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+ default
+ grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+ if use icu; then
+ sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+ fi
+ multilib_copy_sources
+}
+
+src_configure() {
+ tc-export AR CXX
+}
+
+multilib_src_compile() {
+ emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+ emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
diff --git a/dev-libs/serd/serd-0.30.6.ebuild b/dev-libs/serd/serd-0.30.6.ebuild
index 917fe4896962..34dd3d28bfb9 100644
--- a/dev-libs/serd/serd-0.30.6.ebuild
+++ b/dev-libs/serd/serd-0.30.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index d0a7e8305da4..4129379f8431 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
new file mode 100644
index 000000000000..a88f7f0ef0ca
--- /dev/null
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single
+
+DESCRIPTION="Lightweight C++ API library for Lua"
+HOMEPAGE="https://github.com/jmmv/lutok"
+SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ test? (
+ dev-libs/atf
+ dev-util/kyua
+ )
+"
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ :
+}
+
+src_configure() {
+ lua_setup
+ lua_get_CFLAGS >/dev/null
+ lua_get_LIBS >/dev/null
+ econf --enable-shared --disable-static
+}
+
+src_install() {
+ default
+ rm -rf "${ED}"/usr/tests || die
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 11e1d59484ed..bdbadba958cf 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
index 64e1417b226e..fa37214eda5a 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
@@ -20,7 +20,7 @@ fi
# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
SLOT="0/12"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 7275fa021aaa..91e09824583e 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
LICENSE="LGPL-3"
BDEPEND="
diff --git a/dev-python/botocore/botocore-1.18.10.ebuild b/dev-python/botocore/botocore-1.18.10.ebuild
index ba67bf7ac94b..6c4f654eef47 100644
--- a/dev-python/botocore/botocore-1.18.10.ebuild
+++ b/dev-python/botocore/botocore-1.18.10.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
fi
RDEPEND="
diff --git a/dev-python/cached-property/cached-property-1.5.2.ebuild b/dev-python/cached-property/cached-property-1.5.2.ebuild
index 937c0bb7f6f3..4bcc5350f43d 100644
--- a/dev-python/cached-property/cached-property-1.5.2.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
index 1ac34e4e7f85..f985c3f2fb2f 100644
--- a/dev-python/clint/clint-0.5.1-r3.ebuild
+++ b/dev-python/clint/clint-0.5.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
IUSE="examples"
# https://github.com/kennethreitz-archive/clint/pull/180
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index e09908ebfb5d..246cc4442866 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/docker-py/docker-py-4.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
index 5eba6c4519e1..4e9ea6580441 100644
--- a/dev-python/docker-py/docker-py-4.3.1.ebuild
+++ b/dev-python/docker-py/docker-py-4.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
RDEPEND="
!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
index 02b1c30f3769..93b9392e9f00 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 7e5f8e0f8005..46f4b316fe1f 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
index 1e8e3d5273a1..0249b049aa06 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz ->
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/doublex/doublex-1.9.2.ebuild b/dev-python/doublex/doublex-1.9.2.ebuild
index 167fc6a19c20..9c6196184950 100644
--- a/dev-python/doublex/doublex-1.9.2.ebuild
+++ b/dev-python/doublex/doublex-1.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/expects/expects-0.9.0.ebuild b/dev-python/expects/expects-0.9.0.ebuild
index 2b1b879d7485..647c749ccd7e 100644
--- a/dev-python/expects/expects-0.9.0.ebuild
+++ b/dev-python/expects/expects-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
index a0b696084642..843015573b60 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
deleted file mode 100644
index 4691cca33957..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/six[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-distutils_enable_tests setup.py
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # Allow pypy to read MANIFEST.in
- ln -s tests_feedgenerator tests || die
-}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 3a7b436b38dc..30b99ef20cc2 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,2 @@
-DIST humanize-2.6.0.tar.gz 53753 BLAKE2B 7908100cde103846554264df887ddb54223900cdbf1e52b2a19f029084b2997ab7a02e275f437d0cc04c3c42d6f8c371fbdab23468cdeb8f98a8cd6a64c1c288 SHA512 d1e57672c80ccabc48dadb2bafe65ac0b5b23de13907d7d51a06b6a1f2f01ef254e36afa203c9393420ad3bb5aaa22616a0d5c4c71cc53cf47727436be0b1599
DIST humanize-3.0.1.tar.gz 53151 BLAKE2B 2f4ddb2f49b8de3ddf7d68620844f476c1ce349b6cfc01a810bb5b52a57739c615f6fd98a18faa108636fd75f2ff624c542279ae62535da2ff187964e5c21c62 SHA512 d2c0dfcc32923d70bb01b384299b3735436ff84328921b57bc436a938b4b8e65b22ce56ef07487aa3ddfc017e649c25a848129a11f1c9d7cd1e808359a1a30c3
DIST humanize-3.1.0.tar.gz 54352 BLAKE2B 0e25f4f7f01244f5b24a33c54546c2b2d82e0e069d2cabbe67ff0e5f8e2bc9d3aa2eb7f4d63d4a01dc8ff4ddcfee030b33015ede00d769dfafccb6c2af95171a SHA512 71cb2766a791481f4dc5e02b77357e8e4e7332e533ee055a207cf145f2b2f9041c5bc4ce25f061f0cc1498f37edbc6243f63b888a322c0cf19e5216e120542dc
diff --git a/dev-python/humanize/humanize-2.6.0.ebuild b/dev-python/humanize/humanize-2.6.0.ebuild
deleted file mode 100644
index 7c93eeb5fa8b..000000000000
--- a/dev-python/humanize/humanize-2.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-# The package uses pkg_resources to determine its version
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- # The package uses pkg_resources to determine its version
- distutils_install_for_testing
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanize/humanize-3.0.1.ebuild b/dev-python/humanize/humanize-3.0.1.ebuild
index 94f1f6012cd1..bde5834d8b8f 100644
--- a/dev-python/humanize/humanize-3.0.1.ebuild
+++ b/dev-python/humanize/humanize-3.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 216c2210675d..2ec4144f8acb 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
LICENSE="MIT"
BDEPEND="
diff --git a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
index babe4d90871f..c7cc628bddb3 100644
--- a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND=">=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index c1539e30bad3..45b7ee061405 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,2 +1 @@
-DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
diff --git a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
deleted file mode 100644
index 05fb70455f0a..000000000000
--- a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0e930389f4785f9d311b090f92057563e22b9768 Mon Sep 17 00:00:00 2001
-From: tomMoral
-Date: Thu, 2 Jul 2020 13:37:14 +0200
-Subject: [PATCH] FIX cloudpickle customization mechanism
-
----
- loky/backend/reduction.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/loky/backend/reduction.py b/loky/backend/reduction.py
-index 0bad5f63..d87fbdff 100644
---- a/loky/backend/reduction.py
-+++ b/loky/backend/reduction.py
-@@ -189,6 +189,10 @@ def __init__(self, writer, reducers=None, protocol=HIGHEST_PROTOCOL):
- self.dispatch = self._dispatch.copy()
- else:
- if getattr(self, "dispatch_table", None) is not None:
-+ # Make sure dispatch table is an instance level field
-+ # as it is not the case for isntance for cloudpickle1.5+
-+ # see joblib/loky#259
-+ self.dispatch_table = self.dispatch_table.copy()
- self.dispatch_table.update(self._dispatch_table.copy())
- else:
- self.dispatch_table = self._dispatch_table.copy()
-@@ -202,10 +206,10 @@ def register(self, type, reduce_func):
- if sys.version_info < (3,):
- # Python 2 pickler dispatching is not explicitly customizable.
- # Let us use a closure to workaround this limitation.
-- def dispatcher(self, obj):
-- reduced = reduce_func(obj)
-- self.save_reduce(obj=obj, *reduced)
-- self.dispatch[type] = dispatcher
-+ def dispatcher(self, obj):
-+ reduced = reduce_func(obj)
-+ self.save_reduce(obj=obj, *reduced)
-+ self.dispatch[type] = dispatcher
- else:
- self.dispatch_table[type] = reduce_func
-
diff --git a/dev-python/loky/loky-2.8.0-r1.ebuild b/dev-python/loky/loky-2.8.0-r1.ebuild
deleted file mode 100644
index 09a94d2bab7c..000000000000
--- a/dev-python/loky/loky-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-inherit distutils-r1
-
-DESCRIPTION="Robust and reusable Executor for joblib"
-HOMEPAGE="https://github.com/joblib/loky"
-SRC_URI="
- https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
- dev-python/cloudpickle[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-cloudpickle-1.5.patch
-)
-
-src_prepare() {
- # docker, seriously?
- sed -e 's:test_cpu_count_cfs_limit:_&:' \
- -i tests/test_loky_module.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index a96b2ed5edc3..dd2b48641bc5 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
RDEPEND="
dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/mamba/mamba-0.11.1.ebuild b/dev-python/mamba/mamba-0.11.1.ebuild
index 969f9ebe3af6..4c0bf75f143b 100644
--- a/dev-python/mamba/mamba-0.11.1.ebuild
+++ b/dev-python/mamba/mamba-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 9dca9f9d542e..5c7f25229538 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,2 @@
DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
-DIST nbconvert-6.0.6.tar.gz 888348 BLAKE2B 7662437e1436a4ee9694bc05b8472b64d0773c38cc5fda3372ce9009f5d6d20e2ffb28c4baf3442cbc88414ce97870cf15a102ee609f4aae2c951d3f7ac5202f SHA512 2be6a65ed86dd10fc4fd08536db304dc359da1af66c4f907753a419b8d9caec08274c07d110a060bdae5626bb48a4f6d209e423b8eacee420d3a4c6ef0f6bbf5
DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
diff --git a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
deleted file mode 100644
index 177e1a67086d..000000000000
--- a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
+++ /dev/null
@@ -1,70 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- dev-python/bleach[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
- >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/jupyter_core[${PYTHON_USEDEP}]
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
- dev-python/testpath[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/ipykernel[${PYTHON_USEDEP}]
- dev-python/ipywidgets[${PYTHON_USEDEP}]
- >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
- media-gfx/inkscape
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-inkscape-1.patch
- "${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
- # assumes old inkscape output?
- sed -i -e '/SVG\.ipynb/d' \
- nbconvert/preprocessors/tests/test_execute.py || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- distutils_install_for_testing bdist_egg
- cd "${TEST_DIR}"/lib || die
- pytest -vv --pyargs nbconvert || die
-}
-
-pkg_postinst() {
- if ! has_version app-text/pandoc ; then
- einfo "Pandoc is required for converting to formats other than Python,"
- einfo "HTML, and Markdown. If you need this functionality, install"
- einfo "app-text/pandoc."
- fi
-}
diff --git a/dev-python/nbconvert/nbconvert-6.0.6.ebuild b/dev-python/nbconvert/nbconvert-6.0.6.ebuild
deleted file mode 100644
index b023b8b59843..000000000000
--- a/dev-python/nbconvert/nbconvert-6.0.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
- dev-python/bleach[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
- >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/jupyter_core[${PYTHON_USEDEP}]
- dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
- >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
- dev-python/nbclient[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
- dev-python/testpath[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/ipykernel[${PYTHON_USEDEP}]
- dev-python/ipywidgets[${PYTHON_USEDEP}]
- >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
- media-gfx/inkscape
- )
-"
-
-distutils_enable_tests pytest
-
-src_test() {
- mkdir -p "${HOME}/.local" || die
- cp -r share "${HOME}/.local/" || die
- distutils-r1_src_test
-}
-
-python_test() {
- local deselect=(
- # Missing pyppeteer for now
- # TODO: Doesn't skip?
- --deselect exporters/tests/test_webpdf.py
- # Needs pyppeteer too
- --deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
- )
-
- distutils_install_for_testing bdist_egg
- cd "${TEST_DIR}"/lib || die
- pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
- if ! has_version app-text/pandoc ; then
- einfo "Pandoc is required for converting to formats other than Python,"
- einfo "HTML, and Markdown. If you need this functionality, install"
- einfo "app-text/pandoc."
- fi
-}
diff --git a/dev-python/nbconvert/nbconvert-6.0.7.ebuild b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
index 58b0853ec91c..b023b8b59843 100644
--- a/dev-python/nbconvert/nbconvert-6.0.7.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND="
dev-python/bleach[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 65be635e361e..28137ca67982 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,2 +1 @@
-DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
DIST openpyxl-3.0.5.tar.bz2 2421647 BLAKE2B 60fc12188a608891a63513177e8e3399b3905ee9b4c4ff1631901ce0d99c3e05bc9413813d3c4f7bb9034e1d839f91e9dea5e610795c701a40d99f1011b08c45 SHA512 5f60f746b7b4bd32a018972f7c18adc0552a6d6904fcf1258db3fab28f21aa7b17e386b355ede41365889146e9aaa09911748a26343788477fd72ad5d1264974
diff --git a/dev-python/openpyxl/openpyxl-3.0.3.ebuild b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
deleted file mode 100644
index 2b37df035a2c..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
-SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- dev-python/jdcal[${PYTHON_USEDEP}]
- dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-3.0.5.ebuild b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
index 76ad7c8bc494..3c358800c564 100644
--- a/dev-python/openpyxl/openpyxl-3.0.5.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
index cbcf6d756d09..43682d8b0fdc 100644
--- a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
S="${WORKDIR}/${P/-/_}"
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
deleted file mode 100644
index 077e569b1678..000000000000
--- a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
-HOMEPAGE="https://pypi.org/project/opt-einsum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P/-/_}"
-
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index bf879d2fe52e..6fd504e61e1d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1 +1,2 @@
DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
+DIST paramiko-2.7.2.tar.gz 331678 BLAKE2B ff96dfd7b114255c15282f4f73e1f9425ccf77106426ccf3ad3f833b56bd5abfde867cf2d322448dc7b3777af6ab080b4e37ff8871ce17f0db17634b7f101747 SHA512 c9bc569428a0a61814cb73941356de5bae7fea7891ba4fd3f5c00ff1ee5083454bfde7e969fb4aaf5254b909f7f0132f590d67803eda8a67503e5c02ec2bf01a
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
new file mode 100644
index 000000000000..237c4965f4d0
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+ >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+ >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.7.1-tests.patch"
+
+ if ! use server; then
+ eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
+ fi
+
+ eapply_user
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if use examples; then
+ docinto examples
+ dodoc -r demos/*
+ fi
+}
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index e9b98ed6498f..82ca9b54dc57 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,2 +1 @@
DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
-DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
diff --git a/dev-python/parver/parver-0.3.1.ebuild b/dev-python/parver/parver-0.3.1.ebuild
index 3cf5e0976c79..b8e186a1f056 100644
--- a/dev-python/parver/parver-0.3.1.ebuild
+++ b/dev-python/parver/parver-0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/parver/parver-0.3.ebuild b/dev-python/parver/parver-0.3.ebuild
deleted file mode 100644
index af0d8b5a02d6..000000000000
--- a/dev-python/parver/parver-0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Parse and manipulate version numbers"
-HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
-SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
- dev-python/attrs[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- "
-
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pretend[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/RazerM/parver/pull/6
- "${FILESDIR}"/${P}-test.patch
-)
-
-src_prepare() {
- # unlock dependencies
- sed -i -e 's:~=:>=:g' setup.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index 8752b31bb000..eeba9a308697 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index de95da9f449f..456cc942229c 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,2 +1 @@
DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
-DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
diff --git a/dev-python/pgspecial/pgspecial-1.11.10.ebuild b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
index 1f8952ae4e42..217bd0580fb3 100644
--- a/dev-python/pgspecial/pgspecial-1.11.10.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pgspecial/pgspecial-1.11.9.ebuild b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
deleted file mode 100644
index 1d69bbdadf42..000000000000
--- a/dev-python/pgspecial/pgspecial-1.11.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of postgres meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/click-4.1[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
- >=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 1a6a2ac2a473..6f94c4a5fb11 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,2 @@
DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
DIST phonenumbers-8.12.12.tar.gz 2257073 BLAKE2B c8e4d20962d53470bfa701ff59ad0d4ddfa5f4913ae2ad2bea83c5b0c3274bddc7ff1c57e555e3b7f877d9230c0fdab5d866e52f9285fdafd773afc2c840f42f SHA512 625746bcf08f4bb5849fda1accf1229a05406439c97228b3f0f38b6fd56a4cd53e719738bed305a9dd89ab94f5f60ff0d9d0dcd3e57d5055daad99cfb94982ac
-DIST phonenumbers-8.12.9.tar.gz 2250397 BLAKE2B 06b3f8beefe3c1e5cfa4d0f9bb550f40e568692f711513784001e9bad9d3805adc42ba0bdacfa292935239c6bcb47e4723a72da160efde21269308329299fce0 SHA512 0f1de43bd56ca05920721cc9639249bffaa6516f4713fc54b53491e4ffecceb357a26cd9d6126ea9e91eec1bb1fb4bf2003f95f1d62f61ae2f1275e0dca58e29
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
index 4d3183b1591b..edac4c6caf91 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=(README.md)
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
deleted file mode 100644
index edac4c6caf91..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.9.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_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
index facf646f4b77..9d695212079e 100644
--- a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
IUSE="test"
DEPEND="test? (
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 00b745958fa7..ad992bd85f4b 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,2 +1 @@
DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
-DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
index a8c482faaf46..568e96bb58ba 100644
--- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz ->
LICENSE="OSL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/python-memcached/python-memcached-1.59.ebuild b/dev-python/python-memcached/python-memcached-1.59.ebuild
deleted file mode 100644
index d394de416857..000000000000
--- a/dev-python/python-memcached/python-memcached-1.59.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python memcached client"
-HOMEPAGE="
- https://www.tummy.com/Community/software/python-memcached/
- https://pypi.org/project/python-memcached/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- net-misc/memcached
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-# Tests try to connect to memcached via TCP/IP. Please do not re-enable
-# until you get them all to pass properly while using the UNIX socket
-# only and not even trying to connect to memcached over TCP/IP.
-RESTRICT=test
-
-python_test() {
- # Note: partial. Needs fixing. Stuff like that.
-
- cd "${TMPDIR}" || die
-
- local memcached_opts=( -d -P memcached.pid -s memcached.socket )
- [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-
- memcached "${memached_opts[@]}" || die
-
- "${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
-
- kill "$( ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/websockify/websockify-0.9.0-r1.ebuild b/dev-python/websockify/websockify-0.9.0-r1.ebuild
index 3e94e67a53ce..f4e19a2a9446 100644
--- a/dev-python/websockify/websockify-0.9.0-r1.ebuild
+++ b/dev-python/websockify/websockify-0.9.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/kanaka/websockify"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
diff --git a/dev-python/zope-interface/zope-interface-5.1.2.ebuild b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
index 5de915fb7e90..7ae3bed33632 100644
--- a/dev-python/zope-interface/zope-interface-5.1.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
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-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fbbdf7aae0e9..513da8268f4e 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 01cddcb43262..e30b5ce8ea56 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1 +1,2 @@
DIST curb-0.9.10.gem 88064 BLAKE2B 8f761e752bc1fd0775f012373847330d3ced9d394e5159b74c8e329247f6221bbc26978755d84b91e75b4082b7bb50c7755db299f90f291516f355b4ab1ddc7c SHA512 eab82d3c1b34bf8e5bfd334abca38a80eaab255d31164ca189185b8b98d7f3760fb116babf50dce5aef01be30b15e9374e7a84e1b0926dba13c3e9f8d36c54ca
+DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
diff --git a/dev-ruby/curb/curb-0.9.11.ebuild b/dev-ruby/curb/curb-0.9.11.ebuild
new file mode 100644
index 000000000000..c623b8cffa57
--- /dev/null
+++ b/dev-ruby/curb/curb-0.9.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl]"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+ # fix tests when localhost is also ::1
+ sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+ # avoid tests making outside network connections
+ rm tests/bug_postfields_crash.rb || die
+ sed -e '/test_easy_http_verbs_must_respond_to_str/,/^ end/ s:^:#:' \
+ -i tests/tc_curl_easy.rb || die
+ sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+ -i tests/tc_curl_multi.rb || die
+
+ # Fix test that expects wrong output
+ sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+ # avoid failing tests where failure condition seems weird, no
+ # upstream travis so not clear if the test is indeed broken.
+ sed -i -e '/test_multi_easy_http/,/^ end/ s:^:#:' tests/tc_curl_multi.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+ emake -Cext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" V=1
+ cp -l ext/curb_core$(get_modname) lib || die
+}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index e2594ef65d26..910d7915d78f 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,2 +1,3 @@
DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
+DIST faraday-1.1.0.tar.gz 838062 BLAKE2B 6615992046fcd2dd77db8407f8f658f224f690ff36236182174f7aee89ef24ab7789f1711f97b691ac96a9137404362f62c8277e32a0970feca44441ce8da15a SHA512 22f4cd68d409afbb3523713223325a516ec8aa79591b816f8510ab7d3b1e31acefcc2252e8fd23aa99b4a5592c1604c0cc28423f55f1633c331554e3405b11f4
diff --git a/dev-ruby/faraday/faraday-1.1.0.ebuild b/dev-ruby/faraday/faraday-1.1.0.ebuild
new file mode 100644
index 000000000000..d745a606dfc1
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+ >=dev-ruby/multipart-post-1.2.0 =dev-ruby/test-unit-2.4
+ >=dev-ruby/connection_pool-2.2.2
+ dev-ruby/rack
+ dev-ruby/webmock
+ )"
+
+all_ruby_prepare() {
+ # Remove bundler support.
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+ sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+ # Avoid loading all lib files since some of them require unpackaged dependencies.
+ sed -e '/[Cc]overall/ s:^:#:' \
+ -e '/lib\/\*\*/ s:^:#:' \
+ -e '/simplecov/ s:^:#:' \
+ -e '/SimpleCov/,/end/ s:^:#:' \
+ -e '/pry/ s:^:#:' \
+ -i spec/spec_helper.rb || die
+
+ sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid multipart tests that require an unpackaged dependency
+ # that appears to be no longer maintained.
+ rm -f spec/faraday/request/multipart_spec.rb || die
+ sed -e '/multipart_parser/ s:^:#:' \
+ -i spec/support/helper_methods.rb || die
+
+ # Remove specs for unpackaged adapters
+ rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+ # Make this adapter optional since it comes with a long list of
+ # dependencies.
+ if ! has_version "dev-ruby/typhoeus:1" ; then
+ rm -f spec/faraday/adapter/typhoeus_spec.rb || die
+ fi
+}
+
+each_ruby_prepare() {
+ # Make sure the test scripts use the right ruby interpreter
+ sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+ MT_NO_PLUGINS=true each_fakegem_test
+
+ # Sleep some time to allow the sinatra test server to die
+ einfo "Waiting for test server to stop"
+ sleep 10
+}
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index d6e02a30489f..5971948f6aaa 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1 +1,2 @@
DIST serverengine-2.2.1.gem 39424 BLAKE2B 0c68bfd59c0f6abbb294ecd8003c80853413b38b05ba1553230a2a49ffbf56dad43428eafbac4e77a012d66fdc30d4445249aed53e6eead11f52f5aeffd91c1e SHA512 920dd828561b44525dbef2a45144a40f456a5fbc2a56366a7831b42e9f6e115895a0156adc10114a007c2487d1bd1488f73c9c00373fd90648ee272c9c872111
+DIST serverengine-2.2.2.gem 39424 BLAKE2B 113ffaa6dd1c35ba0796aaec30c4b3bbc71d63abb7214bd0ed30c7d38195bb2caf4e12d79968ca2750fb522600ac9494848984248fe1645ae3d7c1e97fd6a608 SHA512 ec34af108017468e3981861b4a4ae84d071dd31aaca78d458512bf430a1c7075deb64134f899dbde14e8f18a0e163f0f61236a7b3678173030c093d3362eecf2
diff --git a/dev-ruby/serverengine/serverengine-2.2.2.ebuild b/dev-ruby/serverengine/serverengine-2.2.2.ebuild
new file mode 100644
index 000000000000..f8f4908872d2
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+ sed -i -e '/rake/ s/~>/>=/' \
+ -e '/rspec/ s/2.13.0/2.13/' \
+ -e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+ # The specs spawn ruby processes with bundler support
+ ${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4a645a852913..c087a5ae29c9 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
index 27413d126b38..a549a4612306 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/metadata.xml
@@ -1,8 +1,5 @@
-
-jer@gentoo.org
-Jeroen Roovers
-
+
diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/cppi/metadata.xml
+++ b/dev-util/cppi/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index e2792cd33e75..efcd58fe0b9b 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/metadata.xml
@@ -1,8 +1,8 @@
-
-deb-tools@gentoo.org
-Gentoo Debian Tools Project
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/dev-util/difffilter/metadata.xml
+++ b/dev-util/difffilter/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/dev-util/git-delta/metadata.xml b/dev-util/git-delta/metadata.xml
index 1e17f34f0720..0a276916cf10 100644
--- a/dev-util/git-delta/metadata.xml
+++ b/dev-util/git-delta/metadata.xml
@@ -3,7 +3,7 @@
sam@gentoo.org
- Sam James
+ Sam James
dandavison/delta
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/dev-util/redo/metadata.xml b/dev-util/redo/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/dev-util/redo/metadata.xml
+++ b/dev-util/redo/metadata.xml
@@ -1,7 +1,5 @@
-
-jer@gentoo.org
-
+
diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/dev-util/rej/metadata.xml
+++ b/dev-util/rej/metadata.xml
@@ -1,8 +1,5 @@
-
-jer@gentoo.org
-Jeroen Roovers
-
+
diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/splint/metadata.xml
+++ b/dev-util/splint/metadata.xml
@@ -1,8 +1,5 @@
-
- jer@gentoo.org
- Jeroen Roovers
-
+
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d7897e508911..14d6522f5f3b 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cssc/metadata.xml b/dev-vcs/cssc/metadata.xml
index dd7b8493d1b5..85b535a15fa1 100644
--- a/dev-vcs/cssc/metadata.xml
+++ b/dev-vcs/cssc/metadata.xml
@@ -1,9 +1,7 @@
-
-jer@gentoo.org
-
+
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 06d81bce21c5..ce6cda5aecc8 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass
index 8e51d8a69df1..8fb563766bd6 100644
--- a/eclass/fdo-mime.eclass
+++ b/eclass/fdo-mime.eclass
@@ -1,6 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# @DEAD
+# No consumers left. Removal in 30 days.
+
# @ECLASS: fdo-mime.eclass
# @MAINTAINER:
# freedesktop-bugs@gentoo.org
diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass
index d0b6cd41d598..c286a5d8f551 100644
--- a/eclass/nvidia-driver.eclass
+++ b/eclass/nvidia-driver.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: nvidia-driver.eclass
# @MAINTAINER:
-# Jeroen Roovers
+# No maintainer
# @AUTHOR:
# Original author: Doug Goldstein
# @BLURB: Provide useful messages for nvidia-drivers
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 83929098e6d8..d16181f3bf0a 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -103,7 +103,9 @@ verify-sig_verify_detached() {
# to GNUPGHOME.
addpredict /run/user
- einfo "Verifying ${file##*/} ..."
+ local filename=${file##*/}
+ [[ ${file} == - ]] && filename='(stdin)'
+ einfo "Verifying ${filename} ..."
gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
gpg --verify "${sig}" "${file}" ||
die "PGP signature verification failed"
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 3e1215f1bd07..43bbfd06ba58 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index dbfc90a7a341..ad998dc6aa7a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,2 @@
-DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
-DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b SHA512 cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba
+DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
+DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 5a8460e64199..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Sat, 31 Aug 2019 21:23:23 +0900
-Subject: [PATCH] Introduce the BUILD_NONFREE option
-
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
----
- CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2019-10-20 15:16:08.000000000 +0100
-+++ b/CMakeLists.txt 2019-10-24 21:27:58.104006569 +0100
-@@ -444,10 +444,15 @@
- add_subdirectory( libraries/wildmidi )
- add_subdirectory( libraries/oplsynth )
- add_subdirectory( libraries/zmusic )
-+
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+ add_subdirectory( wadsrc_bm )
-+ add_subdirectory( wadsrc_extra )
-+endif()
-+
- add_subdirectory( src )
-
- if( NOT CMAKE_CROSSCOMPILING )
---
-2.23.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.
----
- src/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
- ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
-
-+if( WIN32 )
-+ set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+else()
-+ set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
-+ DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+ COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
- # GCC misoptimizes this file
- set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
---
-2.21.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
deleted file mode 100644
index 779268ca6d7e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Wed, 17 Jun 2020 15:17:49 -0400
-Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library
-
-This makes sure the internal version of this library bundled with the
-GZDoom source code is used. This prevents the system from building
-GZDoom for dynamic linking with an incompatible external library (see
-commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and
-).
----
- libraries/glslang/spirv/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt
-index 453ac16b5..d39a6e300 100644
---- a/libraries/glslang/spirv/CMakeLists.txt
-+++ b/libraries/glslang/spirv/CMakeLists.txt
-@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
- SPVRemapper.h
- doc.h)
-
--add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
-+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
- set_property(TARGET SPIRV PROPERTY FOLDER glslang)
- set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(SPIRV PUBLIC
---
-2.26.2
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
similarity index 66%
rename from games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
rename to games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
index d7ece785e25d..64a230dcd984 100644
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -1,35 +1,36 @@
-From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
From: William Breathitt Gray
Date: Sat, 31 Aug 2019 21:23:23 +0900
Subject: [PATCH] Introduce the BUILD_NONFREE option
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
+This allow users to disable building nonfree components (brightmaps.pk3,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
---
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4e59452..c2f49b2 100644
+index a3763ec1f..d0c4720bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
add_subdirectory( tools )
add_subdirectory( libraries/gdtoa )
add_subdirectory( wadsrc )
-add_subdirectory( wadsrc_bm )
add_subdirectory( wadsrc_lights )
-add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widescreen )
add_subdirectory( src )
+option (BUILD_NONFREE "Build nonfree components" ON)
+if( BUILD_NONFREE )
+ add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_extra )
++ add_subdirectory( wadsrc_widescreen )
+endif()
-+
if( NOT CMAKE_CROSSCOMPILING )
export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
--
-2.26.2
+2.28.0
diff --git a/games-fps/gzdoom/gzdoom-4.3.3.ebuild b/games-fps/gzdoom/gzdoom-4.3.3.ebuild
deleted file mode 100644
index 1ba984d753b4..000000000000
--- a/games-fps/gzdoom/gzdoom-4.3.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
-HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
- non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
-
-DEPEND="
- media-libs/libsdl2[opengl]
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg:0
- alsa? ( media-libs/alsa-lib )
- fluidsynth? ( media-sound/fluidsynth:= )
- gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- )
- mpg123? ( media-sound/mpg123 )
- sndfile? ( media-libs/libsndfile )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
- "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
- rm -rf docs/licenses || die
- if ! use non-free ; then
- rm -rf wadsrc_bm wadsrc_extra || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
- -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
- -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
- -DDYN_FLUIDSYNTH=OFF
- -DDYN_OPENAL=OFF
- -DDYN_SNDFILE=OFF
- -DDYN_MPG123=OFF
- -DNO_GTK="$(usex !gtk)"
- -DNO_OPENAL=OFF
- -DNO_OPENMP="$(usex !openmp)"
- -DBUILD_NONFREE="$(usex non-free)"
- -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
- -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
- -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
- -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
- )
- cmake_src_configure
-}
-
-src_install() {
- newicon src/posix/zdoom.xpm "${PN}.xpm"
- make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
- cmake_src_install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use non-free ; then
- ewarn
- ewarn "GZDoom installed without non-free components."
- ewarn "Note: The non-free game_support.pk3 file is needed to play"
- ewarn " games natively supported by GZDoom."
- ewarn "A list of games natively supported by GZDoom is available"
- ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
- ewarn
- fi
-}
diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
similarity index 84%
rename from games-fps/gzdoom/gzdoom-4.4.2.ebuild
rename to games-fps/gzdoom/gzdoom-4.5.0.ebuild
index 976f3384a393..bf1ddc570ec4 100644
--- a/games-fps/gzdoom/gzdoom-4.4.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -7,10 +7,11 @@ inherit cmake desktop xdg
DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
+ non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )"
LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
- non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+ non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="gtk gtk2 +non-free openmp"
@@ -31,16 +32,16 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-g${PV}"
PATCHES=(
- "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
- "${FILESDIR}/${P}-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch"
)
src_prepare() {
rm -rf docs/licenses || die
rm -rf libraries/{bzip2,jpeg,zlib} || die
if ! use non-free ; then
- rm -rf wadsrc_bm wadsrc_extra || die
+ rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+ else
+ mv "${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" wadsrc_widescreen/static/ || die
fi
cmake_src_prepare
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 73491087ed90..656eb066e47e 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,9 +14,7 @@
Gentoo Games Project
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 37ab7e129d2b..637061d7c168 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/WidePix b/licenses/WidePix
new file mode 100644
index 000000000000..4020d25c1766
--- /dev/null
+++ b/licenses/WidePix
@@ -0,0 +1,13 @@
+WidePix
+
+© 2020 Nash Muhandes
+
+LICENSE:
+
+You MAY use, copy, modify, merge, publish, distribute, and/or sublicense this work - HOWEVER:
+
+- You may not sell this work
+
+- Your work must comply with id Software's original licenses (i.e. they must only work on the game from which they originated)
+
+- All derivative works must credit the original authors (id Software (Doom), Raven Software (Hexen/Heretic), Rogue Software (Strife), Digital Café (Chex), Nash Muhandes)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4eb3d8eaed0b..c5b797cb4f54 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/farbfeld/metadata.xml b/media-gfx/farbfeld/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/media-gfx/farbfeld/metadata.xml
+++ b/media-gfx/farbfeld/metadata.xml
@@ -1,8 +1,5 @@
-
-jer@gentoo.org
-Jeroen Roovers
-
+
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 0959fcdd1155..e7dd09135bed 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -1,9 +1,7 @@
-
-jer@gentoo.org
-
+