gentoo resync : 03.07.2021

37 files changed, 388 insertions, 117 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3360b48073d1..7cc9018dc326 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 4cd234214240..2be62b6ab6aa 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD c-client-2007f-r6.ebuild 4516 BLAKE2B 5b07b16a823e11919ab5a0a6e60224b0c1840924f13d4a5a15cae42dddfae7c2b20711b7c0968b64e75cf60eb3cc0b6df99405abaebc7fd5d7623ab27ba8b095 SHA512 dd29dfc15736c5e4146eed8722cdad59db64871d060c1938c4b6c444b3a3ed412aa144d7a3f3e15c32997258382e52d39d67beb1f1f3ab0f757cd2e27cfc8608
+EBUILD c-client-2007f-r7.ebuild 4549 BLAKE2B 443ae180f157b7bbc06728b03628b0548e839b595d65d6934a812fdb457f510924602ddde7e0fd9a8a6f30885cbc2b6d004bf584f76f16c63e5e67ce179d6868 SHA512 915e84e19b1480fc187deb6f66fa32cd8209d737f45cbc2d46eda0dc37e121860f77b07fae0bc5bf559ff4ae88d8c21aea2cebeb9fb47c81d40ea81fd40dff32
 MISC metadata.xml 480 BLAKE2B 1e688b1b8c76882dfbce8625873104438c89652149a9a14069d8692a469101fb7cf4036151e42f888558d8eb4062817f9481e9552b4882bd285f1c73ed821364 SHA512 b59bb7820763cb1c5dab4b0166fafc424fa76aa24465c44c7314ca8ed0b0f0b4d5066fca335cad963d5c4737be1b1d02ff929f0b2a5c5d234728669ddb5379a9
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r7.ebuild
index 659b62e505a6..afa0c1cd8f11 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r7.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit flag-o-matic libtool toolchain-funcs
 
 MY_PN=imap
@@ -20,15 +21,17 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa"
 
 RDEPEND="
+	!net-mail/uw-imap
 	ssl? (
 		dev-libs/openssl:0=
-		)
-	!net-mail/uw-imap
+	)
+	kernel_linux? (
+		pam? ( >=sys-libs/pam-0.72 )
+		!pam? ( virtual/libcrypt:= )
+	)
 	kerberos? ( app-crypt/mit-krb5 )
 "
-DEPEND="${RDEPEND}
-	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	# Apply a patch to only build the stuff we need for c-client
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 9d41a1b8f29a..d3a44bef3295 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -4,9 +4,9 @@ DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced59
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
 DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
