commit:     0d7b3f8482e4c7bb64fe37812e2e452173154e75
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  5 09:21:11 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Jul  5 09:21:11 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0d7b3f84

updated nss ebuild to match the tree, removed old nspr ebuild

---
 dev-libs/nspr/nspr-4.10.4.ebuild                   |  95 --------
 dev-libs/nss/Manifest                              |   1 -
 .../nss/{nss-3.16-r1.ebuild => nss-3.16.1.ebuild}  |  79 +++---
 dev-libs/nss/nss-3.16.ebuild                       | 270 ---------------------
 4 files changed, 43 insertions(+), 402 deletions(-)

diff --git a/dev-libs/nspr/nspr-4.10.4.ebuild b/dev-libs/nspr/nspr-4.10.4.ebuild
deleted file mode 100644
index 4a61b84..0000000
--- a/dev-libs/nspr/nspr-4.10.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 
2014/03/20 13:31:07 polynomial-c Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/";
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz";
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_prepare() {
-       mkdir build inst
-       cd "${S}"/nspr/
-       epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-       epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-       epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-       epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
-       # epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-       epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-       epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-       # We do not need to pass -L$libdir via nspr-config --libs
-       epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-       # We must run eautoconf to regenerate configure
-       eautoconf
-
-       # make sure it won't find Perl out of Prefix
-       sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-       # Respect LDFLAGS
-       sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-               "${S}"/nspr/config/rules.mk || die
-}
-
-src_configure() {
-       cd "${S}"/build
-
-       # We use the standard BUILD_xxx but nspr uses HOST_xxx
-       tc-export_build_env BUILD_CC
-       export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} 
HOST_LDFLAGS=${BUILD_LDFLAGS}
-       tc-export AR CC CXX RANLIB
-       [[ ${CBUILD} != ${CHOST} ]] \
-               && export CROSS_COMPILE=1 \
-               || unset CROSS_COMPILE
-
-       local myconf
-       echo > "${T}"/test.c
-       ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-       case $(file "${T}"/test.o) in
-               *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" 
--enable-64bit";;
-               *32-bit*|*ppc*|*i386*) ;;
-               *) die "Failed to detect whether your arch is 64bits or 32bits, 
disable distcc if you're using it, please";;
-       esac
-
-       # Ancient autoconf needs help finding the right tools.
-       LC_ALL="C" ECONF_SOURCE="../nspr" \
-       ac_cv_path_AR="${AR}" \
-       econf \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               $(use_enable debug) \
-               $(use_enable !debug optimize) \
-               ${myconf}
-}
-
-src_compile() {
-       cd "${S}"/build
-       emake
-}
-
-src_install() {
-       # Their build system is royally confusing, as usual
-       MINOR_VERSION=${MIN_PV} # Used for .so version
-       cd "${S}"/build
-       emake DESTDIR="${D}" install
-
-       cd "${ED}"/usr/$(get_libdir)
-       einfo "removing static libraries as upstream has requested!"
-       rm *.a || die "failed to remove static libraries."
-
-       # install nspr-config
-       dobin "${S}"/build/config/nspr-config
-
-       # Remove stupid files in /usr/bin
-       rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded 
files"
-}

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 9fbe9cf..b75a965 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,3 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 
82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 
2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00
 WHIRLPOOL 
c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 DIST nss-3.16.1.tar.gz 6409506 SHA256 
fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e SHA512 
ea70dd417d6491e2a2a43ce2576e16511c3c78b4683af61ee80458c08768045eeb2b5bc410e536e3c7ab3200b3e80008abb5c5b40f0eb93418b8f2813cba3b46
 WHIRLPOOL 
46c37623655a426a328e47197b15d945717ad24828008d65fee0027c7ae48fdfd1aef7e1a7e3adbe2f6e851fe462496a854092b4d7809d40b9474c66156f159b
-DIST nss-3.16.tar.gz 6378110 SHA256 
2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 
e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f
 WHIRLPOOL 
d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
 DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 
0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 
6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95
 WHIRLPOOL 
a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868

