diff --git a/Manifest.files.gz b/Manifest.files.gz
index ad7e716e7f04..d1e35bc63f7d 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 c369f2111289..a205e606deee 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/mysqld_exporter/Manifest b/acct-group/mysqld_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/mysqld_exporter/metadata.xml b/acct-group/mysqld_exporter/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-group/mysqld_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0.ebuild
new file mode 100644
index 000000000000..4b0688ae2798
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 124863561904..1ef9620b7b8f 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/mysqld_exporter/Manifest b/acct-user/mysqld_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/mysqld_exporter/metadata.xml b/acct-user/mysqld_exporter/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-user/mysqld_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0.ebuild
new file mode 100644
index 000000000000..2dda2325009a
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="mysqld_exporter User"
+ACCT_USER_ID=308
+ACCT_USER_HOME=/var/lib/mysqld_exporter
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mysqld_exporter )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3e41ef842f1f..9866550d52c8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
index 013cb7f30509..c9d4ee43ee2d 100644
--- a/app-admin/doas/doas-6.6.1.ebuild
+++ b/app-admin/doas/doas-6.6.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE="pam"
RDEPEND="pam? ( sys-libs/pam )"
diff --git a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
index 92ca5be2ae67..752c2b9b0a2b 100644
--- a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa x86"
SRC_URI="
https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2bbe41cd9b66..8f241d70628e 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index ca136641cf4a..e6cd877e7798 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,8 +1,11 @@
-
-
- MacPaw/XADMaster
-
+
+ soap@gentoo.org
+ David Seifert
+
+
+ MacPaw/XADMaster
+
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 062500de3bea..ade1b1fe4946 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 73f8c879420b..df985aee2126 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.3.0.tar.xz 729504 BLAKE2B 71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e SHA512 ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
+DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
new file mode 100644
index 000000000000..adf2da003f33
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="
+ dev-qt/qtcore:5
+ botan? ( dev-libs/botan:= )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ pkcs11? (
+ >=dev-libs/openssl-1.1
+ dev-libs/pkcs11-helper
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+ $(qca_plugin_use botan)
+ $(qca_plugin_use gcrypt)
+ $(qca_plugin_use gpg gnupg)
+ $(qca_plugin_use logger)
+ $(qca_plugin_use nss)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ $(qca_plugin_use ssl ossl)
+ -DBUILD_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index de8e10cd324e..b68e4f0fc4b3 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/files/qemu-2.5.0-cflags.patch b/app-emulation/qemu/files/qemu-2.5.0-cflags.patch
deleted file mode 100644
index 173394fd02f2..000000000000
--- a/app-emulation/qemu/files/qemu-2.5.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -4468,10 +4468,6 @@ fi
- if test "$gcov" = "yes" ; then
- CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
- LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
-- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
-- CFLAGS="-O2 $CFLAGS"
- fi
-
- ##########################################
diff --git a/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch b/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch
deleted file mode 100644
index 5f442f0fd07a..000000000000
--- a/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/719266
-
-From ac2071c3791b67fc7af78b8ceb320c01ca1b5df7 Mon Sep 17 00:00:00 2001
-From: BALATON Zoltan
-Date: Mon, 6 Apr 2020 22:34:26 +0200
-Subject: [PATCH] ati-vga: Fix checks in ati_2d_blt() to avoid crash
-
-In some corner cases (that never happen during normal operation but a
-malicious guest could program wrong values) pixman functions were
-called with parameters that result in a crash. Fix this and add more
-checks to disallow such cases.
-
-Reported-by: Ziming Zhang
-Signed-off-by: BALATON Zoltan
-Message-id: 20200406204029.19559747D5D@zero.eik.bme.hu
-Signed-off-by: Gerd Hoffmann
----
- hw/display/ati_2d.c | 37 ++++++++++++++++++++++++++-----------
- 1 file changed, 26 insertions(+), 11 deletions(-)
-
---- a/hw/display/ati_2d.c
-+++ b/hw/display/ati_2d.c
-@@ -53,12 +53,20 @@ void ati_2d_blt(ATIVGAState *s)
- s->vga.vbe_start_addr, surface_data(ds), surface_stride(ds),
- surface_bits_per_pixel(ds),
- (s->regs.dp_mix & GMC_ROP3_MASK) >> 16);
-- int dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
-- s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
-- int dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-- s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
-+ unsigned dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
-+ s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
-+ unsigned dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-+ s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
- int bpp = ati_bpp_from_datatype(s);
-+ if (!bpp) {
-+ qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n");
-+ return;
-+ }
- int dst_stride = DEFAULT_CNTL ? s->regs.dst_pitch : s->regs.default_pitch;
-+ if (!dst_stride) {
-+ qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n");
-+ return;
-+ }
- uint8_t *dst_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
- s->regs.dst_offset : s->regs.default_offset);
-
-@@ -82,12 +90,16 @@ void ati_2d_blt(ATIVGAState *s)
- switch (s->regs.dp_mix & GMC_ROP3_MASK) {
- case ROP3_SRCCOPY:
- {
-- int src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
-- s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
-- int src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-- s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
-+ unsigned src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
-+ s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
-+ unsigned src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-+ s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
- int src_stride = DEFAULT_CNTL ?
- s->regs.src_pitch : s->regs.default_pitch;
-+ if (!src_stride) {
-+ qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n");
-+ return;
-+ }
- uint8_t *src_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
- s->regs.src_offset : s->regs.default_offset);
-
-@@ -137,8 +149,10 @@ void ati_2d_blt(ATIVGAState *s)
- dst_y * surface_stride(ds),
- s->regs.dst_height * surface_stride(ds));
- }
-- s->regs.dst_x += s->regs.dst_width;
-- s->regs.dst_y += s->regs.dst_height;
-+ s->regs.dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
-+ dst_x + s->regs.dst_width : dst_x);
-+ s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-+ dst_y + s->regs.dst_height : dst_y);
- break;
- }
- case ROP3_PATCOPY:
-@@ -179,7 +193,8 @@ void ati_2d_blt(ATIVGAState *s)
- dst_y * surface_stride(ds),
- s->regs.dst_height * surface_stride(ds));
- }
-- s->regs.dst_y += s->regs.dst_height;
-+ s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
-+ dst_y + s->regs.dst_height : dst_y);
- break;
- }
- default:
---
-2.26.2
-
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 7cfada3843ec..05f23f14efac 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/memcached_exporter/Manifest b/app-metrics/memcached_exporter/Manifest
index cd83175830c9..a0a62149d212 100644
--- a/app-metrics/memcached_exporter/Manifest
+++ b/app-metrics/memcached_exporter/Manifest
@@ -1 +1,2 @@
DIST memcached_exporter-0.5.0.tar.gz 1350752 BLAKE2B e9a326ca155e0e0a89dd556f0a97ba9bbe73e3e02a905497c55a5390be2cbf211dde9dda37355dd043b711258c78cf911c79ae898b6e0934f2d4b2ddef7ae946 SHA512 62ec7f9cefc88425ea3b53a634b2d5ff1534624b6e149c962372e81a7271fc1bf3c01c7d8641dc49250b8d124bec740b3c2768e62d51cfdc025a29f71a49b428
+DIST memcached_exporter-0.6.0.tar.gz 1709929 BLAKE2B 3b2f3272289d7745b560eb466918c00a2b65947dfcc219d2971cf6215a5590809c48e4b4385e572ff38c1abe7af74c9bf1575450498382b18644a46d1dab3dd7 SHA512 02238da4e901c3e3b57144501d64fa19502bdcf1aa65e775188ef18f9e524c4e2a44d87e8dcc926261b589715a8347628b87c2e418bcbcc63b5a18058ef771be
diff --git a/app-metrics/memcached_exporter/memcached_exporter-0.6.0.ebuild b/app-metrics/memcached_exporter/memcached_exporter-0.6.0.ebuild
new file mode 100644
index 000000000000..913258dc59d0
--- /dev/null
+++ b/app-metrics/memcached_exporter/memcached_exporter-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+
+DESCRIPTION="Prometheus exporter for memcached"
+HOMEPAGE="https://github.com/prometheus/memcached_exporter"
+SRC_URI="https://github.com/prometheus/memcached_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ promu build --prefix bin || die
+}
+
+src_install() {
+ newbin bin/${P} ${PN}
+ dodoc *.md
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index b94ed40612d2..eaa7819b01dc 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1 +1,2 @@
+DIST mongodb_exporter-0.11.0.tar.gz 2638227 BLAKE2B c8d6cde2fcc40bcdbbd84276d78e8ee2012a0237637ce51a67d458d030a4f8b8d5b72b3eb434cbbfd403aa7481ed76651b2af181b3785abf913ae6cfd4f2faf0 SHA512 08c2f889c5f503804af35e41220729fa9fae3226cfb89642964edc8c391fe8209cd6f8246b0e904711a63a1c0cf613d5666373035d94db537840ae9ac561c2cf
DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7cf4f0a2e72abff4784176299e46943eac2219141beed2f8d11cc8a2458737456d8edaed42a5392bedd017e85315dc75ba1d SHA512 52c1464af82c09fc79338e805e62936d4da8131cea1bb6608500fa36a2d4069676eace5da0ed1b14d82de9d626be301b42c7bc1d5c620bbecb47ae9a350ecd65
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.11.0.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.0.ebuild
new file mode 100644
index 000000000000..88aefeccd854
--- /dev/null
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+EXPORTER_COMMIT=a642618
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ go build -mod=vendor . || die
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc {README,CHANGELOG}.md
+ keepdir /var/log/mongodb_exporter
+ fowners ${PN}:${PN} /var/log/mongodb_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest
index e9ac6d5ab2d9..635cb41ff1a2 100644
--- a/app-metrics/mysqld_exporter/Manifest
+++ b/app-metrics/mysqld_exporter/Manifest
@@ -1,2 +1,3 @@
DIST mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5
DIST mysqld_exporter-0.11.0.tar.gz 1393809 BLAKE2B ac6b04d2ad24f1c083c411f10bbb6724c2458be357ff60e1950aa624955497432295726e7f739dff03aa1ed8290d852a9511e01893f5a2b293e79b3214270578 SHA512 69f39ecc1b17bfcfd3acdad9d92a70c1daf3f0c9690770fa390a818bd29f43a98bfe4856f22b48e9d2d9945ce98ded0ea54c95010755a85ebc3ebfdc353d0c24
+DIST mysqld_exporter-0.12.1_p20200622.tar.gz 1640334 BLAKE2B fa52fd7474af548bc9429026d7c92bc543cff7f2e2f5e17007a52adc647d6d022a4ec9d099376cc469b4fdc8bab285e0e699a1b10938fc6b7a6704dcc1466a50 SHA512 ccac9a718214c9ab82362deeb81949cecaa6c2fc6567ef7e3d099ca2dbf8385cb9c498837e41ad0bcdf5ec2c9d82fd159792245b97e53c182a30917e80a20cf1
diff --git a/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch b/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch
new file mode 100644
index 000000000000..ea59067cb288
--- /dev/null
+++ b/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch
@@ -0,0 +1,22 @@
+--- a/collector/exporter_test.go
++++ b/collector/exporter_test.go
+@@ -71,6 +71,8 @@ func TestExporter(t *testing.T) {
+ }
+
+ func TestGetMySQLVersion(t *testing.T) {
++ t.Skip("Test requires running mysqld")
++
+ if testing.Short() {
+ t.Skip("-short is passed, skipping test")
+ }
+--- a/mysqld_exporter_test.go
++++ b/mysqld_exporter_test.go
+@@ -142,6 +142,8 @@ type bin struct {
+
+ // TestBin builds, runs and tests binary.
+ func TestBin(t *testing.T) {
++ t.Skip("Test requires network access")
++
+ var err error
+ binName := "mysqld_exporter"
+
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
new file mode 100644
index 000000000000..5ba0eed69959
--- /dev/null
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV=f5d5289f7627016d8b53b0b3fa7615da8a73b56a
+MYSQLD_EXPORTER_COMMIT=f5d5289f
+
+DESCRIPTION="Prometheus exporter for MySQL server metrics"
+HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
+SRC_URI="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+DEPEND="acct-group/mysqld_exporter
+ acct-user/mysqld_exporter"
+
+RDEPEND="${DEPEND}"
+
+# Comment this for a normal release.
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
+
+src_prepare() {
+ default
+
+ sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ mkdir -p bin || die
+
+ promu build --prefix bin || die
+
+ # comment this for a normal release.
+ mv bin/${PN}-${MY_PV} bin/${PN} || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+
+ keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fperms 0770 /var/lib/mysqld_exporter
+
+ newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ else
+ local _replacing_version=
+ for _replacing_version in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
+ elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
+ elog "You must update your configuration or ${PN} won't start."
+
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fcb02d8dc941..c26177de7500 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/lsx/lsx-0.1-r1.ebuild b/app-misc/lsx/lsx-0.1-r1.ebuild
index 1cfccc2c3cd2..398cf21908b4 100644
--- a/app-misc/lsx/lsx-0.1-r1.ebuild
+++ b/app-misc/lsx/lsx-0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="list executables"
HOMEPAGE="https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx"
@@ -13,30 +13,25 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-DOCS=( README )
-
src_prepare() {
default
- sed -i \
- -e "s/.*strip.*//" \
- Makefile || die "sed failed"
+ # overengineered build system
+ rm Makefile config.mk || die
+}
- sed -i \
- -e "s/CFLAGS = -Os/CFLAGS +=/" \
- -e "s/LDFLAGS =/LDFLAGS +=/" \
- config.mk || die "sed failed"
+src_configure() {
+ tc-export CC
+ append-cppflags -DVERSION='\"0.1\"'
}
src_compile() {
- emake CC=$(tc-getCC)
+ emake lsx
}
src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-
# collision with net-dialup/lrzsz
- mv "${D}/usr/bin/${PN}" "${D}/usr/bin/${PN}-suckless" || die
+ newbin ${PN} ${PN}-suckless
einstalldocs
}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 78cdde68001e..bb187789095d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1 +1,2 @@
DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
+DIST mc-4.8.25_rc1.tar.xz 2487732 BLAKE2B 18bbff9e44bdd2996e5e4dc44389167a90798bc03098850f3df70b8451951e95f66fdd58416e9f44289e072729d4217be7ecf20e65fb4f507e44669d76c13589 SHA512 61e21d905dd28ea732d62c75cb5a18e67f90c7c85376ceb2240089ff7b5d724bcf2cb7de4d89709a44b795cdcbbf123648a302552bd370972e23f0967a3a1353
diff --git a/app-misc/mc/mc-4.8.25_rc1.ebuild b/app-misc/mc/mc-4.8.25_rc1.ebuild
new file mode 100644
index 000000000000..563e47b602e1
--- /dev/null
+++ b/app-misc/mc/mc-4.8.25_rc1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic vcs-snapshot
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+#SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz"
+SRC_URI="https://www.midnight-commander.org/nopaste/tarball/mc-4.8.24-163-g171957980.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0=[unicode?] )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+ if use slang && use unicode ; then
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+ fi
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local myeconfargs=(
+ --enable-charset
+ --enable-vfs
+ --with-homedir=$(usex xdg 'XDG' '.mc')
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+ $(use_enable kernel_linux vfs-undelfs)
+ # Today mclib does not expose any headers and is linked to
+ # single 'mc' binary. Thus there is no advantage of having
+ # a library. Let's avoid shared library altogether
+ # as it also conflicts with sci-libs/mc: bug #685938
+ --disable-mclib
+ $(use_enable nls)
+ $(use_enable samba vfs-smb)
+ $(use_enable sftp vfs-sftp)
+ $(use_enable spell aspell)
+ $(use_enable test tests)
+ $(use_with gpm gpm-mouse)
+ $(use_with X x)
+ $(use_with edit internal-edit)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # CK_FORK=no to avoid using fork() in check library
+ # as mc mocks fork() itself: bug #644462.
+ #
+ # VERBOSE=1 to make test failures contain detailed
+ # information.
+ CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 35e12355b85a..1220ef65dda6 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -11,10 +11,8 @@ fi
inherit flag-o-matic ${LIVE_ECLASSES}
-MY_P=${P/_/-}
-
if [[ -z ${LIVE_EBUILD} ]]; then
- SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+ SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
fi
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3da492a2dae7..c85280b96d55 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild b/app-portage/elogv/elogv-0.7.8-r1.ebuild
index 29847a895697..3f2657b5dd7d 100644
--- a/app-portage/elogv/elogv-0.7.8-r1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@@ -33,9 +33,6 @@ src_install() {
}
pkg_postinst() {
- elog "Optional dependencies:"
- elog " dev-python/pyliblzma (for xz compressed elog files)"
- elog
elog "In order to use this software, you need to activate"
elog "Portage's elog features. Required is"
elog " PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-portage/elogv/elogv-0.7.8-r2.ebuild b/app-portage/elogv/elogv-0.7.8-r2.ebuild
index 7dd9ad6ec418..061cb270c074 100644
--- a/app-portage/elogv/elogv-0.7.8-r2.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r2.ebuild
@@ -36,9 +36,6 @@ src_install() {
}
pkg_postinst() {
- elog "Optional dependencies:"
- elog " dev-python/pyliblzma (for xz compressed elog files)"
- elog
elog "In order to use this software, you need to activate"
elog "Portage's elog features. Required is"
elog " PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-portage/elogv/elogv-0.7.8-r3.ebuild b/app-portage/elogv/elogv-0.7.8-r3.ebuild
index af2d7a30cc5a..fca3877db143 100644
--- a/app-portage/elogv/elogv-0.7.8-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r3.ebuild
@@ -38,9 +38,6 @@ src_install() {
}
pkg_postinst() {
- elog "Optional dependencies:"
- elog " dev-python/pyliblzma (for xz compressed elog files)"
- elog
elog "In order to use this software, you need to activate"
elog "Portage's elog features. Required is"
elog " PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 96b9ee22a94a..189ec39e8533 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 1cfbc505eff5..3afbe2cb23cd 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1 +1,2 @@
DIST foliate-2.2.1.tar.gz 4310842 BLAKE2B 3e858379c84a790d1ce4d60af25c4911d2864d7b82f1896216ae8a01598ae7865d65b90056348b372b328e84184e75fcbacfbb2b6fdb8aa9a7e254e726957c4f SHA512 3c9c3d8f2df72fcb8699ccf23bf1850c129c6f387a9b12489d8fcc3dd1da4da5a7e0707f74f4607ab0e28d67e2f55f0bb2d053fbbc072bc9915c54c4857e4cff
+DIST foliate-2.4.1.tar.gz 4637388 BLAKE2B 4dfc0e0de5c668e73d80ff86b009f4711f0a439e6defd01a591f6271dab2de403d5f5304b29cad6c04661ee3da4d821416952324b500f73d22cdb62f85f97fed SHA512 25ae76232cb70722b0bb17d8a22c72011d99b7029f4ce70fa85a2f4baa2f93ce1fb855f5a03df882fe6f6af42101d4a368dc05a09d5fbeb78cb503b5d57fffe1
diff --git a/app-text/foliate/foliate-2.4.1.ebuild b/app-text/foliate/foliate-2.4.1.ebuild
new file mode 100644
index 000000000000..74315efa5dec
--- /dev/null
+++ b/app-text/foliate/foliate-2.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs_CS de_DE es fr_FR id_ID ie it nl pt_BR ru_RU sv tr uk zh_CN zh_TW"
+inherit meson l10n xdg-utils gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="${MESON_DEPEND}
+ sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+ net-libs/webkit-gtk"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes "${S}"/po '' '.po'
+
+ rm_po() {
+ rm po/${1}.po
+ sed -e "/^${1}/d" -i po/LINGUAS
+ }
+
+ l10n_for_each_disabled_locale_do rm_po
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
new file mode 100644
index 000000000000..079ca0895c88
--- /dev/null
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+RDEPEND="
+ || ( dev-lang/lua:0 dev-lang/lua:5.3 dev-lang/lua:5.2 dev-lang/lua:5.1 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+
+myhlopts=(
+ "CXX=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+ "DESTDIR=${D}"
+ "PREFIX=${EPREFIX}/usr"
+ "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+ "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+ "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+ "conf_dir=${EPREFIX}/etc/highlight/"
+)
+
+src_prepare() {
+ default
+
+ # disable man page compression
+ sed -e "/GZIP/d" -i makefile || die
+
+ sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ -i src/core/datadir.cpp || die
+
+ # Use the correct pkgconfig name for Lua
+ # Upstream codebase supports up to and including Lua 5.3!
+ if has_version 'dev-lang/lua:5.3'; then
+ LUAPKGCONFIG=lua5.3
+ elif has_version 'dev-lang/lua:5.2'; then
+ LUAPKGCONFIG=lua5.2
+ elif has_version 'dev-lang/lua:5.1'; then
+ LUAPKGCONFIG=lua5.1
+ elif has_version 'dev-lang/lua:0'; then
+ LUAPKGCONFIG=lua
+ else
+ die "Could not detect Lua version"
+ fi
+ einfo "Using pkg-config ${LUAPKGCONFIG}"
+ sed -r -i \
+ -e "/^LUA_.*pkg-config/s,\,${LUAPKGCONFIG},g" \
+ "${S}"/extras/tcl/makefile \
+ "${S}"/extras/swig/makefile \
+ "${S}"/makefile \
+ "${S}"/src/makefile \
+ || die "Failed to set Lua version"
+
+ # We set it via eqmake5, otherwise it forces clang...
+ sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+ -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+ -i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+ if use qt5 ; then
+ pushd src/gui-qt > /dev/null || die
+ eqmake5 \
+ 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile "${myhlopts[@]}"
+ if use qt5 ; then
+ pushd src/gui-qt > /dev/null || die
+ emake
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+ if use qt5; then
+ emake -f makefile "${myhlopts[@]}" install-gui
+ docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+ fi
+
+ if ! use examples ; then
+ rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+ fi
+}
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index 209dab4e6da2..e7400fe3c6b5 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
SLOT="0/$(ver_cut 1-2)"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 6de74d934067..d0943fee57b3 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1 +1,2 @@
DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
+DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
diff --git a/app-text/vgrep/vgrep-2.3.3.ebuild b/app-text/vgrep/vgrep-2.3.3.ebuild
new file mode 100644
index 000000000000..f50049ccd32f
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ local prefix="${D}/usr"
+ mkdir -p "${prefix}"/bin || die
+
+ emake PREFIX="${prefix}" install
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 472a4f16b46b..03fe1d52762a 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index d5540b97421d..b2528418902c 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,3 +1,2 @@
DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36e93630b9f5f4fba593377e57d6baf1c60e2503c46cd00ae73b20b622215358cae2068e86b62dac7e782210ecb SHA512 84855a06a3facc41e3c1c61be443d8b73a01afcb9bc3f1f444f0f3fd901ea1d5c932266ed94a031a0abd83171d5a6b83b6ab850e44aa31d175081a7e07b4793a
DIST asio-1.16.1.tar.bz2 1493978 BLAKE2B 810fd735a0cbea8e07bfe30cbf02d44469c3c7eebed3822766c0a658fe8972681232afe4a6124537886fafd0769eecc40b8eabbcaa2771b84b93cda56329394d SHA512 e8cab449887e3e362f9d3c2aa1b1bbb2f81954aeaf2cd12cefe7f848cdc30e1a576130b49f551efd49611b9d4941e724baea42739c043e158626f3c982b75311
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.14.0.ebuild
deleted file mode 100644
index 9af756e04a9c..000000000000
--- a/dev-cpp/asio/asio-1.14.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples libressl ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- if ! use test; then
- # Don't build nor install any examples or unittests
- # since we don't have a script to run them
- cat > src/Makefile.in <<-EOF || die
- all:
-
- install:
-
- clean:
- EOF
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/. )
- default
-
- if use examples; then
- # Get rid of the object files
- emake clean
- dodoc -r src/examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 00def086dadd..7cb70634fdb1 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 423b260d4c1a..54f2990f868a 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -4,7 +4,7 @@ DIST postgresql-11.7.tar.bz2 19890063 BLAKE2B 461c372567ff0b4ff4da52889be5d2822b
DIST postgresql-11.8.tar.bz2 19922770 BLAKE2B a646b585bbafc95957fa60c7d119c02b69b727759d2189588508f8a690dc97a0ed1429a3379bc6fd48fb22ee92f3d811dedbf8aa43271361f9b7ac2c8d42a31b SHA512 fc3d0ebd224de60bda3fa71b6832958698238e9088cf46a80c376b8996cc3b2d017fde5dce1c1da1e5e6e23b78054aafad7ee1caa744bfb12c52317ccc8a1922
DIST postgresql-12.2.tar.bz2 20363545 BLAKE2B 7b0cfe841d46b117ff5dd793be5537e916f92255eb0d000681ed62c497eef34c5d1261126be408f2b7f95274485e2787869cd4063461ab248b650c168b62548d SHA512 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
DIST postgresql-12.3.tar.bz2 20439892 BLAKE2B f7a44725f235c55a2849acd444de3a9c932314e2ae8c68d7f8e827439263b052bdf0fd5b6cdaa8197c4ce9ad1d4fbb02b5ec1af030365363993a36d8d95a4231 SHA512 68e2d244ae2a9f2138d7569bcadc1cf6f62a410fa56ad1d4ac53206f2adefabb5ae136110b41ca9246df0f8b8cb039918997e0f8a81fc7e6efb7ad10b3a59ba1
-DIST postgresql-13beta1.tar.bz2 21361108 BLAKE2B be5e41d49159ec5932ce958aab3b015b33ce02ef56abf47930754219e220672770785f6eed7966cd57fa9f3fd0d4527f5cb2813a4221443b56d70b7db7178b31 SHA512 8d8c13d7abf2127b0b0c04f080303906e8b0829d390530b308cbfa26e07cd2443a32281ef218a147499de5abe1fde8ab8818f581c68bf550cae1fbd235f46b80
+DIST postgresql-13beta2.tar.bz2 21365208 BLAKE2B db223d769e378af40a41d1bfa8aa2f05a31b325c80e375aad6ee6e30c35f8e3dadc7865ff1b19c685032c1714da34aa2630c4ac190ee5450734ff436575131b2 SHA512 7307b26422e78d3ebf4fead25a8ba7de181406490a5d354decb0324fc2d9216de94cfc19fc4eaba7eef51153f159606fc40d8650eb57131cdbc8e6948299e40f
DIST postgresql-9.4.26.tar.bz2 16871195 BLAKE2B f26fd335293669a815a51ceb994b66e154c66f96f91e4c68d7df3490ad25f4b0366ebf7bfe2b209ff34965ea27a08562ace050f40d49cec94eb576d7a1becd1c SHA512 7d379d139c7b2bdac1df38743cbb46a1790a8d5174e8cf1141b7b4febcbc8f612e347bf4d355684eef24dfc73bb2796f85fc532908f26ba7195c685f198cbb72
DIST postgresql-9.5.21.tar.bz2 17640928 BLAKE2B 8ffcf0befc331317a32d63d3cdfe44f7743f72f18b4bc46bee5ee80f8c489b4b1ef26abc8219f277acc922657fc21e3dc31f3fc9838621f44d95cc9405fca43b SHA512 8527356ee3b4f151c832aef50a8b96e923e0a6c77e5fe6ad597f50527f9d084a8feab7bede8fdbe29aab44383577d3f86e5286fb34e2d2b696cde34bd922e69d
DIST postgresql-9.5.22.tar.bz2 17667386 BLAKE2B 6fe8ccf638af466e57f239c9d7f1a19bb6c33f6019955824f54f2fe63870675d841811318fb28707cc85ab8a9db550e6655773db0d89d801e26459c9d0d01a43 SHA512 489321fa49e17308d3a78353edf73a16295c1377ad429a94636df069d2bf55f538ba6570e3d2991dd28bcca45fee77c6c41fa9bade35ea7f9e581abff4c9a401
diff --git a/dev-db/postgresql/postgresql-13_beta1.ebuild b/dev-db/postgresql/postgresql-13_beta2.ebuild
similarity index 100%
rename from dev-db/postgresql/postgresql-13_beta1.ebuild
rename to dev-db/postgresql/postgresql-13_beta2.ebuild
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3164c02f41d2..3301a1c87913 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/xa/files/xa-2.3.10-Makefile.patch b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
new file mode 100644
index 000000000000..cabc7b99beec
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
@@ -0,0 +1,77 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,7 @@
+ # Unix gcc or DOS go32 cross-compiling gcc
+ #
+-CC = gcc
+-LD = gcc
+ # for testing. not to be used; build failures in misc/.
+ #CFLAGS = -O2 -W -Wall -pedantic -ansi
+-CFLAGS = -O2
+-LDFLAGS = -lc
+
+ # for DOS?
+ # CC = gcc-go32
+@@ -32,13 +28,13 @@
+ rm -f xa
+
+ xa:
+- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd src && ${MAKE})
+
+ load:
+- (cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd loader && ${MAKE})
+
+ uncpk:
+- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd misc && ${MAKE})
+
+ dos: clean
+ (cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE})
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -2,7 +2,6 @@
+ XCBMLIB = ..
+
+ # -Wall -ansi et al. cause compile problems.
+-CFLAGS = -O2
+
+ LIBS = #-lncurses -ltermcap -lm
+
+@@ -10,19 +9,19 @@
+ all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
+
+ ../uncpk: uncpk.c
+- ${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
+
+ ../printcbm: printcbm.c
+- ${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
+
+ ../file65: file65.c
+- ${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} file65.c -o $(XCBMLIB)/file65
+
+ ../ldo65: ldo65.c
+- ${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
+
+ ../reloc65: reloc65.c
+- ${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
+
+ ../mkrom.sh: mkrom.sh
+ cp mkrom.sh ../mkrom.sh
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,7 +8,7 @@
+ all: xa
+
+ xa: ${OBJ}
+- ${LD} -o ../xa ${OBJ} ${LDFLAGS}
++ ${CC} ${CFLAGS} ${LDFLAGS} -o ../xa ${OBJ}
+
+ clean:
+ rm -f *.o *.o65
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
index c3803fcb811e..ea526d56aac6 100644
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ b/dev-embedded/xa/xa-2.3.10.ebuild
@@ -13,14 +13,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-PATCHES=( "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch )
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC) " \
- CFLAGS="${CFLAGS} ${LDFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.10-Makefile.patch
+ "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch
+)
+
+src_configure() {
+ tc-export CC
}
src_test() {
@@ -28,6 +27,6 @@ src_test() {
}
src_install() {
- emake install DESTDIR="${ED}/usr"
+ emake DESTDIR="${ED}"/usr install
einstalldocs
}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 9f5c34f1ac29..4089c7b03811 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
index d94daaaf6d88..eb07d5cc1798 100644
--- a/dev-games/hawknl/files/hawknl-1.68-build.patch
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -1,12 +1,39 @@
---- src/makefile.linux.orig 2005-12-16 22:03:24.000000000 -0500
-+++ src/makefile.linux 2005-12-16 22:04:18.000000000 -0500
-@@ -34,13 +34,14 @@
+--- a/src/makefile.linux
++++ b/src/makefile.linux
+@@ -1,6 +1,3 @@
+-CC = gcc
+-AR = ar cru
+-RANLIB = ranlib
+ MAJOR_VERSION = 1
+ MINOR_VERSION = 6
+ PATCH_LEVEL = 8
+@@ -11,15 +8,13 @@
+ OUTPUT = libNL.so.$(VERSION)
+ LIBNAME = NL
+ STATIC = libNL.a
+-OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
+-CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
+-LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
++CPPFLAGS += -D_GNU_SOURCE -D_REENTRANT $(INCLUDE)
++CFLAGS += -Wall -fPIC
++LIBFLAGS = -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
+ OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
+
+ all: $(OBJECTS)
+- $(CC) -o $(OUTPUT) $(OBJECTS) $(LIBFLAGS) $(CFLAGS)
+- $(AR) $(STATIC) $(OBJECTS)
+- $(RANLIB) $(STATIC)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT) $(OBJECTS) $(LIBFLAGS)
+
+ nl.o : nlinternal.h nl.c
+ sock.o : nlinternal.h sock.h sock.c
+@@ -34,23 +29,14 @@
nltime.o : nlinternal.h nltime.c
install:
-+ mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
++ mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
cp $(OUTPUT) $(LIBDIR)
- cp $(STATIC) $(LIBDIR)
+- cp $(STATIC) $(LIBDIR)
chmod 755 $(LIBDIR)/$(OUTPUT)
- ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
- ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
@@ -15,18 +42,16 @@
+ ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
+ ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
+ ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so
-+ ln -s $(OUTPUT) $(LIBDIR)/$(LIBNAME).so
cp ../include/nl.h $(INCDIR)/nl.h
chmod 644 $(INCDIR)/nl.h
+- @echo ""
+- @echo "*************************************************"
+- @echo "* Installed HawkNL. *"
+- @echo "* Remember to run /sbin/ldconfig before using *"
+- @echo "* the library, you may also want to check that *"
+- @echo "* $(LIBDIR) is included in /etc/ld.so.conf *"
+- @echo "* You must be root to run ldconfig. *"
+- @echo "*************************************************"
---- src/makefile.linux.old 2010-09-10 09:44:53.000000000 +0200
-+++ src/makefile.linux 2010-09-10 09:45:09.000000000 +0200
-@@ -13,7 +13,7 @@
- STATIC = libNL.a
- OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
- CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
--LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
-+LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
- OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
-
- all: $(OBJECTS)
+ uninstall:
+ rm -f $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
diff --git a/dev-games/hawknl/hawknl-1.68-r2.ebuild b/dev-games/hawknl/hawknl-1.68-r2.ebuild
deleted file mode 100644
index ff46abad3e7a..000000000000
--- a/dev-games/hawknl/hawknl-1.68-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A cross-platform network library designed for games"
-HOMEPAGE="http://www.hawksoft.com/hawknl/"
-SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/hawknl${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
- sed -i\ -e '/echo /d' src/makefile.linux || die
-}
-
-src_compile() {
- emake -C src -f makefile.linux \
- CC="$(tc-getCC)" \
- OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT"
-}
-
-src_install() {
- emake -j1 -C src -f makefile.linux \
- LIBDIR="${D}/usr/$(get_libdir)" \
- INCDIR="${D}/usr/include" install
- if use doc ; then
- dodoc -r samples
- fi
-}
diff --git a/dev-games/hawknl/hawknl-1.68-r3.ebuild b/dev-games/hawknl/hawknl-1.68-r3.ebuild
new file mode 100644
index 000000000000..1263783a20ec
--- /dev/null
+++ b/dev-games/hawknl/hawknl-1.68-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A cross-platform network library designed for games"
+HOMEPAGE="http://www.hawksoft.com/hawknl/"
+SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE="examples"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_configure() {
+ tc-export CC
+}
+
+src_compile() {
+ emake -C src -f makefile.linux
+}
+
+src_install() {
+ emake -j1 -C src -f makefile.linux \
+ LIBDIR="${ED}"/usr/$(get_libdir) \
+ INCDIR="${ED}"/usr/include install
+
+ dodoc src/{nlchanges.txt,readme.txt}
+ if use examples; then
+ docinto examples
+ dodoc -r samples/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3ec662b4f5ca..58907627768a 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8a7b8087fc55..82d85c241869 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,4 +4,5 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
+DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
new file mode 100644
index 000000000000..b6216e53c6b0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 97a35a9f5b98..f0a26aaa8d3a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/python/python-3.6.11-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
index e6a339432683..a795fdf6cdfe 100644
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.8-r1.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
index 0189b2861593..301564d7ccd2 100644
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.3-r1.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
index d03fc26b63f8..729a2f0558af 100644
--- a/dev-lang/python/python-3.8.3-r1.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 48040e477d6c..a043c21244df 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/elfutils/elfutils-0.179.ebuild b/dev-libs/elfutils/elfutils-0.179.ebuild
index 70c6f757d6a7..0ebf36a8d08f 100644
--- a/dev-libs/elfutils/elfutils-0.179.ebuild
+++ b/dev-libs/elfutils/elfutils-0.179.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild
index 585d307da266..593786c9ceb4 100644
--- a/dev-libs/freexl/freexl-1.0.5.ebuild
+++ b/dev-libs/freexl/freexl-1.0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
DEPEND="virtual/libiconv"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch b/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
deleted file mode 100644
index 58e80b29687e..000000000000
--- a/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Install python module into gdb auto-load directory.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -2189,9 +2189,9 @@ install-data-local: $(srcdir)/isl.py
- case $$libisl in \
- '') echo Cannot find isl library name. GDB bindings not installed.;; \
- *) echo $(INSTALL_DATA) $(srcdir)/isl.py \
-- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
-- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
-- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac
-+ $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
-+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
-+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch
new file mode 100644
index 000000000000..75cb650fc1bc
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,6 +89,9 @@
+ AC_PROG_AWK
+ AC_SUBST(AWK)
+
++AC_ARG_VAR([NM], [utility for listing symbols from object files])
++AC_CHECK_TOOL([NM], [nm])
++
+ if test "x$GCC" != "xyes"
+ then
+ AC_MSG_WARN([
+--- a/lib/cdda_interface/Makefile.am
++++ b/lib/cdda_interface/Makefile.am
+@@ -129,8 +129,8 @@
+ echo 'CDIO_CDDA_$(libcdio_cdda_la_MAJOR) { ' > $@
+ objs=`for obj in $(libcdio_cdda_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
+ if test -n "$$objs" ; then \
+- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
+- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
+ fi
+ echo '};' >> $@
+ else !BUILD_VERSIONED_LIBS
+--- a/lib/paranoia/Makefile.am
++++ b/lib/paranoia/Makefile.am
+@@ -142,8 +142,8 @@
+ echo 'CDIO_PARANOIA_$(libcdio_paranoia_la_MAJOR) { ' > $@
+ objs=`for obj in $(libcdio_paranoia_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
+ if test -n "$$objs" ; then \
+- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
+- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \
+ fi
+ echo '};' >> $@
+ else
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 07355295da2b..f7d282ae17b0 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -34,14 +34,13 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-2.0.1-pass-NM.patch )
DOCS=( AUTHORS ChangeLog NEWS.md README.md THANKS )
src_prepare() {
default
#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
eautoreconf
-
- [[ ${CC} == *clang* ]] && append-flags -std=gnu89
}
multilib_src_configure() {
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 0a0fbac1a381..6bfd767d4af1 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,3 +1,4 @@
DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee
DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
+DIST libfmt-7.0.0.tar.gz 738799 BLAKE2B de032e6d0400e960f9622281bd00aa8676c909f4f171ba327206d9fe7ce9616ea134f61d90616917e4a23d025d83c05ee41faa5a9b61691458a20e66631942a5 SHA512 c92bcc067cdc0d260179a1f731ab8f54d8c0f3af5911b39034f0e24b0a8ef43ecfd820e42f1a2e30c2a436113920ea06e73b297b185c8794a5d480f1ec9e5916
diff --git a/dev-libs/libfmt/libfmt-7.0.0.ebuild b/dev-libs/libfmt/libfmt-7.0.0.ebuild
new file mode 100644
index 000000000000..376757b05ade
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-7.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+ -DFMT_LIB_DIR="$(get_libdir)"
+ -DFMT_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index 78c2d74959bb..376757b05ade 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/fmt-${PV}"
fi
diff --git a/dev-libs/librelp/librelp-1.6.0.ebuild b/dev-libs/librelp/librelp-1.6.0.ebuild
index 2a4d1adab6d8..43212254d25a 100644
--- a/dev-libs/librelp/librelp-1.6.0.ebuild
+++ b/dev-libs/librelp/librelp-1.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
# subslot = soname version
SLOT="0/0.5.0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa sparc x86"
+KEYWORDS="~amd64 arm ~arm64 hppa sparc x86"
IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 7a850ed2560b..6468f17add62 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index b835ebf02b73..f68a10ab7154 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1 +1,2 @@
DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
+DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
new file mode 100644
index 000000000000..bc1e64a91cf2
--- /dev/null
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Protocol Buffers implementation in C"
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+# Subslot == SONAME version
+SLOT="0/1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=">=dev-libs/protobuf-3:0
+ virtual/pkgconfig"
+DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ if ! use test; then
+ eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
new file mode 100644
index 000000000000..422a507a6d86
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
@@ -0,0 +1,33 @@
+https://github.com/gabime/spdlog/pull/1606
+
+From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Mon, 6 Jul 2020 13:01:52 -0400
+Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
+
+See: https://github.com/fmtlib/fmt/issues/1538
+---
+ include/spdlog/details/fmt_helper.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
+index cbc0bdf3..4f363858 100644
+--- a/include/spdlog/details/fmt_helper.h
++++ b/include/spdlog/details/fmt_helper.h
+@@ -34,7 +34,15 @@ template
+ inline unsigned int count_digits(T n)
+ {
+ using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
+- return static_cast(fmt::internal::count_digits(static_cast(n)));
++ return static_cast(fmt::
++// fmt 7.0.0 renamed the internal namespace to detail.
++// See: https://github.com/fmtlib/fmt/issues/1538
++#if FMT_VERSION < 70000
++internal
++#else
++detail
++#endif
++::count_digits(static_cast(n)));
+ }
+
+ inline void pad2(int n, memory_buf_t &dest)
diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..04237834f6cc
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+ SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-libs/libfmt-5.3.0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-libfmt-7.0.0.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSPDLOG_BUILD_BENCH=no
+ -DSPDLOG_BUILD_EXAMPLE=no
+ -DSPDLOG_FMT_EXTERNAL=yes
+ -DSPDLOG_BUILD_SHARED=yes
+ -DSPDLOG_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 24491a214dcb..6da33cbbf3c6 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index ed6943693aea..4a2c47743143 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
index 2b8c569712e3..549540e6d6e3 100644
--- a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build external dependencies for use in CPAN"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test zip"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
index 39ea27db5aee..57690bc19f2e 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Install the C libxml2 library on your system"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
index a5bf7a59757f..8d9aec06d3f6 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl-only 'which'"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index bf93505dcd25..bfc6f8766273 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="additional B helpers to check COW status"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index 7bc03be63a65..fa1b2ce238a4 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
index 99a786a4ec70..8721cc8a806b 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Standard en/decode of ASN.1 structures"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
index 36fa7a2743ed..b1750ab05829 100644
--- a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An implementation of the IDEA symmetric-key block cipher"
LICENSE="Crypt-IDEA"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
index 44148bf52078..7de4ffe25300 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Guess OpenSSL include path"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
index f80a7318d11d..0435bc6c26db 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
index cd9c7dc71f95..1d084e340495 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl"
RDEPEND="
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0.ebuild
index 0d40c8d8da12..736f34f7d508 100644
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Data-Dump-Streamer/Data-Dump-Streamer-2.400.0-r1.ebuild b/dev-perl/Data-Dump-Streamer/Data-Dump-Streamer-2.400.0-r1.ebuild
new file mode 100644
index 000000000000..e94f03a64b8a
--- /dev/null
+++ b/dev-perl/Data-Dump-Streamer/Data-Dump-Streamer-2.400.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=YVES
+DIST_VERSION=2.40
+inherit perl-module
+
+DESCRIPTION="Accurately serialize a data structure as Perl code"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/B-Utils
+ virtual/perl-Data-Dumper
+ virtual/perl-Exporter
+ virtual/perl-IO
+ virtual/perl-IO-Compress
+ virtual/perl-MIME-Base64
+ virtual/perl-Text-Balanced
+ dev-perl/PadWalker
+ virtual/perl-XSLoader
+"
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ virtual/perl-Carp
+ virtual/perl-ExtUtils-CBuilder
+ dev-perl/ExtUtils-Depends
+ test? (
+ virtual/perl-Test-Simple
+ dev-perl/JSON-XS
+ )
+"
+PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
+src_prepare() {
+ # Add DDS.pm shortcut
+ echo 'yes' > "${S}"/.answer
+ perl-module_src_prepare
+}
+src_configure() {
+ unset LD
+ [[ -n "${CCLD}" ]] && export LD="${CCLD}"
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
index 495a2dfe8512..1404a487d402 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2+ ) unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
index 26925468d435..de1fa817f0e8 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime/DateTime-1.440.0.ebuild b/dev-perl/DateTime/DateTime-1.440.0.ebuild
index 2922ccba5b45..88f0892ffa2a 100644
--- a/dev-perl/DateTime/DateTime-1.440.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.440.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild
index f4432fd4b036..c6f3095ffd93 100644
--- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild
+++ b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="check that a library is available"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Email-Date/Email-Date-1.104.0-r2.ebuild b/dev-perl/Email-Date/Email-Date-1.104.0-r2.ebuild
index 817e8a5ce3f2..c16c7fb304a6 100644
--- a/dev-perl/Email-Date/Email-Date-1.104.0-r2.ebuild
+++ b/dev-perl/Email-Date/Email-Date-1.104.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Find and Format Date Headers"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.22.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.22.0.ebuild
index 222acd9de1b7..96beaff087f6 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.22.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.22.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Email-MIME/Email-MIME-1.946.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.946.0.ebuild
index 7b42a1d28b86..bd7c1a33aa1f 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.946.0.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.946.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Easy MIME message parsing"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Event-RPC/Event-RPC-1.100.0.ebuild b/dev-perl/Event-RPC/Event-RPC-1.100.0.ebuild
index eace2b2cab62..64d95c1e3f4b 100644
--- a/dev-perl/Event-RPC/Event-RPC-1.100.0.ebuild
+++ b/dev-perl/Event-RPC/Event-RPC-1.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Event based transparent Client/Server RPC framework"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
index 1331c518a09c..1228a3247f4d 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check that a library is available for FFI"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
index 7bbc172f1666..48868d5da8ed 100644
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module interface to interacting with GnuPG"
SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 hppa ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
index 67dc6b6e50aa..2dc80a2caa27 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for simple HTTP servers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild
index 59545159884d..e740d7a622fa 100644
--- a/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild
+++ b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Faster implementation of HTTP::Headers"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Importer/Importer-0.24.0.ebuild b/dev-perl/Importer/Importer-0.24.0.ebuild
index 9bebbb19b324..aca74d17fc93 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Alternative interface to modules that export symbols"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
index 0b481d754f64..84ecf6bf7877 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="Artistic-2"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
index 3c032298797a..62a4a42e0475 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Compiled List::MoreUtils functions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# See XS.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
index d741fa8b68d8..33121a098221 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test +xs"
RESTRICT="!test? ( test )"
# See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
index 6d92e91ff9a9..17a3d1705e61 100644
--- a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="XS implementation for List::SomeUtils"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
index dc493fac5f27..ae489e495a4c 100644
--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="A colletion of List utilities missing from List::Util"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
index 00cdf522e4ab..2157f0a52c2b 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Higher-order list utility functions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild
index 8cb6041bb5c6..8dbfe50d9b96 100644
--- a/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dispatches messages to one or more outputs"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86 ~ppc-aix"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fb0d5fe0e720..3738d81f00f2 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Moose/Moose-2.200.700.ebuild b/dev-perl/Moose/Moose-2.200.700.ebuild
index dba9b21bd973..59a382f53b6e 100644
--- a/dev-perl/Moose/Moose-2.200.700.ebuild
+++ b/dev-perl/Moose/Moose-2.200.700.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A postmodern object system for Perl 5"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
index 4944908983db..669dd0dd70bc 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
DESCRIPTION="Perl Interface to the Domain Name System"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+ipv6 test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
index 1c28f1603d92..92f9c1d42527 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
index 0c297a44b3d6..58d6a1137011 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl bindings for GNU Libidn2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..18b134b51725
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=THOR
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Perl bindings for GNU Libidn2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-dns/libidn2:="
+DEPEND="
+ net-dns/libidn2:=
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-CBuilder
+ virtual/perl-ExtUtils-ParseXS
+ dev-perl/Module-Build
+ test? (
+ >=virtual/perl-Test-Simple-0.10.0
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}"-libidn-2.0.5.patch )
+
+src_configure() {
+ unset LD
+ [[ -n "${CCLD}" ]] && export LD="${CCLD}"
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild
index e128caf41d26..13b2f5be3ad7 100644
--- a/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild
+++ b/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
IUSE=""
RDEPEND="net-libs/libpcap
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
index 7d0e9dd63c12..bee028582cd2 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build an optimized subroutine parameter validator once, use it forever"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="Artistic-2"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
index 2c4ad6c5b83b..048c02b1a2c3 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tid
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
index ed2a4afd04f0..fe9066ad0165 100644
--- a/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
+++ b/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Utility functions for checking references"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
IUSE="test +xs"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Specio/Specio-0.420.0.ebuild b/dev-perl/Specio/Specio-0.420.0.ebuild
index b33eec2462d9..41912af60cd0 100644
--- a/dev-perl/Specio/Specio-0.420.0.ebuild
+++ b/dev-perl/Specio/Specio-0.420.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Type constraints and coercions for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
index 4fbd1d86d28a..a47664c8f354 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Tool for inspecting subroutines"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
index 257775dbf3f0..42c8bd029932 100644
--- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module eutils
DESCRIPTION="Format a header and rows into a table"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0.ebuild
index 7ab7e2265c48..ce6943d1cdea 100644
--- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0.ebuild
+++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check for uncleaned imports"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
index 3a0460943d01..e4efc9818e9d 100644
--- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
+++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="Create a Fake ShareDir for your modules for testing."
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
index 036f85b6d4e4..dcd45dc22693 100644
--- a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
+++ b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Framework for more readable interactive test scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild b/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild
index 6215dd61f67c..50dd221130bc 100644
--- a/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild
+++ b/dev-perl/Test-More-UTF8/Test-More-UTF8-0.50.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Enhancing Test::More for UTF8-based projects"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc x86"
+KEYWORDS="~alpha amd64 hppa ppc x86"
IUSE=""
diff --git a/dev-perl/Test-Most/Test-Most-0.350.0.ebuild b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild
index c260fbe6b155..3b2de80efda9 100644
--- a/dev-perl/Test-Most/Test-Most-0.350.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Most commonly needed test functions and features"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
index 57685c5d581c..bf3f6308fa29 100644
--- a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Cross-platform basic tests for scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
index ef7a34cba259..f739a6ead5b0 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Test fallback behaviour in absence of modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
index c82536f9dce9..57f33f3e32e1 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Fail if tests warn"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index 8a7e1de4939e..a3428e4266ef 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="A rich set of tools built upon the Test2 framework"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Text-Template/Text-Template-1.530.0.ebuild b/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
index dc2934839534..b058aba803bf 100644
--- a/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
+++ b/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Expand template text with embedded Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc x86"
+KEYWORDS="~alpha amd64 hppa ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-Grove/XML-Grove-0.460.0_rc-r1.ebuild b/dev-perl/XML-Grove/XML-Grove-0.460.0_rc-r1.ebuild
index 744a2ad80f64..867deb116aaa 100644
--- a/dev-perl/XML-Grove/XML-Grove-0.460.0_rc-r1.ebuild
+++ b/dev-perl/XML-Grove/XML-Grove-0.460.0_rc-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
index cd37a0157c99..e8fe34b25731 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl binding for libxml2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
index 86af50eaf43b..c2db734487cf 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 171987edcf33..02a568f73e50 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 44d762f10206..fff9c6711670 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/bottleneck/metadata.xml b/dev-python/bottleneck/metadata.xml
index 6a33c44cf7c8..a08cd15d519a 100644
--- a/dev-python/bottleneck/metadata.xml
+++ b/dev-python/bottleneck/metadata.xml
@@ -5,10 +5,6 @@
sci-mathematics@gentoo.org
Gentoo Mathematics Project
-
- Bottleneck is a collection of fast NumPy array functions written in
- Cython.
-
Bottleneck
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 01b05f54fdc4..760d4310bce5 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -3,3 +3,4 @@ DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db
DIST chameleon-3.7.2.gh.tar.gz 135311 BLAKE2B da6803bc6c064151b9d0cbe7761bbb44f73b1fd24fcf77d2e906c410768a1c99fa04225ae4aa719282bbb1f4fd0d51a6c710901016bb5c24f78ba2184f978f27 SHA512 3025fa92bdff3279fc404ad08d73d46bee82afd421f1d81982bd5cd2ea3fdffadf22efdb8b66157dbdf4d0cd793ac06b1a0daac4eb17a2a1ce9f14a65d4a6f8d
DIST chameleon-3.7.4.gh.tar.gz 135403 BLAKE2B 5cdcfb60975283a8c4d7623e002962dea336cf4414a9a212e9f9bab10ece4627ec36c80744d91428daea187e50956be89be128f25966e7d6069ad141992cfbde SHA512 429a2ff78b27996ee9c21cbc076614accf328e880f03f084e52395987a36c1eabd679428bf8400807bb909a60a31a5c899218640be0d0230ded7309e9ba6753b
DIST chameleon-3.8.0.gh.tar.gz 135496 BLAKE2B ee21337bb59e4d724a2b9e647af399ceef2946ec3fc4679a78ba79c10ad78c7b41f0585bb0081c02604045e08f126e5f851bdf0c091679561e3591153c49cd1b SHA512 7eaeee53a215fe93142ad57e40d161816fdcfa9a24d68a4648f09ae0a49a2439ccf8f0ace700780025e196471dc1cb8941cd77b120c84876cec77c89e883534d
+DIST chameleon-3.8.1.gh.tar.gz 137012 BLAKE2B 20b0a830ae932ad0e8b28015b233049ee78a74f06f26d2652ee297f366eda6f54fa7650fa20a3c4da3802a2466c0f6a4c4cdfd9608761a20986c86673c61a242 SHA512 d4a4b3ac0b59865a7ea1d9ede7f08d991296c1d08a48c7290b9e2864afa6527237d8dee604114918f3b5035f2cc915bf6218d0758ebcd393f2103bb0751f6ea2
diff --git a/dev-python/chameleon/chameleon-3.8.1.ebuild b/dev-python/chameleon/chameleon-3.8.1.ebuild
new file mode 100644
index 000000000000..6f8ba1fc5c20
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.8.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+ https://pypi.org/project/Chameleon/"
+SRC_URI="
+ https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 5c5eff35de05..2b72be4e4e5e 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
# Unit tests are temporarily disabled for this version, see below for
# what needs to be done.
#IUSE="test"
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 3c194f0a74e4..6b9f45429502 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="ssl test"
RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/cython-0.29.20-r2.ebuild b/dev-python/cython/cython-0.29.20-r2.ebuild
index c536c20a045e..db5230f148da 100644
--- a/dev-python/cython/cython-0.29.20-r2.ebuild
+++ b/dev-python/cython/cython-0.29.20-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/doit-py/doit-py-0.4.0-r2.ebuild b/dev-python/doit-py/doit-py-0.4.0-r2.ebuild
index 94b95b479f33..78980320bba7 100644
--- a/dev-python/doit-py/doit-py-0.4.0-r2.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0-r2.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"
DEPEND="
test? (
diff --git a/dev-python/doit/doit-0.32.0-r1.ebuild b/dev-python/doit/doit-0.32.0-r1.ebuild
index e73b597bd0ed..d85b3b739da5 100644
--- a/dev-python/doit/doit-0.32.0-r1.ebuild
+++ b/dev-python/doit/doit-0.32.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/fsspec-0.7.4.ebuild b/dev-python/fsspec/fsspec-0.7.4.ebuild
index b3b8bc1fa87c..29d487b579e2 100644
--- a/dev-python/fsspec/fsspec-0.7.4.ebuild
+++ b/dev-python/fsspec/fsspec-0.7.4.ebuild
@@ -18,14 +18,14 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
+KEYWORDS="amd64 ~x86"
BDEPEND="
dev-python/versioneer[${PYTHON_USEDEP}]
test? ( dev-vcs/git )"
+distutils_enable_tests pytest
+
src_test() {
git config --global user.email "you@example.com" || die
git config --global user.name "Your Name" || die
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ca23d680582a..f4d64a9d0d77 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1,3 @@
DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
DIST ipykernel-5.3.0.tar.gz 110977 BLAKE2B 4ca23618e25cc4ab4d6e1b0725136594d995eda91bd804611d1707c81437bfa0eef2b0995eb2697f28b119696d7493f6ec8e0c21e0cafb6e791a35438e8dd464 SHA512 c36a6dd4d9dfd52d31a8a37e10aea3c67a7a523ab32db8fb8904f4d90741056d946c265c57354be016d0fa1e4a34f4722c26798a3a7d6b6992884bdba8101190
+DIST ipykernel-5.3.1.tar.gz 108046 BLAKE2B d9018487f6400e5be0a4ea1cce504ba312992480f7cf73ffa72f02d3ce7bea7c985ae16a5f6712dc5efb0f6c92a3bd91c6e1390200f404c70778010f1e1e2282 SHA512 c63bb78d188b47a6b748bb51cc88bd66eeab535bc8d5832e058b8eb5e9919401dac171d5b4d821ba48b7ba1c622f702c0c96ff8f56a07c2ba8b2ae0faed68869
diff --git a/dev-python/ipykernel/ipykernel-5.3.1.ebuild b/dev-python/ipykernel/ipykernel-5.3.1.ebuild
new file mode 100644
index 000000000000..5504b53c5963
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.3.1.ebuild
@@ -0,0 +1,33 @@
+# 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="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/ipython-6[${PYTHON_USEDEP}]
+ dev-python/jupyter_client[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/irc/irc-18.0.0-r1.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
index bc2ceafe82d0..a0838bdf12cd 100644
--- a/dev-python/irc/irc-18.0.0-r1.ebuild
+++ b/dev-python/irc/irc-18.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index c481c7d3e84e..ba042e963429 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 8faa9577fa49..0d07adea9ebc 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index d710dab91887..6f815c66d65b 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
index f2dc6af3ffac..2470aa63d5e8 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
index 48dec9742af4..a8ead7c507d7 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 2a6a242eb065..6231508d603b 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
index e2261ab869ea..a681abb393fb 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
index a87a235485b4..0df1f4d07219 100644
--- a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
@@ -15,7 +15,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"
RDEPEND="
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
index 643134af1a3f..b7609e6be497 100644
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.0.0.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"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
index 9b0b4220a754..880e24684c38 100644
--- a/dev-python/memory_profiler/memory_profiler-0.57.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
@@ -17,7 +17,7 @@ IUSE="examples"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
# dev-lang/mercury: collision on 'mprof'
# https://bugs.gentoo.org/571176
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r2.ebuild
similarity index 98%
rename from dev-python/moto/moto-1.3.14-r1.ebuild
rename to dev-python/moto/moto-1.3.14-r2.ebuild
index 915c8ed2a58b..89915445bd5a 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r2.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
dev-python/pretty-yaml[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -48,7 +49,6 @@ RDEPEND="
BDEPEND="
test? ( ${RDEPEND}
dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/parameterized[${PYTHON_USEDEP}]
dev-python/responses[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r2.ebuild
similarity index 98%
rename from dev-python/moto/moto-1.3.8-r1.ebuild
rename to dev-python/moto/moto-1.3.8-r2.ebuild
index 49ed8ad77927..f930603b5ece 100644
--- a/dev-python/moto/moto-1.3.8-r1.ebuild
+++ b/dev-python/moto/moto-1.3.8-r2.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
>=dev-python/boto3-1.9.86[${PYTHON_USEDEP}]
>=dev-python/botocore-1.12.86[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
dev-python/pretty-yaml[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
@@ -46,7 +47,6 @@ RDEPEND="
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( ${RDEPEND}
dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/responses[${PYTHON_USEDEP}]
>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index ae9ae8dde346..12ac60f540a3 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
index 138fd440b66e..9554d3c09527 100644
--- a/dev-python/numexpr/numexpr-2.7.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="mkl"
RDEPEND="
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
index cb014a08a67d..162bc5eecfdd 100644
--- a/dev-python/numpy/numpy-1.18.5.ebuild
+++ b/dev-python/numpy/numpy-1.18.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index e4146e4f9b3c..8a5e2c4646a9 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="doc"
diff --git a/dev-python/openpyxl/openpyxl-3.0.3.ebuild b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
index fbd7e799e45c..ec5931c0ad43 100644
--- a/dev-python/openpyxl/openpyxl-3.0.3.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
RDEPEND="
dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-1.0.4.ebuild b/dev-python/pandas/pandas-1.0.4.ebuild
index 979f4b8e0adf..3fb89871d2a7 100644
--- a/dev-python/pandas/pandas-1.0.4.ebuild
+++ b/dev-python/pandas/pandas-1.0.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc full-support minimal test X"
RESTRICT="!test? ( test )"
diff --git a/dev-python/paste/paste-3.2.3.ebuild b/dev-python/paste/paste-3.2.3.ebuild
index 796268808c79..5ae4355da8e0 100644
--- a/dev-python/paste/paste-3.2.3.ebuild
+++ b/dev-python/paste/paste-3.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="flup openid"
RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index e20ab55407cc..fdde031769b6 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
index 1bd14f741442..9a7d481aaabb 100644
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 42c032a8b630..9efb85aba5d9 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 2f737d1e5709..dd2ea51d5f2d 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test tk"
RDEPEND="
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index c9c3cf882686..7a88f6f88f01 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ZLIB MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pyroute2/pyroute2-0.5.12.ebuild b/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
similarity index 86%
rename from dev-python/pyroute2/pyroute2-0.5.12.ebuild
rename to dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
index 101c5a98dd3a..c3889a7d63ce 100644
--- a/dev-python/pyroute2/pyroute2-0.5.12.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
@@ -33,3 +33,8 @@ PATCHES=(
)
distutils_enable_tests nose
+
+python_prepare_all() {
+ sed -i "s/^release.*/release := ${PV}/" Makefile || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index abe2b97d2fe5..0449061505c0 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.pytables.org/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="BSD"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
@@ -56,7 +56,7 @@ python_compile() {
local -x CFLAGS="${CFLAGS}"
append-cflags -fno-strict-aliasing
fi
- distutils-r1_python_compile
+ distutils-r1_python_compile -j1
}
python_test() {
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 4e98df61a1ba..16c2973c0bd4 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE=""
RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 1309c5837b86..2b67ec799878 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index d7793ef0daaa..2bb6c613aa3d 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 9fb5ec3100f4..98bce45a1b40 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 46120582cb05..8cf5d7609e68 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="repoze"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
index 4af90af70c2f..91b5a059e8c4 100644
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ b/dev-python/routes/routes-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/s3fs/s3fs-0.4.2.ebuild b/dev-python/s3fs/s3fs-0.4.2.ebuild
index 55ab54b3b1e9..11784c8bcbce 100644
--- a/dev-python/s3fs/s3fs-0.4.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index ffe600b6b29d..7a1e7a2fec02 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 524f91b1ac87..3b0316a978b4 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -5,3 +5,4 @@ DIST Sphinx-3.0.3.tar.gz 5905054 BLAKE2B 048e449603f171d72b24be5bc0fca3465819e78
DIST Sphinx-3.0.4.tar.gz 5909229 BLAKE2B 892b435642be2a6334f93d9f230ec1aeeff8cf7b374570aae66eb341614d4318125920ef0c5593e7eee64e0b8781f035635af71aac34e9c2c6eb20a07ed68d48 SHA512 ec0c2487f098f774452b58d4fb67be7850b4a54b80f2b01dcee990298f59bfede3ca43b28fa992181cdceb07f261abce186862afd75c889c6682338049db6288
DIST Sphinx-3.1.0.tar.gz 5931678 BLAKE2B 63f9d78ea46832fc9ca7122826888abb5b8a6be55e6b3e9015a34bc4186b0544a6c5429be010622fb4794b720a6675b3a89f101446e36327819d5db07dceaa03 SHA512 8660061f3617b00eaf19655256d1b164eb24cc10c7c8016e32cd28d1f81903ef8def0c5da202066c477448f4ac6d764dbd8b1b7179edcb9d00925e35596c4714
DIST Sphinx-3.1.1.tar.gz 5932445 BLAKE2B d98d4e1d546a60217779a071d642cef8c4b703715e212344d904fc343928afe4b21722d953afb67add0c0390633f3c2159b2235d0a5dd0148946ebfbf473c215 SHA512 0c97cab085b1d8152cefde73a7e2116e83426a1ff071c8be9b37ae8e8cf82e9abefacad2cb37a86e1754fbdf57a8dc05ee3041d7dde506fa103babb82c380293
+DIST Sphinx-3.1.2.tar.gz 5934433 BLAKE2B 4ed04dcff4db412ea1f749c0b90d0c38197bbc95607bcc719522f0690d6fd58aa59b87a053c036e9b3c982e9c0f6fa9b6b67f903cb7d9e6fea3a13d99b7be297 SHA512 d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9
diff --git a/dev-python/sphinx/sphinx-3.1.2.ebuild b/dev-python/sphinx/sphinx-3.1.2.ebuild
new file mode 100644
index 000000000000..02e54fb7e8fd
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.1.2.ebuild
@@ -0,0 +1,133 @@
+# 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_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+ https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+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 ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ /dev/null || die
+ "${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+ popd >/dev/null || die
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+ fi
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+ local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index 1e97a2638b10..5d5bd5428198 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index 12e138c7f1ef..b0ad9daacb15 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 99d4ad02aef2..71e78fb0b3ca 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
# no tests...
RESTRICT="test"
diff --git a/dev-python/testfixtures/testfixtures-6.14.1.ebuild b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
index 3367b0ca55c2..3dccebaaf69a 100644
--- a/dev-python/testfixtures/testfixtures-6.14.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild
index 8c88275d13d2..430c750259e9 100644
--- a/dev-python/tox/tox-3.15.2.ebuild
+++ b/dev-python/tox/tox-3.15.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
# doc disabled because of missing deps in tree
IUSE="test"
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index bb72c95335bc..13d4f12b9912 100644
--- a/dev-python/tqdm/tqdm-4.45.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/tqdm/tqdm"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm arm64 hppa sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa sparc ~x86"
fi
DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index 8bc1fbf5680f..211bba3be4ed 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index 4dfc7a77e14d..e673ccd4b407 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index da24b168973c..cf39ace21156 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-interface/zope-interface-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
index 2e38b0fd617e..7d263a4d011a 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
@@ -16,7 +16,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 ~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 ~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 72585a219f04..9f11319e5e24 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
index 48bd743c4e6f..485e9116130f 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
diff --git a/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch b/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
deleted file mode 100644
index d510153ba8d5..000000000000
--- a/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9870b32d31bbe5cddceead54c64f71e4fd91779e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?=
-Date: Mon, 27 Feb 2017 15:00:30 +0100
-Subject: [PATCH] Fix compatiblity with net-ssh 4.0+
-
----
- test/test_download.rb | 4 +++-
- test/test_session.rb | 6 ++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_download.rb b/test/test_download.rb
-index d4a5f0b..d9582b6 100644
---- a/test/test_download.rb
-+++ b/test/test_download.rb
-@@ -139,7 +139,9 @@ def test_download_file_should_transfer_remote_to_local_buffer
-
- def test_download_directory_to_buffer_should_fail
- expect_sftp_session :server_version => 3
-- assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
-+ Net::SSH::Test::Extensions::IO.with_test_extension do
-+ assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
-+ end
- end
-
- private
-diff --git a/test/test_session.rb b/test/test_session.rb
-index a59058a..c398436 100644
---- a/test/test_session.rb
-+++ b/test/test_session.rb
-@@ -660,8 +660,10 @@ def test_unblock_bang_should_block_and_return_response
-
- def assert_not_implemented(server_version, command, *args)
- expect_sftp_session :server_version => 1
-- sftp.connect!
-- assert_raises(NotImplementedError) { sftp.send(command, *args) }
-+ Net::SSH::Test::Extensions::IO.with_test_extension do
-+ sftp.connect!
-+ assert_raises(NotImplementedError) { sftp.send(command, *args) }
-+ end
- end
-
- def assert_command_with_callback(command, *args)
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index eb76611f07d1..5f36fbf2af17 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d2c6a6c08f28..fb249743536b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 8260fe8358fc..af1c64a74473 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,5 +1,6 @@
DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
+DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
diff --git a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
new file mode 100644
index 000000000000..37605d50b649
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+ >=dev-libs/tinyxml-2.6.2-r3
+ >=dev-util/astyle-3.1-r2:0/3.1
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ contrib? (
+ app-admin/gamin
+ app-text/hunspell
+ dev-libs/boost:=
+ )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-env.patch
+ "${WORKDIR}"/patches/
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ setup-wxwidgets
+
+ # USE="contrib -fortran" setup:
+ use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+ # USE="contrib fortran" setup:
+ use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+ # USE="-contrib fortran" setup:
+ use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+ econf \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable pch) \
+ ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+ elog "The Symbols Browser is disabled due to it causing crashes."
+ elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b7df73cb9e76..ace062d0db0e 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index d0956082f816..8ab448765946 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: ruby-fakegem.eclass
@@ -182,7 +182,9 @@ esac
SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${RUBY_FAKEGEM_SUFFIX:+-${RUBY_FAKEGEM_SUFFIX}}.gem"
-ruby_add_bdepend virtual/rubygems
+# dev-ruby/psych is no longer installed and is incompatible with modern
+# ruby versions.
+ruby_add_bdepend "virtual/rubygems !!dev-ruby/psych"
ruby_add_rdepend virtual/rubygems
case ${EAPI} in
4|5|6)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 8384e565d867..5bd4e18eb0d5 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -200,6 +200,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least 9.0 && IUSE+=" d"
tc_version_is_at_least 9.1 && IUSE+=" lto"
tc_version_is_at_least 10 && IUSE+=" zstd" TC_FEATURES+=(zstd)
+ tc_version_is_at_least 11 && IUSE+=" valgrind" TC_FEATURES+=(valgrind)
fi
if tc_version_is_at_least 10; then
@@ -272,6 +273,10 @@ if tc_has_feature zstd ; then
DEPEND+=" zstd? ( app-arch/zstd )"
fi
+if tc_has_feature valgrind; then
+ BDEPEND+=" valgrind? ( dev-util/valgrind )"
+fi
+
case ${EAPI:-0} in
5*|6) DEPEND+=" ${BDEPEND}" ;;
esac
@@ -1278,6 +1283,10 @@ toolchain_src_configure() {
confgcc+=( $(use_enable systemtap) )
fi
+ if in_iuse valgrind ; then
+ confgcc+=( $(use_enable valgrind valgrind-annotations) )
+ fi
+
if in_iuse vtv ; then
confgcc+=(
$(use_enable vtv vtable-verify)
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 3a91c10a8204..e685b46dfdc8 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index b04f6389061e..0e52c75c49c3 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1,3 @@
DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe SHA512 3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
+DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57
diff --git a/games-util/lutris/lutris-0.5.7.ebuild b/games-util/lutris/lutris-0.5.7.ebuild
new file mode 100644
index 000000000000..11cbc20a4482
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/lutris/lutris.git"
+ inherit git-r3
+else
+ SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ app-arch/cabextract
+ app-arch/p7zip
+ app-arch/unrar
+ app-arch/unzip
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-evdev[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ gnome-base/gnome-desktop:3[introspection]
+ media-sound/fluid-soundfont
+ net-libs/libsoup
+ net-libs/webkit-gtk:4[introspection]
+ x11-apps/mesa-progs
+ x11-apps/xgamma
+ x11-apps/xrandr
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libnotify
+"
+
+python_install_all() {
+ local DOCS=( AUTHORS README.rst docs/installers.rst )
+ distutils-r1_python_install_all
+}
+
+python_test() {
+ virtx nosetests -v
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # Quote README.rst
+ elog "Lutris installations are fully automated through scripts, which can"
+ elog "be written in either JSON or YAML. The scripting syntax is described"
+ elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
+ elog "available online at lutris.net."
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index ba12e0718246..11cbc20a4482 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite,threads(+)"
inherit distutils-r1 virtualx xdg
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 90472f8faf03..20a38ba09249 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
index 21f98aa79e0e..6cec1857bb3b 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
@@ -84,7 +84,7 @@ RDEPEND="
pkg_postinst() {
has_version sys-auth/consolekit || return
- use elogind || use systemd && return
+ use elogind || use systemd || return
ewarn "An existing installation of sys-auth/consolekit was detected even though"
ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
ewarn "There can only be one session manager at runtime, otherwise random issues"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild
index 08348f247127..4fea36bac723 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild
@@ -85,7 +85,7 @@ RDEPEND="
pkg_postinst() {
has_version sys-auth/consolekit || return
- use elogind || use systemd && return
+ use elogind || use systemd || return
ewarn "An existing installation of sys-auth/consolekit was detected even though"
ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
ewarn "There can only be one session manager at runtime, otherwise random issues"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bd59d81dbff0..7ffcb2b0f5f0 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index d81a991ad811..9ec9f076d3b7 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
RDEPEND="
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index ab6cb8df3ba5..4e28d01ba116 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
SRC_URI=""
else
- KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1a5db38e0cb9..c3aa35d8e95d 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/glm/files/glm-0.9.9.8-clang.patch b/media-libs/glm/files/glm-0.9.9.8-clang.patch
new file mode 100644
index 000000000000..af763d5b452a
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.8-clang.patch
@@ -0,0 +1,11 @@
+--- a/test/CMakeLists.txt 2020-07-07 08:44:31.304955458 +0200
++++ b/test/CMakeLists.txt 2020-07-07 08:44:38.962844309 +0200
+@@ -197,7 +197,7 @@
+ message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler")
+ endif()
+
+- add_compile_options(-Werror -Weverything)
++ add_compile_options(-Weverything)
+ add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
+ add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral)
+
diff --git a/media-libs/glm/glm-0.9.9.8.ebuild b/media-libs/glm/glm-0.9.9.8.ebuild
index dcd6a2c59118..6fd8711eea6d 100644
--- a/media-libs/glm/glm-0.9.9.8.ebuild
+++ b/media-libs/glm/glm-0.9.9.8.ebuild
@@ -19,6 +19,7 @@ RDEPEND=""
PATCHES=(
"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+ "${FILESDIR}"/${P}-clang.patch
)
src_prepare() {
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 67a80a24227b..f550dd4dfb8c 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,2 +1,3 @@
DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824aa1a083f258f72a63553c0576ba8ec29fe8c3bc46cb80047818bb8ac97765ae7de85b689ac2eb950516531c6 SHA512 3c068e7b2aff4a9aee720ced7afc6bc8b6ec6bf1f2bf0697d486cd68648104882f36b94201dccbf8cb448282998d27986b881c6b784fd9fef86ae72325fcf20d
+DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
new file mode 100644
index 000000000000..f414c375f3d0
--- /dev/null
+++ b/media-libs/lcms/lcms-2.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/lcms2-${PV}"
+
+src_prepare() {
+ default
+ elibtoolize # for Prefix/Solaris
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with jpeg)
+ $(use_enable static-libs static)
+ $(use_with threads)
+ $(use_with tiff)
+ --without-zlib
+ )
+ ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use doc; then
+ docinto pdf
+ dodoc doc/*.pdf
+ fi
+}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index b071e1eb5b1b..b8a65152bedc 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,5 @@
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9
+DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
similarity index 94%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
index 32928b1d770d..a0bbc7073ee8 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -59,7 +59,7 @@ install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_
EOF
done
- default
+ #default
cmake_src_prepare
java-pkg-opt-2_src_prepare
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index a80020d98f48..39301919adc6 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1 +1,2 @@
DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
+DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
new file mode 100644
index 000000000000..a0af9300c241
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="The Ogg Vorbis sound file format library"
+HOMEPAGE="https://xiph.org/vorbis/"
+SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/CFLAGS/s:-O20::' \
+ -e '/CFLAGS/s:-mcpu=750::' \
+ -e '/CFLAGS/s:-mno-ieee-fp::' \
+ configure.ac || die
+
+ # Un-hack docdir redefinition.
+ find -name 'Makefile.am' \
+ -exec sed -i \
+ -e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
+ {} + || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_enable test oggtest)
+ )
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index a619e3ae8876..ef35d7c6f1b9 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1 +1,2 @@
DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
+DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
diff --git a/media-libs/lilv/lilv-0.24.8.ebuild b/media-libs/lilv/lilv-0.24.8.ebuild
new file mode 100644
index 000000000000..698ee9385c5b
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+ media-libs/libsndfile
+ >=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
+ media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-python/unittest2 )
+"
+
+PATCHES=( "${FILESDIR}/includedir.patch" )
+
+src_prepare() {
+ default
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ waf-utils_src_configure \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --no-bash-completion \
+ $(multilib_native_usex doc --docs "") \
+ $(usex test --test "") \
+ $(usex static-libs --static "") \
+ $(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+ ./waf build || die
+}
+
+multilib_src_test() {
+ ./waf test || die
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+}
+
+multilib_src_install_all() {
+ sed -i "/lv2jack/d" utils/lilv.bash_completion
+ newbashcomp utils/lilv.bash_completion lv2info
+
+ dodir /etc/env.d
+ echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+ python_optimize
+}
diff --git a/media-libs/noise-suppression-for-voice/Manifest b/media-libs/noise-suppression-for-voice/Manifest
new file mode 100644
index 000000000000..befd9c55b756
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/Manifest
@@ -0,0 +1 @@
+DIST noise-suppression-for-voice-0.9_p20200705.tar.gz 207467 BLAKE2B d840ed8e8ec61438e582cedec4c20b8ab2358395857a23d655269cae1e82a0888d785ad364fccf619812ad3c92bd720a035b64bb986ab0c9375b727ce2451de0 SHA512 ccc1c3c2daa473bbeaf94aa460f7039863f883216cefb0185683001e8d8271b6a6785350c1b43f14349c9971fb7b74a05659bdd0a28010c54ab4310c94784877
diff --git a/media-libs/noise-suppression-for-voice/metadata.xml b/media-libs/noise-suppression-for-voice/metadata.xml
new file mode 100644
index 000000000000..f4c696b2c619
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ Rick Farina
+ zerochaos@gentoo.org
+
+
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
new file mode 100644
index 000000000000..a1cdfa9d083a
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [ "${PV}" = "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/453a8af82a31a5361f6a13bf95c97686f0a2acd1.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
new file mode 100644
index 000000000000..021b5fe5432f
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [ "${PV}" = "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v0.9.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 4971276ef942..b3191d7ceff5 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -8,6 +8,10 @@
media-video@gentoo.org
+
+ mozilla@gentoo.org
+ Primary maintainer
+