-EBUILD courier-authlib-0.69.0-r1.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
-EBUILD courier-authlib-0.70.0.ebuild 4460 BLAKE2B 8dbc3fdec9cdc5d9492d500630fe5abec099ebabdc29bc8670d4a945e34550ab8df4875c79e4bd81ec46457c220f5982a2a9b2d50472de821c385b89dfe4e99a SHA512 d35c6a06d8508ddaaa8742f651dd99626249db8b7da85e3745cf1a51a58eb18de3bdf1d04df61d86a81326cda1521ef38675d7fcbf52685c3b7c4c8831feb8e9
-EBUILD courier-authlib-0.71.0.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
-EBUILD courier-authlib-0.71.1.ebuild 4462 BLAKE2B 77343ec67e0a1806f6545e862b2f500c0125aa67e647d03083d888b623ceaa7f6d419628cf4283953919227f6c9ec79842affe91eb5b9ae731865363aa8a3c8d SHA512 cf377d4ea863ff3ad206f2a666c0c89100dd75bf3d1241a4d64695561468e8db97d6f81025c84d6a6c8f54ccab56d48496f7b3227db2ff2850f4079ef6e2c4f6
-EBUILD courier-authlib-0.71.2.ebuild 4462 BLAKE2B 9b46449737236b73b6d83517d3352d5f8ef72983de1d0dba0c44ba668a0f4d3ab9e2e75382cabfa7c3aeef60168abf2018b7d912582bb6d3332fa012a6e4d500 SHA512 69fe0dbc5cc4a8e440be73bcb7db560afb89395a6ea964645a7acde6b7d56382e53f92c1f70381eda62c395358602aa155a47d4bb09fee71fdaf061b50cd6e0e
+EBUILD courier-authlib-0.69.0-r3.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
+EBUILD courier-authlib-0.70.0-r2.ebuild 4470 BLAKE2B 1c1dcbde260e5b444297ed285da434310f860d9244a81d707fc9cd4c1909beea24bdc9ef58976ea39a6cbeb9b21204355bed0f3a0c9e2b7c08f05d1970c5c21f SHA512 0fd647c724cadf384242261bc14f7a2d1286ca9bed7fd4d433c32e536488736076a34609371cc597423c03680c3109da6667dbbae9e9d0eaa4be7dc0443d8ae8
+EBUILD courier-authlib-0.71.0-r2.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
+EBUILD courier-authlib-0.71.1-r2.ebuild 4472 BLAKE2B 6b0fcf845187e296e305d7c09f6e5cc29ad0447f04af56313a866dfe5a7d94b9b86e6f2804be1d31c913004eb0fe6053fb0528377e49aba71583d1a8a58f9353 SHA512 c4e46181e82bfaa7a6b24e53675d04d6615324ecc348ba018200f44bff9f0c085a9e8ac0f70fdf9b432cf7eec58e9b6076518d6337019b4e5d08907694821a37
+EBUILD courier-authlib-0.71.2-r2.ebuild 4472 BLAKE2B f0dd169000245ab779510f2ee924fbd3be8d10c341fdb9c95fe42e1f13266b7eb08dee3ac05e5aa5373f48ec9be5606271ba8ae25950b149cba3b1f95fa5f0dd SHA512 1a038d06ce25ede4b4ee0b99a796dd03b43c7328298df7c2a9d188a4b8999a495b178306951cc0919c98a823b99aff14229460b896035ac5873d720223f69616
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild
index 1f4954c3e5e8..cfb9546ced48 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r3.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+inherit flag-o-matic
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/authlib/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild
index 4627dee726d5..550f95917095 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.70.0-r2.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+inherit flag-o-matic
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/authlib/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1.2
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild
index 1f4954c3e5e8..cfb9546ced48 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0-r2.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+inherit flag-o-matic
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/authlib/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
+	>=net-libs/courier-unicode-2.1
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild
index f65a8c7d1d26..60d2a698741f 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.1-r2.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+inherit flag-o-matic
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/authlib/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.2.3
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
+	>=net-libs/courier-unicode-2.1.2
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
index a0536faa59ff..d6f766f1d735 100644
--- a/net-libs/courier-authlib/courier-authlib-0.70.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+inherit flag-o-matic
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/authlib/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.1
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db:= )
-		dev-libs/openssl:0=
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( dev-db/mysql-connector-c )
-		pam? ( sys-libs/pam )
-		postgres? ( dev-db/postgresql:= )
-		sqlite? ( dev-db/sqlite:3 )"
+	>=net-libs/courier-unicode-2.2.3
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index e35b71d283ef..5bd22876ca83 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,4 +1,4 @@
 AUX cvm-0.96-fix-test-padding.patch 971 BLAKE2B a0a6dbd617427347a4b93b436f326d2cda5bd123adb6410a29f4b5955f014d078935cbf7178a1857941fa09ace013a5800f615cc0a5067dbfca10b228ec0e758 SHA512 18fa658e70030709fb83b81311a13358b09cc872ea8bb9db91ab78ea56dea13459f0bdf8e02bf8c6045c8838d7ea1941f73d0c405fe3b38f2edcb29a9cc200fb
 DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
-EBUILD cvm-0.97.ebuild 3237 BLAKE2B e4c0d2bf498717fbd4aba72e42367822310f5f4e34d498b7f55381e259f2ceb28d60b0cc7237cda14f52e3a55e0bbaba86a1e6063f8e3d207dc3386b54ec51a6 SHA512 e736a653e6f85dbf1efa5b6af80852bd3e7263006792c4232ef5c41edb950f722576d0e4f00042206cf2665d49525cff688900ceb02637b804e605dc014b7a49
+EBUILD cvm-0.97-r1.ebuild 3257 BLAKE2B 6fb554622f54f07b4963342123ec0d9b1bf4540ff73828c5925a965ee80590dafeeb62721e6273f4168c04710d88747423028cceb3cd5bd6e6c2f676a5158e31 SHA512 0f97c575d47253fd9cdd5ec543db3398f72b29b27f73a61ae15039ea2446c2b8942b795b6e47e7a1cbcb8b43d78d854bbda03e7097daa7f36fcebf10c6e628a8
 MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97-r1.ebuild
index d69c9a394878..4f0ebc583cec 100644
--- a/net-libs/cvm/cvm-0.97.ebuild
+++ b/net-libs/cvm/cvm-0.97-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,11 +16,12 @@ IUSE="mysql postgres test vpopmail"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/cdb:=
-	>=dev-libs/bglibs-2.04:0="
-DEPEND="${RDEPEND}
+	>=dev-libs/bglibs-2.04:0=
+	virtual/libcrypt:=
 	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql[server] )
