Adding metadata

18 files changed, 446 insertions, 435 deletions

diff --git a/dev-libs/cglm/cglm-0.8.7.ebuild b/dev-libs/cglm/cglm-0.8.7.ebuild
index 5a45e8e61fec..f7f5e00f2da3 100644
--- a/dev-libs/cglm/cglm-0.8.7.ebuild
+++ b/dev-libs/cglm/cglm-0.8.7.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DOCS_BUILDER="sphinx"
-DOCS_AUTODOC=0
+DOCS_AUTODOC=1
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
 DOCS_DIR="${S}/docs/source"
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
@@ -25,6 +26,12 @@ HOMEPAGE="https://github.com/recp/cglm"
 LICENSE="MIT"
 SLOT="0"
 
+src_prepare() {
+	default
+	# Enable autodoc since themeing plugin is used.
+	sed -i "s#'sphinx.ext.githubpages'#'sphinx.ext.githubpages','sphinx.ext.autodoc'#" docs/source/conf.py || die
+}
+
 src_configure() {
 	local emesonargs=(
 		"-Dwerror=false"
diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild
index 5a45e8e61fec..f7f5e00f2da3 100644
--- a/dev-libs/cglm/cglm-9999.ebuild
+++ b/dev-libs/cglm/cglm-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DOCS_BUILDER="sphinx"
-DOCS_AUTODOC=0
+DOCS_AUTODOC=1
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
 DOCS_DIR="${S}/docs/source"
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
@@ -25,6 +26,12 @@ HOMEPAGE="https://github.com/recp/cglm"
 LICENSE="MIT"
 SLOT="0"
 
+src_prepare() {
+	default
+	# Enable autodoc since themeing plugin is used.
+	sed -i "s#'sphinx.ext.githubpages'#'sphinx.ext.githubpages','sphinx.ext.autodoc'#" docs/source/conf.py || die
+}
+
 src_configure() {
 	local emesonargs=(
 		"-Dwerror=false"
diff --git a/dev-libs/fastText/Manifest b/dev-libs/fastText/Manifest
index c45a8082f3e0..a6779ea0979b 100644
--- a/dev-libs/fastText/Manifest
+++ b/dev-libs/fastText/Manifest
@@ -1 +1 @@
-DIST fastText-0.9.2.tar.gz 4036722 BLAKE2B ea3af92ce18d04241128cfb28773f0785a006e79c861d718c2c6ad788d776ad60b0543a42eb8be5a865cbc12283355521431fe2fba48544399e4a2b1520ff3f1 SHA512 8f0f6e78b3c6b3c7e7d107778952f340cc208b8e0b920dd118a57884cca8ef7007ea88b6f3352cb7e08289a64743f507309e1e1259c785f810af7f5fa09f2656
+DIST fastText-0.9.2.gh.tar.gz 4036722 BLAKE2B ea3af92ce18d04241128cfb28773f0785a006e79c861d718c2c6ad788d776ad60b0543a42eb8be5a865cbc12283355521431fe2fba48544399e4a2b1520ff3f1 SHA512 8f0f6e78b3c6b3c7e7d107778952f340cc208b8e0b920dd118a57884cca8ef7007ea88b6f3352cb7e08289a64743f507309e1e1259c785f810af7f5fa09f2656
diff --git a/dev-libs/fastText/fastText-0.9.2.ebuild b/dev-libs/fastText/fastText-0.9.2.ebuild
index 3880b01eb4b3..ea42a08610cf 100644
--- a/dev-libs/fastText/fastText-0.9.2.ebuild
+++ b/dev-libs/fastText/fastText-0.9.2.ebuild
@@ -4,12 +4,13 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
-inherit cmake distutils-r1
+inherit cmake distutils-r1 edo
 
 DESCRIPTION="Library for fast text representation and classification"
 HOMEPAGE="https://fasttext.cc https://github.com/facebookresearch/fastText"
-SRC_URI="https://github.com/facebookresearch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/facebookresearch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,6 +25,9 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
 "
+BDEPEND="
+	python? ( ${DISTUTILS_DEPS} )
+"
 
 DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md python/{README.rst,doc} docs )
 
@@ -39,6 +43,10 @@ src_prepare() {
 }
 
 src_configure() {
+	local mycmakeargs=(
+		-DPROJECT_VERSION=${PV}
+	)
+
 	cmake_src_configure
 	use python && distutils-r1_src_configure
 }
@@ -53,7 +61,7 @@ src_test() {
 }
 
 python_test() {
-	${EPYTHON} runtests.py -u || die
+	edo ${EPYTHON} runtests.py -u
 }
 
 src_install() {
diff --git a/dev-libs/folks/folks-0.15.5.ebuild b/dev-libs/folks/folks-0.15.5.ebuild
index 6a4d799c0de4..07aec9e18e81 100644
--- a/dev-libs/folks/folks-0.15.5.ebuild
+++ b/dev-libs/folks/folks-0.15.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
-IUSE="bluetooth eds +telepathy test utils"
+IUSE="bluetooth eds telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/leatherman/leatherman-1.12.9.ebuild b/dev-libs/leatherman/leatherman-1.12.9.ebuild
index bfe232d5a27e..3f363379395b 100644
--- a/dev-libs/leatherman/leatherman-1.12.9.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
deleted file mode 100644
index 79692f1cdbb7..000000000000
--- a/dev-libs/libreport/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libreport-2.16.0.tar.gz 1901880 BLAKE2B 520ad157de02dbe5fd15b2ffcfc9b0a09587c3696b41a202f0a78b53a2d366a2991906437aa38d7c84407dcd4a788d358b9e320f70c30e602f1b903433288717 SHA512 cbb456bb63b92a255fecb87191160c2e515b4434cbaaa9404fb69f4f78421fe98c4057969f4b6b99e1b52e815d83c483bdbbe606a4bd2e34cf5268769e7bd40f
-DIST libreport-2.17.1.tar.gz 1904056 BLAKE2B 3bb4bade768e585af620cdf9f0f353528f24145a157a295fed449b6064ab846757946d38db5fd607e82b784156637f02e7eb66e01ac70c170b2006f4edd950f5 SHA512 35c5031e0a361040153ea45a249613b9f2d2bb38191c6375b197cb797be153f1a4b46480dbfa5fcdd9c5c00b075f84997f6da70c3b59b8b8251fd29a7180bd9b
diff --git a/dev-libs/libreport/libreport-2.16.0.ebuild b/dev-libs/libreport/libreport-2.16.0.ebuild
deleted file mode 100644
index 85e5fa3d7024..000000000000
--- a/dev-libs/libreport/libreport-2.16.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk +python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	app-arch/libarchive:0=
-	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/satyr-0.38:0=
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	dev-libs/nettle:=
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		$(use_with gtk)
-		$(use_with python python3)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libreport/libreport-2.17.1.ebuild b/dev-libs/libreport/libreport-2.17.1.ebuild
deleted file mode 100644
index 85e5fa3d7024..000000000000
--- a/dev-libs/libreport/libreport-2.17.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk +python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	app-arch/libarchive:0=
-	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/satyr-0.38:0=
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	dev-libs/nettle:=
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		$(use_with gtk)
-		$(use_with python python3)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libreport/metadata.xml b/dev-libs/libreport/metadata.xml
deleted file mode 100644
index 953c2b357967..000000000000
--- a/dev-libs/libreport/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>pacho@gentoo.org</email>
-  <name>Pacho Ramos</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index a0b5d5d0b745..dd8aeff08fed 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,4 @@
 DIST nss-3.79.1.tar.gz 84694831 BLAKE2B 209a502ba4b808bb4cb9b8775328fa26e36c55147ee5da7b8f661349129250f09685dd69919e24d7ff72cc55a2e9cbbbc9c059e543cf1b0a6a08e809be262d4c SHA512 e841efe9d0300d99b50e54c159c75df76c09c34c74bbc9b6ca007ad017b2cb91a8d33f6f4195e52bd8f3ed7be5d53f3ce7ce10825fa21abbf5dbba3db109e037
+DIST nss-3.79.2.tar.gz 84825187 BLAKE2B 9589095a0f3af5201662fe96ba4dac73c661db3abde534941ea61d597dce1016dc06f8559e26fafc940f2b123987381e1faa22ff6a995ef3cc0a9dc4ebe7a4ad SHA512 52ca7574d2bb6e2fd874ac40f3e75d58135b103d8bd4b964a9262b5c302b4668ff7c8f5dabbef46e413fd72faeddc44057bc7b489946813331cc9a481d078181
 DIST nss-3.84.tar.gz 84851235 BLAKE2B 5dead5ae336998db97acc6dc2a59b387aac9baeba0f2fad6eaf921bdc894867f6177179545378091d9b50b295b71409781b5ef5044222afe7a1cd2f920a7d15f SHA512 b4ed4b2e44d9f896a4a4c33f92813a84825dc4502f4e14e047f3583666c453138515e6edbcd71144c4b02a8ee16b3443803f1ff12458fd82c338ee1dd911b175
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
diff --git a/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch b/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
new file mode 100644
index 000000000000..5f80fdc09b7e
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/ssl/authcert.c b/lib/ssl/authcert.c
+--- a/lib/ssl/authcert.c
++++ b/lib/ssl/authcert.c
+@@ -212,17 +212,17 @@ NSS_GetClientAuthData(void *arg,
+                                                pw_arg);
+         } else {
+             int nnames = 0;
+             char **names = ssl_DistNamesToStrings(caNames, &nnames);
+             rv = CERT_FilterCertListByCANames(certList, nnames, names,
+                                               certUsageSSLClient);
+             ssl_FreeDistNamesStrings(names, nnames);
+         }
+-        if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) {
++        if ((rv != SECSuccess) || (certList && CERT_LIST_EMPTY(certList))) {
+             CERT_DestroyCertList(certList);
+             certList = NULL;
+         }
+     }
+     if (certList == NULL) {
+         /* no user certs meeting the nickname/usage requirements found */
+         return SECFailure;
+     }
+
diff --git a/dev-libs/nss/nss-3.79.2.ebuild b/dev-libs/nss/nss-3.79.2.ebuild
new file mode 100644
index 000000000000..7f2b0be9c181
--- /dev/null
+++ b/dev-libs/nss/nss-3.79.2.ebuild
@@ -0,0 +1,391 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.34.1"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.79-fix-client-cert-crash.patch"
+	"${FILESDIR}/${PN}-3.79-gcc-13.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed -e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/re2/re2-0.2022.06.01.ebuild b/dev-libs/re2/re2-0.2022.06.01.ebuild
index 639e21d00a7d..f047960b9b5c 100644
--- a/dev-libs/re2/re2-0.2022.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
deleted file mode 100644
index 9969e66ff3ef..000000000000
--- a/dev-libs/satyr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST satyr-0.38.tar.gz 433626 BLAKE2B 682d28a932758353e986d2906baf294183756d60a063ce03ba79506b58c92e4fc039c2246c0d43910f6d27d62dd674ffd3b772eeb6e8de46d8080735754b3d3a SHA512 09168050ca7bae00fb3d39f23f8c1e0adcf9cc4d3e491aa002bf9a0a7a265df980d12e430ea7f3eaa9010e0432821b106db5ce3b1e8d935d78b1e56d37110051
-DIST satyr-0.39.tar.gz 434581 BLAKE2B 7b4e11d8027877aa3b9e8144f8917f03b489b157c1112794a3c2bea9998a4367a7ec06cdec6c144fd96ecdabc83a85c5fb2644df02d59086ea3a113b1402fabe SHA512 f6d24ae054867ccdbb2dabdd63c6b351f7eec9ffe5426bdeffa86d585a52d13b07dd31e26b7d14e4850a1fdca748b0d5e23bb51fbc2843af79bf306f09d3145f
diff --git a/dev-libs/satyr/metadata.xml b/dev-libs/satyr/metadata.xml
deleted file mode 100644
index 953c2b357967..000000000000
--- a/dev-libs/satyr/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>pacho@gentoo.org</email>
-  <name>Pacho Ramos</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/satyr/satyr-0.38.ebuild b/dev-libs/satyr/satyr-0.38.ebuild
deleted file mode 100644
index 2ee1d3a0a107..000000000000
--- a/dev-libs/satyr/satyr-0.38.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools multiprocessing python-r1
-
-DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
-HOMEPAGE="https://github.com/abrt/satyr"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/4"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	>=dev-libs/elfutils-0.158
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	dev-libs/nettle:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-util/gperf
-"
-
-src_prepare() {
-	default
-	./gen-version || die # Needs to be run before full autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-rpm
-		$(usex python "--with-python3" "--without-python3")
-	)
-
-	if use python; then
-		python_configure() {
-			econf "${myargs[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-
-}
-
-src_test() {
-	local extra_args
-
-	# In order to pass --jobs to the test runner
-	run_tests() {
-		cd tests || die
-		emake testsuite
-		./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
-
-		# Only run the python bindings tests for other python impls
-		extra_args=('-k' 'python3_bindings.*')
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir run_tests
-	else
-		run_tests SKIP_PYTHON3=yes
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/satyr/satyr-0.39.ebuild b/dev-libs/satyr/satyr-0.39.ebuild
deleted file mode 100644
index 2ee1d3a0a107..000000000000
--- a/dev-libs/satyr/satyr-0.39.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools multiprocessing python-r1
-
-DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
-HOMEPAGE="https://github.com/abrt/satyr"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/4"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	>=dev-libs/elfutils-0.158
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	dev-libs/nettle:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-util/gperf
-"
-
-src_prepare() {
-	default
-	./gen-version || die # Needs to be run before full autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-rpm
-		$(usex python "--with-python3" "--without-python3")
-	)
-
-	if use python; then
-		python_configure() {
-			econf "${myargs[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-
-}
-
-src_test() {
-	local extra_args
-
-	# In order to pass --jobs to the test runner
-	run_tests() {
-		cd tests || die
-		emake testsuite
-		./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
-
-		# Only run the python bindings tests for other python impls
-		extra_args=('-k' 'python3_bindings.*')
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir run_tests
-	else
-		run_tests SKIP_PYTHON3=yes
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}