diff --git a/dev-libs/nss/nss-3.16-r1.ebuild b/dev-libs/nss/nss-3.16.1.ebuild
similarity index 82%
rename from dev-libs/nss/nss-3.16-r1.ebuild
rename to dev-libs/nss/nss-3.16.1.ebuild
index 50e7104..3899837 100644
--- a/dev-libs/nss/nss-3.16-r1.ebuild
+++ b/dev-libs/nss/nss-3.16.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16-r1.ebuild,v 1.1 
2014/06/14 08:27:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.1.ebuild,v 1.2 
2014/07/04 19:51:37 axs Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.10"
+NSPR_VER="4.10.6-r1"
 RTM_NAME="NSS_${PV//./_}_RTM"
 # Rev of https://git.fedorahosted.org/cgit/nss-pem.git
 PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
@@ -22,13 +22,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cacert +nss-pem utils"
 
-DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]
-       >=dev-libs/nspr-${NSPR_VER}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
-       >=dev-db/sqlite-3.5[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+       >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
+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}]
        abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
+               !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 
@@ -108,41 +108,48 @@ nssarch() {
 }
 
 nssbits() {
-       # use ABI first, this will work for most cases
-       case "${ABI}" in
-               alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-               n32) echo USE_N32=1;;
-               x32) echo USE_X32=1;;
-               s390x|*64) echo USE_64=1;;
-               default) # no abi actually set, fall back to old check
-                       einfo "Running a short build test to determine 
64bit'ness"
-                       echo > "${T}"/test.c || die
-                       ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o 
"${T}"/test.o || die
-                       case $(file "${T}"/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 your arch is 
64bits or 32bits, disable distcc if you're using it, please";;
-                       esac ;;
-               *) ;;
+       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() {
-       tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+       # 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) mybits=$(nssbits);;
+       esac
+       # bitness of host may differ from target
+       if tc-is-cross-compiler; then
+               buildbits=$(nssbits BUILD_)
+       fi
+
        local makeargs=(
-               CC="${CC}"
-               AR="${AR} rc \$@"
-               RANLIB="${RANLIB}"
+               CC="$(tc-getCC)"
+               AR="$(tc-getAR) rc \$@"
+               RANLIB="$(tc-getRANLIB)"
                OPTIMIZER=
-               $(nssbits)
+               ${mybits}
        )
 
        # Take care of nspr settings #436216
-       local myCPPFLAGS="${CPPFLAGS} $(${PKG_CONFIG} nspr --cflags)"
-       local myLDFLAGS="${LDFLAGS} $(${PKG_CONFIG} nspr --libs-only-L)"
+       local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+       local myLDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) nspr --libs-only-L)"
        unset NSPR_INCLUDE_DIR
-       #export NSPR_LIB_DIR=${T}/fake-dir-${ABI} - do this further down now
 
        # Do not let `uname` be used.
        if use kernel_linux ; then