-	vpopmail? ( net-mail/vpopmail )
+	vpopmail? ( net-mail/vpopmail )"
+DEPEND="${RDEPEND}
 	test? (
 		app-editors/vim
 		dev-db/sqlite
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 4f9910a8955f..3a9b892e41a3 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,5 +1,5 @@
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
 EBUILD grpc-1.37.1-r2.ebuild 2717 BLAKE2B 4b806690625388aa29ce60f40ba918ebacd2e384db9021913dc5e1c61575bc8c5a2382ffd38bc02af8e004a5f4ddd7daa70ba72636d1f0b04bab8f8588f8204e SHA512 e9d838e67b7c8554fc53d74f97b15c431364107b2f50b9459687bd1bb90fa6e3f68a9358fe347011809597da3c5cd39ff195719881e3af8265e9d5da83705b14
-EBUILD grpc-1.38.1.ebuild 2724 BLAKE2B 94125171cf31eef783067a666977e7b853f4003bd3f3eb1dbc49735bbc43ca17cbfbfe3abe16096f74ba69251d547efa64c9d4664b472c685d07512291f8b7bb SHA512 d7e442e456c57a85b747029114a217275e0da072566aba189e885ed849ea1b5b69bb08bec7cd578ba7a298655d9b97a2eafede32087134f8b4c9ec80a7e36f08
+EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/grpc-1.38.1.ebuild b/net-libs/grpc/grpc-1.38.1.ebuild
index 6f34a08a4986..d8cb707cf8aa 100644
--- a/net-libs/grpc/grpc-1.38.1.ebuild
+++ b/net-libs/grpc/grpc-1.38.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/16.138"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index ccc775bc50b0..8c813c39777a 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,5 +1,5 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
 AUX libgssglue-0.4-implicit-declarations.patch 474 BLAKE2B 578c3306d1dc40165d20485dabac62f1a0d211e0ad3e0d54f79f7330c3ec7c26b0271345124b459eb576571735c9e3ec79687c1fce433fba5501a2b9ff59fcf9 SHA512 1a76bb2b53baa8277e117d8161cf186c569ae1d2e8f368a17378b33fb623e0be8b76ef6c36d413054d5501f344093be7691ea6e042b6367619de6079cd116c07
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
-EBUILD libgssglue-0.4-r1.ebuild 896 BLAKE2B 9741f96397e3958ade13f0d8fe25199bd176374e1b48a40e6f93b988502993428d06ba117977fc5c7b01e70826f601417e7cb3bc05be1cb6da9b3c1709def025 SHA512 4ca2aaa5004eeba87e5937fbdfe5782291dda2b0b43cd73c7b760aec9b4983114d43187e1660f07aac30d5f902ac6a30bc5ef5dcca4fb8729b2601a1d085b9e4
+EBUILD libgssglue-0.4-r1.ebuild 903 BLAKE2B a39345262e7bba32ae36f9f5eefa51c67ce2a9b5f814eb7d039b72495705242d9aee2f051ffc28cd3376622f5e60e2d520334c4d2c622aebae49ed0437119cb5 SHA512 46e8474611fc03c69c8de11c3f5bb5d106187e0a49b53284012262af666cdc31cd5eedbe70aec7c627d711ba9571307ec68a6735a9a7fb76106c6c1cbf17c5bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index 1229298a72c3..d04b52856929 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 63839c815a58..4325b31ac605 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,3 @@
-DIST libhtp-0.5.37.tar.gz 497609 BLAKE2B 74dfe93495781fb918b4703c5f9a9a37abde3da8833b8b17c183200cc04d5abb20b1dd28acfe9cc5eefce486b5e29c381077d75fe6a0e1bd584ceb3a1d19d93f SHA512 e2a16862703e2541cecb841bc93fe1ea72f580fb5ed2c54583072bee4843b41510dae53a0e76105d2ee2e06ea5e3410c280296a98fbf8e24f7cf2705356bb9e2
-EBUILD libhtp-0.5.37.ebuild 856 BLAKE2B 99f95548fcd40c96a60ffa08aba47ed8c6fc585716697693f075cd112504836ca1575be342333ec6d00e21a22d21821d71073cf50797201bc32078f43b6c78ac SHA512 259c0095d1e8ba86b5c3013493d5a8d83dfb81149c1dd3b6721d1c771bb2f6674703fff1938967f572a255d956d1675bd3db327de809eaab87c25f4cda934d0e
+DIST libhtp-0.5.38.tar.gz 497753 BLAKE2B 84c4a89914dfadb9e3ab076e6f2354034cd384e7e76c9cbf00a7bf344cfcd7c24de200bd1af7f37356b00fbe13196fd3e49896f301b75fa05ce5b4e4ed297115 SHA512 6f2aa3b564948bde738ff60b917d64ffdcb71bbd5b25f11270ce16400fab6b8aab5c0e2372aff7f6be8818efab4b90843df527604835547691a4585fec9a19fe
+EBUILD libhtp-0.5.38.ebuild 856 BLAKE2B 99f95548fcd40c96a60ffa08aba47ed8c6fc585716697693f075cd112504836ca1575be342333ec6d00e21a22d21821d71073cf50797201bc32078f43b6c78ac SHA512 259c0095d1e8ba86b5c3013493d5a8d83dfb81149c1dd3b6721d1c771bb2f6674703fff1938967f572a255d956d1675bd3db327de809eaab87c25f4cda934d0e
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.37.ebuild b/net-libs/libhtp/libhtp-0.5.38.ebuild
index 52f8e32728c6..52f8e32728c6 100644
--- a/net-libs/libhtp/libhtp-0.5.37.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.38.ebuild
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 8374d7b798de..11f3de110a9d 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,7 +1,7 @@
 DIST libnetconf2-1.1.43.tar.gz 295502 BLAKE2B 49bd58d785a0b7b132c4503b0b8a823ff3578e6e1d30e0c0e4aecf6ebb6f769f465069ebbfce7fd090e64e0b798ab8977535c634f45e677cec00d7c73edaee20 SHA512 2aff10ef003d5ee1f72a3c01a0fd07f7a1ac3b1961c88a9616632255d7392d386e0acad97fc68b3f5f1a0b4804dcb0900afa625208ab0dd33cf03706f7a89f5d
 DIST libnetconf2-1.1.46.tar.gz 295868 BLAKE2B ac20dd66c779b9b509f09c1a45224679e2b5701758cf04511c89be90c9ba065c1356c3f50026fa9f6a2f83530437b57ff38ff5977557a9faf61493e0d47f69df SHA512 e1ee152499113f267c3cefbb43f9049ba61fc97228311cb0a68f457aec620059132996fa1878a081e99cfc005d709954282729ace4e937644b4b557db3b3db97
 DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8
-EBUILD libnetconf2-1.1.43-r1.ebuild 878 BLAKE2B e573672812370de3c8a2cff01a8a6f49107f0f9795580b5dc21ab5fce54eb10c915365d0e56de6084cf8834d79c4c8e82b59a574ceb4d7c733a985a78e89776a SHA512 15832faa005c46ee535eb3efc4a33c30defbdcd94d3840dd888edbe201043808204703b80097de6378a128d6fa32e57f5ade59438ad80b7a8d946ea4d1b798bd
-EBUILD libnetconf2-1.1.46.ebuild 885 BLAKE2B 4f6bb014eb66d0ed29ff8cc0614b833fc097e2998777ab2a4b85fc38cf4a54452c51a5bfc14e2b1215ed651df3335fe9f903612e65b957aa6c4545669081d692 SHA512 f46ed7aefecf8691744ecc60d8d03301293016dc7c9ba97dc63344a8960c59cd97e3b5a2bef1d24142e80ca43a764d13d8ecfe84f3e96e7a8a7c9bf07925597b
-EBUILD libnetconf2-2.0.1.ebuild 851 BLAKE2B 89b4a2d10b2854f7de7d69c52b440ffca2838ac9aca2c14845a775411cf58376abb12e9dc654b77be427a8b1f44e7d8fc24514ef578f9d01d885fc0e1dffff0e SHA512 962fe890bab221aeb26ce205c3e588a39543edf7579b3347a87aeefe2220516a8b736a2ab37dfc181b96502bf6b44a3d4bd85f71f4c6ec1d07391ffabaa0c355
+EBUILD libnetconf2-1.1.43-r2.ebuild 898 BLAKE2B 2a64da7fce34e499bc0790687d89fec7d11c5f9b6c0b76a0079f918b619076feb84ca695062abaaf89d46e7adec50fd65de0682bf4810ae9beb0b2119c4679ee SHA512 d8cb9719c0f5051efa69060e01e0397c563a4bd3b03ac364259798039710d2f6191c170c2d3718cc34aa0dee4852b7e8e56f029ff7f43d230eceadd80fe390a8
+EBUILD libnetconf2-1.1.46-r1.ebuild 905 BLAKE2B c105df3d6811cce4b1571cecb84dc4561b6fd8a6ac622e67bb22f1f76c2d149798f082962dd18fb3781edc81ceaca454ab2c9a881bdaa0ebd1ae407897985afe SHA512 6c151fc3bd6211c3c6f94d752666d7665f2034e1cc7f97f356b1eea8f299aa2ba99f4e4ca6993cb47fbe0862acf68787e6f78ec077ed3e002a5ae2b933c17e1b
+EBUILD libnetconf2-2.0.1-r1.ebuild 871 BLAKE2B b307c6f10b17a0c5d3c64e0d709896346fce387c9c21a5b0f4e826d64e46e34aaa0608a0e23078226a2de8b18b8a368e323cc38a7b079638f48ca18fb1a26e63 SHA512 5901a352c3e85fc2a637e4263ea7fec8b7b1fd27a0a0836dc3b70f96fb9e233f55e6f45afe7b309d9cdfc7a579287d9a082833e9c2ccbfb2065208a680705d36
 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.43-r2.ebuild
index b10c5a5824c7..42b6d78e49dc 100644
--- a/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-1.1.43-r2.ebuild
@@ -19,7 +19,8 @@ RDEPEND="
 	dev-libs/openssl:0=
 	>=net-libs/libyang-1.0.225:=
 	<net-libs/libyang-2.0.0:=
-	net-libs/libssh:0=[server]"
+	net-libs/libssh:0=[server]
+	virtual/libcrypt:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.46.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.46-r1.ebuild
index 82bf4c2b9ca5..ace3a6b68770 100644
--- a/net-libs/libnetconf2/libnetconf2-1.1.46.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-1.1.46-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=net-libs/libyang-1.0.240:=
 	<net-libs/libyang-2.0.0:=
 	net-libs/libssh:0=[server]
+	virtual/libcrypt:=
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.1.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
index f0a8c42ffd2b..6f7150129f7c 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.1.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
@@ -18,7 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-libs/openssl:0=
 	>=net-libs/libyang-2.0.0:=
-	net-libs/libssh:0=[server]"
+	net-libs/libssh:0=[server]
+	virtual/libcrypt:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 22e3f75d46a4..5b8ad2ff4226 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -5,7 +5,7 @@ DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31
 DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
-EBUILD libpcap-1.10.0.ebuild 2416 BLAKE2B f7c316c08ead5741042b315d93cc8b0cb76d29ffd1a94fc46b29ffb5278800f64891c92a21d134c03f302f5e3775d6068f2d09cf28073d8de52f50c294fe963d SHA512 d0540c69b9bdb36d5082ce3b0343e14aa9ff0b7523315511697ac18088297aa5bb1d8679888184a2b71ff41e9199af0a00beb3265d05774b99e15142f5c8cad3
-EBUILD libpcap-1.10.1.ebuild 2423 BLAKE2B 01b8fce44be6b3196e4632c6ff4a2fb038ed50fafdd24e72d4bfda2954fdf499c7e98dad7a5910a4803206056c4ebd20515dcaaa148a6ab906fc566500ea985f SHA512 434c79ba8146210357ef403109b8bf21b631d73786eccbd8f78693b5544be90f494ee8ff183d5a73230920fd21b0fddabb0009dddaf3d0782cfec1785989558e
-EBUILD libpcap-9999.ebuild 2307 BLAKE2B 8c7a39c7edd37117c7c91bcdd901354be1e0ffee5adc09d7ba8d4d89d709daa9510b5b27fca92789a3890c08d5761a719d1629db88ce648db42052a0e00269b6 SHA512 2fb3b924dbd7825e2f7983be43f939bf61678a233777e5ff254b4ed1ae364a9e53c00854e840a1b8fd472580299ceb60670ebd1489a7bff0c126586c318655fa
+EBUILD libpcap-1.10.0-r1.ebuild 2468 BLAKE2B dd8bce22814088bf47f61664bd186b258e08bd0c2efc41816abbff8139ea7df8b82281a4e5576045e53e2e755d71d9ead320531a2761ad3a26a8b52b15801286 SHA512 69aa5b060522c483eddf233167269245c5a2f399934def8ce9c19da80dcde3be749ce8ee73b55b1d31c2a4bf556f1ffc46f82933166bfcaae9a4b2eeadd54bb1
+EBUILD libpcap-1.10.1-r1.ebuild 2475 BLAKE2B 2e493cd953d9927e73aadd6fd5cac7f6c29fa062edc88e66f6933960587e470e3883f6855a9668ffe9e2d611bafcfe3014917d6c12fd4ca6e9e5dabd14a46715 SHA512 afe293e213399108758a2d82702f2758014b2b6695e39c288cc38f17b99308df201eb8882b5dbf2eb6f7f9dc4c00df33af4ab5a72e46a86602fa5722e3a631bd
+EBUILD libpcap-9999.ebuild 2359 BLAKE2B 2f62f50fd3203f17265ae84816ea449d6952ef931b35ba9ee58854d441960403c116eb89bceaeb4b62501c6babd6860d9ab8ee6614e3e6fc31075a53ad708aa0 SHA512 2b4dd339cae5c66a3f695324393e1972761c2dba67cd73b14b7c91c23552e411bf32950ad58edbba7bf57e4684d358d2acdad04b24cd164888bf7cc445f026f0
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
index ead6948c37ee..1648d8b9e24b 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
diff --git a/net-libs/libpcap/libpcap-1.10.1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
index 16825c3bbf14..7384a1bdf841 100644
--- a/net-libs/libpcap/libpcap-1.10.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index f7cc40d1b868..9e6f60a643f1 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 1e93ce27cd38..791963bc4220 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -9,15 +9,17 @@ AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
+DIST node-v12.22.2.tar.xz 23665228 BLAKE2B 2213029c3a819981bab8b50d3e5d1a2f4c05bee797cf0e5f28d8bf621ac394b14dcfa63e682a00b21b023579155f2f373d21ff75e2fb2f25af484a02362cdd29 SHA512 6722498b51b7240d08068687e015920189a04ce3a19669089f96a15eafd14876db3dc49372674177f0d78bebc31eb873e22a07947a8e156ca5d3e240a42b8cc6
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
-DIST node-v14.17.1.tar.xz 33580416 BLAKE2B da5234087945327fc7f3a666a8869426ec5adff3b31b800c59135d9937507bcca7be3c8ca6720c2593b45ec6a9b49c30f71dadbcc03dc0a68c082e3f1746e6df SHA512 354f9f215a4915ca3dbccdbb90c14fb8bfb8b0ed8ece4f95106d7b068affdeab65a79db0beb2c7d6af03dc15567edc5250629deedd38a9de7d581f76716315f8
-DIST node-v16.4.0.tar.xz 33597252 BLAKE2B c43543057f58ed706e525db9956cb258ace88026c9ef1c87d85f07bc02bb382482e9044748b6c865d913ef167544f089e9c5c11fb00c2f0fa7ca9e6bf8d06de8 SHA512 c4e12d8e50c26f21170e998a209d060acfac792bf2a5970efc482f431f483841d40427aafe72a63d5b2bd2cd8d5d1fd19678105ab9b1265f68de6359d98fa1a3
+DIST node-v14.17.2.tar.xz 33591952 BLAKE2B 4bda55df738a0cbff706be29324971cf8b1d2e0eeed2bcabed72aed52b06ce375c49428b5edfa425aa6523ac5c00850229f3e6ae9e5de842ab2d86507b1d64ab SHA512 c974c6948a2f78951f23b007e03b141f69026096c470b66fa905a05f78942617d92e2aa5e3d51686c1b13814e754073724f3b40e4732dd6bb7f2c95ec00a7602
+DIST node-v16.4.1.tar.xz 33583984 BLAKE2B 24dbe2c9a07212a2911b55932fc6e5dd0d83f2d5a07ac6a16dfe2359c0cbaf87d5b52ac12b4be7cb77fe63c61f79f598235c7ba43693b4dd7d71bb83c478ee73 SHA512 ce01440a737f063fff84a3f05c54e85d8f85694dfea69c45cda4de2f0ab1e8e778f406b3ea989665b1af218d1a6c33a8e25019e986d345f5dccfc913a52deffe
 EBUILD nodejs-12.22.1-r1.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
-EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
-EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B 9f8bfa1c3d01f79f62faf84764279727eb2bb27909c51e14dfdbd3540b8ea01e17b6eb789da165e309d5876fb362ef84b92fd63eeeff6aecd00ac0323231461c SHA512 f52f9c57ec23e60949246362205bcf3f5f61314d81c22c291caca23c5f706ae799e00456b387a3f375e7fc9e8c0f037b7de44fd14c1b9e1981bd7f56158c842a
-EBUILD nodejs-14.17.1.ebuild 7039 BLAKE2B 4715929679ecba85fc3029a5478188470d4a6565225b78a5a6a79a6c3eccbff9ea1125a132eabd2cf7249d16568fb2282c6ce8c477b4f080b9b8328e2d50d52f SHA512 d5a2a42472fe1c60730a8d06bde1243e31e3ad2900ad407f79ba66b0f28593962afa318ae35178f6b50995245032160a024390672dba84fb018be081f9f0ca26
-EBUILD nodejs-16.4.0.ebuild 6557 BLAKE2B 61f509e6ac25c26baafa2719dadc79f97f0539ea381a91bff6f2fd783222cd1b7f4608ec5ff981ae91c1df03e41c1d41acac0b35b6c941f937709b54acc99810 SHA512 c3b2bce4b10457bc2283d3911bfc17f460b0d916ca82ad26cd15a2af821bd179f10afd03f68f6f62b50a035fe05a91d01072daf62847a739421830e6b84ab986
-EBUILD nodejs-99999999.ebuild 6483 BLAKE2B a5d15db975cc25ebe8464c99f57ea34a7fa2c98a8874251a9e6bf6b9772040cea6455e31722b4796e17115b83a0363416985864cbf42045e2dac044214aba05c SHA512 1f7dc8503e02a11bc408c0ff476f10f5e056efe19bcc2cc526a214a8aee61439762d8e963ce8288cccaf3f51b78a4a461e9e587e485652fe7068cc9ecd125ee9
-MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
+EBUILD nodejs-12.22.2.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
+EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 424c91ecf24cfc9777aa2302a6c0a842429482fbf57a7bc8570721e7ba64da3d4611023144dd3747cb438a4512f07bf6ef8f8089eaa17b09ab9efd02cc3ab140 SHA512 36b29089855c5de94bd109100de3fe9ffadea6148d3d8f893542b67a09f3db1652a1e5bc134b64116c880a2c313418b4bfc369912f5c6e1444400af3a814acd6
+EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B ba0217877c72fbbaddcee000dc8b26a4b84961e619e2301a6d3db10a3dd00eab73c38ca87028a7ed5ccde9aa4ad4923c8477459e891b9b26c9cf0bd3d75b7667 SHA512 beab17b5202435e43f2fa5ef35e8adafac64b713c6a1004650eb6aad7b0d4870f54dbb96088a8d9949b7272e3d38f946813af83587ef04abb24b168c950c0244
+EBUILD nodejs-14.17.2.ebuild 7039 BLAKE2B c7da8b757fb4d9005d5f4fdc56f796c1942b437a2328b2754c2d3348511746cf6f8dc821aa51a4a72b2370169ba7675e61d1bd30560fdfd5aa905ce26283b0b9 SHA512 ed81d9c85b32c9ca09791415bac534eae905936ff9bb9f96bc6ec4a9d7506ef22fb368f27d865aa2cf6452508e9eabced88f2d659be3242c1da5ed4ffe8513f9
+EBUILD nodejs-16.4.1.ebuild 6557 BLAKE2B 2cdad96f1bdba316385661d349b07791863ec9049743e8b9eef509aa7aa9eb41bad55d6f3bba8d2011a2ec3a3c3349b7c12cbb3aa9f90cac5fb43a061782d022 SHA512 db8c7d0615cefc6a03a08861a5d121ad73bc07364ba7e1ad4889fa08dd542f9d686751ab0936fd032aaf7db6e557a4f56d2145ff91d07477509ebfdef1bd644b
+EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d6f89474114f81e20edeafc824f96cb0ce23d9523439274ac51024e5632a03aa2d74878731149fea994d1a6474aff7936fd3247904d8d7db6cc29d96c3bad7ee SHA512 bbe34c8746cbc2c70cbe36f1da08ee32009f058ce2fde2b35095c1ed3582d67cfa10672b3901cf38180058d2452a6761605017ac84b63f993c42da0d731b9851
+MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 15befbfa251b..33f1fbc671e1 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="lto">Build with link-time optimisation</flag>
 		<flag name="npm">Enable NPM package manager</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+		<flag name="pax-kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 		<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag>
 		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
diff --git a/net-libs/nodejs/nodejs-12.22.2.ebuild b/net-libs/nodejs/nodejs-12.22.2.ebuild
new file mode 100644
index 000000000000..9c4fe05c005f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.22.2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild
index a8e2612d7c83..45b882f86ba9 100644
--- a/net-libs/nodejs/nodejs-14.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -37,7 +37,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -89,7 +89,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	default
 }
