commit:     6c81ae9c3099aec58efef49f09b70163c996b9c1
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 09:01:03 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 09:06:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c81ae9c

dev-libs/nss: drop 3.68, 3.69, 3.69.1, 3.70, 3.71

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/nss/Manifest          |   5 -
 dev-libs/nss/nss-3.68.ebuild   | 367 -----------------------------------------
 dev-libs/nss/nss-3.69.1.ebuild | 367 -----------------------------------------
 dev-libs/nss/nss-3.69.ebuild   | 366 ----------------------------------------
 dev-libs/nss/nss-3.70.ebuild   | 367 -----------------------------------------
 dev-libs/nss/nss-3.71.ebuild   | 367 -----------------------------------------
 6 files changed, 1839 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2c50f23eaa66..e488378e443d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,10 +1,5 @@
 DIST nss-3.63.1.tar.gz 82166899 BLAKE2B 
a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284
 SHA512 
62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
 DIST nss-3.68.1.tar.gz 82405747 BLAKE2B 
89a2e893d3af02b192d044049ec84462e53d96bf2ba9a88112b4dfde5af5c0d9a615ed94b5c97c26775de998cc38240d19d5f2e5eb2573a6715d2a7106d99fe3
 SHA512 
9aa932e8ba1a0c3bffd402f7129d03de30481bde712aaa197bc79d14b307179e691423aa0c6300767fce2c667917c8d2e2b38e361269b7671548d72435887f84
-DIST nss-3.68.tar.gz 82405833 BLAKE2B 
0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103
 SHA512 
be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
-DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 
71948a9fee08536c41da9916e6d2eb82bf52bf688c900eb283f83f0ac60498cce2d936950836b0bfb097ee9315860dbbd402a3b63ab28d23b3bd90523b65ead3
 SHA512 
26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697
-DIST nss-3.69.tar.gz 82427268 BLAKE2B 
1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe
 SHA512 
9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
-DIST nss-3.70.tar.gz 83917362 BLAKE2B 
51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51
 SHA512 
9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
-DIST nss-3.71.tar.gz 83927933 BLAKE2B 
a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e
 SHA512 
a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
 DIST nss-3.72.1.tar.gz 83929867 BLAKE2B 
8be49eef0c1845a65da61829798d119b6b88b5aad6e07059d42e7c4b41d6a03975d82bb598ba0614f596107eb73408269f6a78c9a173f82566948638aeafde96
 SHA512 
57abc2752484049b59b3a7606814341c194bfa0db781dd5fc805fbe79787073ab4dbc1944719a8def71e5d4f371f2948aaa558290134c4f247c61dd5e96daf8a
 DIST nss-3.72.tar.gz 83928300 BLAKE2B 
d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511
 SHA512 
1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
 DIST nss-3.73.1.tar.gz 83931597 BLAKE2B 
590e3c9c5262f4ca0d9137905ce396ddc81f722fabbb54f235eb1bab344d9b7913b0be8d4ddf99fef34d45ed0102e8b7b571764eefe055eefe6bb487c22bafbe
 SHA512 
4cca26cb430f1c167ce7c3a2654c1315938c73bbd425c89d4e636a966fd052724499f34affc5764ec680eeaa080892caab28ef00fe21992421c739f7623cf071

diff --git a/dev-libs/nss/nss-3.68.ebuild b/dev-libs/nss/nss-3.68.ebuild
deleted file mode 100644
index b4b769ddec09..000000000000
--- a/dev-libs/nss/nss-3.68.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-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 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       # Custom changes for gentoo
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}/${PN}-3.23-hppa-byte_order.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
-
-       # 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 -j1 -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 -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-# 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
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       dodir /etc/prelink.conf.d
-       printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" 
${NSS_CHK_SIGN_LIBS} \
-               > "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-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/nss/nss-3.69.1.ebuild b/dev-libs/nss/nss-3.69.1.ebuild
deleted file mode 100644
index 0618a36a6438..000000000000
--- a/dev-libs/nss/nss-3.69.1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 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.32"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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:*"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       # Custom changes for gentoo
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}/${PN}-3.23-hppa-byte_order.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
-
-       # 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 -j1 -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 -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-# 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
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       dodir /etc/prelink.conf.d
-       printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" 
${NSS_CHK_SIGN_LIBS} \
-               > "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-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/nss/nss-3.69.ebuild b/dev-libs/nss/nss-3.69.ebuild
deleted file mode 100644
index 973f651b763d..000000000000
--- a/dev-libs/nss/nss-3.69.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2021 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.32"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       # Custom changes for gentoo
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}/${PN}-3.23-hppa-byte_order.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
-
-       # 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 -j1 -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 -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-# 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
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       dodir /etc/prelink.conf.d
-       printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" 
${NSS_CHK_SIGN_LIBS} \
-               > "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-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/nss/nss-3.70.ebuild b/dev-libs/nss/nss-3.70.ebuild
deleted file mode 100644
index 97adb106159f..000000000000
--- a/dev-libs/nss/nss-3.70.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 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.32"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       # Custom changes for gentoo
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}/${PN}-3.23-hppa-byte_order.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
-
-       # 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 -j1 -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 -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-# 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
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       dodir /etc/prelink.conf.d
-       printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" 
${NSS_CHK_SIGN_LIBS} \
-               > "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-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/nss/nss-3.71.ebuild b/dev-libs/nss/nss-3.71.ebuild
deleted file mode 100644
index 97adb106159f..000000000000
--- a/dev-libs/nss/nss-3.71.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 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.32"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       # Custom changes for gentoo
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}/${PN}-3.23-hppa-byte_order.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
-
-       # 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 -j1 -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 -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-# 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
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       dodir /etc/prelink.conf.d
-       printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" 
${NSS_CHK_SIGN_LIBS} \
-               > "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-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
-}

Reply via email to