@@ -165,10 +172,10 @@ multilib_src_compile() {
        # Build the host tools first.
        LDFLAGS="${BUILD_LDFLAGS}" \
        XCFLAGS="${BUILD_CFLAGS}" \
-       NSPR_LIB_DIR="${T}/${ABI}-fake-dir" \
+       NSPR_LIB_DIR="${T}/fake-dir" \
        emake -j1 -C coreconf \
-               CC="${BUILD_CC}" \
-               $(nssbits BUILD_)
+               CC="$(tc-getBUILD_CC)" \
+               ${buildbits:-${mybits}}
        makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
 
        # Then build the target tools.

diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild
deleted file mode 100644
index 3dadff6..0000000
--- a/dev-libs/nss/nss-3.16.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.1 
2014/03/20 13:32:21 polynomial-c Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.10"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI 
support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/";
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-       cacert? ( 
http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
 )
-       nss-pem? ( 
https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-
-DEPEND="virtual/pkgconfig
-       >=dev-libs/nspr-${NSPR_VER}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
-       >=dev-db/sqlite-3.5
-       sys-libs/zlib"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_setup() {
-       export LC_ALL="C"
-}
-
-src_unpack() {
-       unpack ${A}
-       if use nss-pem ; then
-               mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-       fi
-}
-
-src_prepare() {
-       # Custom changes for gentoo
-       epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
-       epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
-       use cacert && epatch 
"${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-       use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
-       epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
-       cd coreconf
-       # hack nspr paths
-       echo 'INCLUDES += -I$(DIST)/include/dbm' \
-               >> headers.mk || die "failed to append include"
-
-       # modify install path
-       sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = 
$(CORE_DEPTH)/dist:' \
-               -i source.mk
-
-       # Respect LDFLAGS
-       sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-       # Ensure we stay multilib aware
-       sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
-
-       # Fix pkgconfig file for Prefix
-       sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-               "${S}"/config/Makefile
-
-       # use host shlibsign if need be #436216
-       if tc-is-cross-compiler ; then
-               sed -i \
-                       -e 's:"${2}"/shlibsign:shlibsign:' \
-                       "${S}"/cmd/shlibsign/sign.sh
-       fi
-
-       # dirty hack
-       cd "${S}"
-       sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-               lib/ssl/config.mk
-       sed -i -e 
"/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-               cmd/platlibs.mk
-}
-
-nssarch() {
-       # Most of the arches are the same as $ARCH
-       local t=${1:-${CHOST}}
-       case ${t} in
-       aarch64*)echo "aarch64";;
-       hppa*)   echo "parisc";;
-       i?86*)   echo "i686";;
-       x86_64*) echo "x86_64";;
-       *)       tc-arch ${t};;
-       esac
-}
-
-nssbits() {
-       local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-       echo > "${T}"/test.c || die
-       ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
-       case $(file "${T}"/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 your arch is 64bits or 32bits, disable 
distcc if you're using it, please";;
-       esac
-}
-
-src_compile() {
-       strip-flags
-
-       tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
-       local makeargs=(
-               CC="${CC}"
-               AR="${AR} rc \$@"
-               RANLIB="${RANLIB}"
-               OPTIMIZER=
-               $(nssbits)
-       )
-
-       # Take care of nspr settings #436216
-       append-cppflags $(${PKG_CONFIG} nspr --cflags)
-       append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
-       unset NSPR_INCLUDE_DIR
-       export NSPR_LIB_DIR=${T}/fake-dir
-
-       # Do not let `uname` be used.
-       if use kernel_linux ; then
-               makeargs+=(
-                       OS_TARGET=Linux
-                       OS_RELEASE=2.6
-                       OS_TEST="$(nssarch)"
-               )
-       fi
-
-       export BUILD_OPT=1
-       export NSS_USE_SYSTEM_SQLITE=1
-       export NSDISTMODE=copy
-       export NSS_ENABLE_ECC=1
-       export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
-       export FREEBL_NO_DEPEND=1
-       export ASFLAGS=""
-
-       local d
-
-       # Build the host tools first.
-       LDFLAGS="${BUILD_LDFLAGS}" \
-       XCFLAGS="${BUILD_CFLAGS}" \
-       emake -j1 -C coreconf \
-               CC="${BUILD_CC}" \
-               $(nssbits BUILD_)
-       makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-       # Then build the target tools.
-       for d in . lib/dbm ; do
-               emake -j1 "${makeargs[@]}" -C ${d}
-       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
-}
-
-src_install() {
-       cd "${S}"/dist
-
-       dodir /usr/$(get_libdir)
-       cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying 
shared libs failed"
-       # We generate these after stripping the libraries, else they don't 
match.
-       #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files 
failed"
-       cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs 
failed"
-
-       # Install nss-config and pkgconfig file
-       dodir /usr/bin
-       cp -L */bin/nss-config "${ED}"/usr/bin
-       dodir /usr/$(get_libdir)/pkgconfig
-       cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
-
-       # all the include files
-       insinto /usr/include/nss
-       doins public/nss/*.h
-
-       local f nssutils
-       # Always enabled because we need it for chk generation.
-       nssutils="shlibsign"
-       if use utils; then
-               # The tests we do not need to install.
-               #nssutils_test="bltest crmftest dbtest dertimetest
-               #fipstest remtest sdrtest"
-               nssutils="addbuiltin atob baddbdir btoa certcgi certutil 
checkcert
-               cmsutil conflict crlutil derdump digest makepqg mangle modutil 
multinit
-               nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify 
pk11mode
-               pk12util pp rsaperf selfserv shlibsign signtool signver ssltap 
strsclnt
-               symkeyutil tstclnt vfychain vfyserv"
-       fi
-       cd "${S}"/dist/*/bin/
-       for f in ${nssutils}; do
-               dobin ${f}
-       done
-
-       # Prelink breaks the CHK files. We don't have any reliable way to run
-       # shlibsign after prelink.
-       local l libs=() liblist
-       for l in ${NSS_CHK_SIGN_LIBS} ; do
-               libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
-       done
-       liblist=$(printf '%s:' "${libs[@]}")
-       echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
-       doenvd "${T}/90nss"
-}
-
-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)
-}
-
-pkg_postrm() {
-       cleanup_chk "${EROOT}"/usr/$(get_libdir)
-}

Reply via email to