diff --git a/net-libs/nodejs/nodejs-14.17.0.ebuild b/net-libs/nodejs/nodejs-14.17.0.ebuild
index 6f3e887f73d1..c27716a6b0b5 100644
--- a/net-libs/nodejs/nodejs-14.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.0.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -102,7 +102,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/nodejs/nodejs-14.17.1.ebuild b/net-libs/nodejs/nodejs-14.17.2.ebuild
index bccefc5543bc..a6c178ef153a 100644
--- a/net-libs/nodejs/nodejs-14.17.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.2.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -101,7 +101,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/nodejs/nodejs-16.4.0.ebuild b/net-libs/nodejs/nodejs-16.4.1.ebuild
index f4221d00ab45..15a3869fc671 100644
--- a/net-libs/nodejs/nodejs-16.4.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.4.1.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -97,7 +97,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 5177302ec77b..1141e04146e1 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -95,7 +95,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index da58ea2a7573..387ca96fdd7d 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -7,7 +7,7 @@ AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae27327
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
 DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f
 DIST xrootd-5.2.0.tar.gz 2935040 BLAKE2B 1aa58ea188faef3e3691e77b08529d14e0bf04c18127b8b8ae6a7154700af67b1d900b64cf4f505b90963e2925e32935d4bcf9d1d913ba0973713b5c69301dd2 SHA512 cfd41d2e678ad339677abb62f329828de368ea5af9c9103722b75bcbb0812a2f1695986ca953651e2418fc839d7a50072635b806c9292aeaff702e269bbc11da
-EBUILD xrootd-5.0.3.ebuild 2639 BLAKE2B 53277652dfe77b32d5dbeb98f1aea19900f68ae5de1f700191dc08d324e4cfbb068883d9ce2f6bb517389279b6eb884997c4df40d0c9bbecf32a51ee559bd3f6 SHA512 a60b4f76c8e052dc37d58f507704d8013cc8f170b4f24555055b0e0761ec2a6b0bdfd24432de468c4211dade85fa5674a2afd04b601c52980c3648c54bc06e36
-EBUILD xrootd-5.1.1.ebuild 2641 BLAKE2B 667907d947a41fc82698201b7cc7d22ec1cd3263670d9208ea65a0670e7224e38c8daf6a2715f8641e4756cca702f4ca925f26c5320afe9b1200f1b54739bc17 SHA512 7694c5f863ed39a248284836fcdd44b9bcde6aca22dbfa1ff7a9c8cee7edd7cbb1186e4e5bc6ab4e2999da0602c009854c25253002f7122192699b3d766903e4
-EBUILD xrootd-5.2.0.ebuild 2642 BLAKE2B 388822260154b77240858457cd65b6255be70d577d4352aaf8de458d538a38fc61e9caa9a095a08699d3835756f721730264b1f31f0d354b938de08a2aa33915 SHA512 884b84a2412ead649c63d23d06c0a6d5693e8b14cd96d1655e4e137bbffbda9f40eb7755fb16c42e05bb210e9052b8f1c5965f7ad18675eee3b3f3a4a4a02c57
+EBUILD xrootd-5.0.3-r1.ebuild 2659 BLAKE2B ef00e762b9a87844071def65dc36e910ac6983f307e34d0c9d788e50f0d4a8ac62fb0b448298309f682073a467213a11e1eab3f918a7692b1e7f2715800add77 SHA512 c7dbe619f7d07d208bf0f7b13d6e56ec7b607e59a30f610cb00842ed7414661b945e2d978bd296af7317eb0259e92a16a1fc54b3e5e60bb9c6ffa7f4dabf1d5a
+EBUILD xrootd-5.1.1-r1.ebuild 2661 BLAKE2B 74ac0bb6b496b92b34c356531719bf8cf11ecd2b626fe54deb3236a5a53d76ee879f8ab9974546f8b4e4365aa7079a34705a3c4d794384fc9f802c71fd1517d4 SHA512 21a1ab43f2cd6c6fe55db4ab0bcfdbb82e837921cc20b6e34f99e5d785de41439df2bd396253bfbf4199e6d0c56b6a48411bb18a6cf1719c27f8e9aeff885b5a
+EBUILD xrootd-5.2.0-r1.ebuild 2662 BLAKE2B f334ec858c7d994f95681b8e3e11ff88aa5cfc5b188eb8813d201f249a9fb947087003543cc211b2effe3d5b6afe1c1d3d22b342a22251cee0e7adf87c09f1e3 SHA512 9d01f933228d78dc39234be3a40b6fa0991d73fe290e195bd58dd05e8f76557d636b2f3b3e845c86e4da506f6994509da071114710aa5648e9346b5f5d944bb1
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-5.0.3.ebuild b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
index 74ef8fe1863b..260b6f8047ba 100644
--- a/net-libs/xrootd/xrootd-5.0.3.ebuild
+++ b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="acct-group/xrootd
 	acct-user/xrootd
 	sys-libs/zlib
+	virtual/libcrypt:=
 	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-libs/xrootd/xrootd-5.1.1.ebuild b/net-libs/xrootd/xrootd-5.1.1-r1.ebuild
index 1aeb46c6bf10..dd384c7040ef 100644
--- a/net-libs/xrootd/xrootd-5.1.1.ebuild
+++ b/net-libs/xrootd/xrootd-5.1.1-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="acct-group/xrootd
 	acct-user/xrootd
 	sys-libs/zlib
+	virtual/libcrypt:=
 	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-libs/xrootd/xrootd-5.2.0.ebuild b/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
index e5ab9108cfae..0b53eaf8ca75 100644
--- a/net-libs/xrootd/xrootd-5.2.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="acct-group/xrootd
 	acct-user/xrootd
 	sys-libs/zlib
+	virtual/libcrypt:=
 	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )