[gentoo-commits] proj/java:master commit in: dev-libs/nss/

[gentoo-commits] proj/java:master commit in: dev-libs/nss/

[Andrew John Hughes]

commit:     bb7ec406bddc9418167472f992431e599d7030b8
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Jul 16 10:45:21 2014 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Jul 16 10:45:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=bb7ec406

Port java changes to 3.16.1. This version is less intrusive and matches Fedora/RHEL.

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 248BDC07

---
 dev-libs/nss/ChangeLog         |   7 +
 dev-libs/nss/Manifest          |  31 ++--
 dev-libs/nss/diff              |  74 ----------
 dev-libs/nss/nss-3.16.1.ebuild | 325 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 348 insertions(+), 89 deletions(-)

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 4c5a03a..65375ba 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.351 2014/02/22 10:42:36 polynomial-c Exp $
 
+*nss-3.16.1 (16 Jul 2014)
+
+  16 Jul 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +nss-3.16.1.ebuild, -diff:
+  Port java changes to 3.16.1. This version is less intrusive and matches
+  Fedora/RHEL.
+
 *nss-3.15.5 (22 Feb 2014)
 
   22 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> +nss-3.15.5.ebuild:

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 50193b9..dffab1d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,26 +7,27 @@ AUX nss-3.15-gentoo-fixups.patch 5255 SHA256 eba46da3424640a0f16c7b07e526c373f37
 AUX nss-3.15-x32.patch 1361 SHA256 0f0298383a4a3c8f1085b2e139afed182e6f314b771eb2442ba1d50563d88357 SHA512 278b65edbefdaf11ecd1bef58a1350202b84317c25b111707b1322f692d48330ececd020e5f60059ded7f6d81f079df17921a22f6d89d4d39df2a01dd473dbd2 WHIRLPOOL c78b05d85890e34f2eb3654202cf630c3c35ba3c0f78ac55b93719b5e25280684c58a457162b1a107a9d850e10fa730ba14fd3c51cdeec30b5c871070bfb00a0
 AUX nss-3.15.4-enable-pem.patch 243 SHA256 eec796bbc845b123f97bcf1f351495ec1645a2d015e6f6bcdb1e088d02f5d1e6 SHA512 b8f942ced3ff6cea1d54934e0e68ad589585f3fd42934046d0b57563fd4e24b50ad550db391346768abdd9848c3457a532fe3b7495862454f9a52a4603e92f9c WHIRLPOOL 0cd2428516e8a63d64c20b94153f079c4cefd96c05155fa27ecb4cba68419e5efebd32d6ab4820b072fea173e66b5816d8cc238f2a328616f5b7752c60e3998e
 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
+EBUILD nss-3.16.1.ebuild 9255 SHA256 ee4100188b911c039ab0b3f3d9f394477ac4c246b471ab3219d0de9180b5819e SHA512 821c451e6ff32a3a5607d9ada6c432d724c45aec7585ec8ec3f1a3e6231cd2df28e458817cfcd7e48bec062d3ed10ba634f830dfeb4d8d052b90dae5fadafcba WHIRLPOOL 5e662cf69890f998d2ed6c37234632e60f6664b20f0e8360bcbcad93501d52e003c076b9500582f4fa516a86bd8bebebfb4058312683ba482da9cf9cf340adf5
 EBUILD nss-3.16.ebuild 8066 SHA256 ba771a63112e4488f3c34196e6e4fbbe0323da5b56658d82b56a604b9fe0766b SHA512 609af713e8443d449eb5336a9449c8e50b55d1d162e89f4fe643e17592e7ddc1f4e22e97b7067268cf374dd3fb2bea21dc5a2a263c4774fb94bd2323da5f951a WHIRLPOOL bce47d2b881ef7801e205221f0444518db503d2cd02bc2cc15af756777da244fa738f288371a849c97354ea0850cc8c06e6c72a1a73e5950fb55f0cabae6ea10
-MISC ChangeLog 44673 SHA256 7067a388bc9ba481b330ae39e21ef5366424268bf86db55385d2872b23818be8 SHA512 ca154e0ebd1935fca6c8543f88638ff0dc8394af97849d00e567e490c4c5191b53b30d8bd222229b7ff2f33897b31c5bb0388082ec353393bb8bf3a06775d11c WHIRLPOOL 7367886ad0f53897c24af279feceb42b457a21dc9de07554a3aa6dc6c8270dff194dbbae511619ac1b77c4b8b8a739adf059586bcf00a92ffa6369a035baa17b
-MISC diff 2982 SHA256 72524bf6c95c64ab9c013749c325076f8a3e879ec2363c822b500db5b389e847 SHA512 72b678eb0ad3e2898ad5223728715db473ecc102bc0a25377018e3caf6e64526f4bff83b8c80297b82a3e11fa2b29443bce3a6720ad2cdbf44cc5f266ffb39ba WHIRLPOOL aec1b5e45973abe4f576a25a6b6bf1f9b27188d7d8b2b4f3acd791595fc5cae5841e2ada9fa65a8623e09c0cb7e226ad32533149851d3a2d9d88d3312a3753ac
+MISC ChangeLog 44881 SHA256 caa32e36f29a59c4430f29e0b3b3fb49bdf1b03aadda61e81267d79d98c27762 SHA512 e964d6d28e9560f79349a6f924c6b32f2c423e7942d25d48760fef4f31065796b20231e637995e091ad3381243f7c8fd4873137014d837db8d0408e2a29e8cbc WHIRLPOOL ab97158660e2b2a17a70abb14db21d6a02f0f43fd4f9a1befae6fbdb2c91b06b5c0d3a82e0081ead929a83747cfbc978415a6a3c48aaeb7d31257ee3d16c370c
 MISC metadata.xml 473 SHA256 b96722b89273524c0b25e1b8e301e489a80954f3e9e125b11393b35ca06c6834 SHA512 a3f72f40e9f8906c8ebcfcd59f142afa0542f6bd40b64f264cf48e2859ec72495fdce40d6c7da04ef7b7cd7dbb15fbf610b69baf1579a785b1f414965c92d7d1 WHIRLPOOL 313c23d9988a9aaebc1e2dc2a1ea83cdc21681983e0f38a69a558e6236d801a74836df0bfa329eec30cd78325f44818ca7374f4c64d9077f7e7556124317e4ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTxXBWAAoJEDuWpXgki9wHxOYP/jocayHJMcgkcl+LZfz1eOmO
-OGHpVBZV5Gbv9kMJHYlkjBWcvOlcXCo6f5BHNy7AlWd4v30d8pjXNLP/BaDbUn8A
-9ZCR7v7Ygp6xGA4bC1SVObuiQekV3clzc8fEUgPMgmZzD+HxCKG9wS764fYjACE2
-p8BkLVMmSBwv4Xp3zK+F3fu2m45Unqiz0Ma5cyZEDSBxsP1YO4VWsdVUlLfQe88L
-N8IVf7Mch8vDtaa3z/pX7lq1eBOq2wYSZt2ZCzFGsiDDP8HJKF7mdKYIr1Bh/b3c
-4hy+Yc7l8kywHDlPzJo/aEHtr+s9ZTQlB25uD7u2ND9QbgiZKi55+g3HOHgmQFz6
-Xj5aLKQwwEO9VFz2Wc/urXdM+LhRO/c9hS6BdEw6WwFssEA9qth76XfrwrFM5jA5
-8Su4WTcAnlwuRiUQ/fUiHtaJ7+Izt+0at2mYBNuSvz3ojmLPGNwUlGIFrfJ2Gwux
-0RgLwSrtzUxvLcW7SotI6Vrk/fswqg7647au+/lLSztOZMD+JT7iKs34pYzNb80C
-fToJqwYJgXzuv0YHz6tCspnaTwT232QqNZDaQ+zniJxzLoxjJ7w+A6KNl7lMQUsr
-37Xyr7Gb/58n3K6zYjoZ4wd7uvdvyAzeOAbN35n8hD7fJ+pg9d/jNiIcLtv8pvtc
-/GaI3AmmpqxHK+NSbMgw
-=dM53
+iQIcBAEBCAAGBQJTxlfBAAoJEDuWpXgki9wH5fkP+QEph3AdW10FlZoGhVKg7giT
+AdeD6zjfKiDXY4CmJ/6EC72MGoYMFxu2w6FhF5iC66B0JR5DbXfPM9mr2eQ7Nf8+
+GrDpZjjCc5bhDj4fCNf5vUU/29bKW6t5M72Ldy6v0ut5JLH/IzDkP2Z3Ts8pqXTY
+n/BWWTgwOzx5W9RI5K5Tr9XxXvrIcvqSjRyGiOfREtaiGRFoVy5F2+Q18uO9GE8K
+lT6BPBQG416HiXy12p/MjEfUrjj8C22MLc0eV6mbSVwgz2FL+5anLabzZuMo+FFJ
+kMO+4zztO+Z0lEDu5Uqn7xD+vjFRLKNkAzE5NIlmkX+tpUcgnuznXfgdAWQYySEi
+DLZStq/KxzoFleOjnPBZiQ7WoUO9Ak+uXs8Mna7hOqwVV3RncWHN0SCB+DezYVIJ
+Iowv+9eGyc7KZUp4teNUJaeKgMrrKQXq3MTMdpai3tQtpF6GchaVf3CqqF3NbS+f
+hqgf3kwAcaUc6fYs/iDfg/DvcFIXRvdfPjGQRXaujM31SscAnYxp0AtrJDzOCij3
++dzQ6cQZCVM4jRYQ7kMZyool7AATrhnsmLO9XnEOCVRCMqDhsO9IdUjjTMoPaa06
+gt5/4AyAn+cdanGNyWAnfJEh0Gqm+bZYtGzBZQcFL5GNuKXO6JCt2uwI7E7RKaPZ
+PkxSXgTqOFrQ0u+0pm1i
+=S+3X
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/nss/diff b/dev-libs/nss/diff
deleted file mode 100644
index a2c9d99..0000000
--- a/dev-libs/nss/diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- nss-3.15.5.ebuild	2014-03-14 23:28:13.402236131 +0000
-+++ nss-3.16.ebuild	2014-03-24 15:01:11.000000000 +0000
-@@ -1,6 +1,6 @@
- # 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.15.5.ebuild,v 1.1 2014/02/22 10:42:36 polynomial-c Exp $
-+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.8 2014/03/24 14:33:48 ago Exp $
- 
- EAPI=5
- inherit eutils flag-o-matic multilib toolchain-funcs
-@@ -19,8 +19,8 @@
- 
- 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 +java +nss-pem utils"
-+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}"
-@@ -49,7 +49,6 @@
- 	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}/${PN}-3.15-x32.patch"
- 	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
- 	cd coreconf
- 	# hack nspr paths
-@@ -151,13 +150,12 @@
- 	XCFLAGS="${BUILD_CFLAGS}" \
- 	emake -j1 -C coreconf \
- 		CC="${BUILD_CC}" \
--		$(nssbits BUILD_) \
--		|| die
-+		$(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} || die "${d} make failed"
-+		emake -j1 "${makeargs[@]}" -C ${d}
- 	done
- }
- 
-@@ -216,28 +214,16 @@
- 	# 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"
--	if use java ; then
--	  cp -L */lib/lib{softokn,freebl}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
--	fi
- 
- 	# 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
--	if use java ; then
--		local javapc="${ED}"/usr/$(get_libdir)/pkgconfig/nss{,-java}.pc
--		cp -L "${ED}"/usr/$(get_libdir)/pkgconfig/nss.pc ${javapc}
--		sed -i -e 's#Libs:#Libs: -lfreebl -lsoftokn#' -e 's#Cflags:#Cflags: -I${includedir}/private#' ${javapc}
--	fi
- 
- 	# all the include files
- 	insinto /usr/include/nss
- 	doins public/nss/*.h
--	if use java ; then
--	  insinto /usr/include/nss/private
--	  doins private/nss/{softoken,lowkeyti,softoknt,blapi,alghmac}.h
--	fi
- 
- 	local f nssutils
- 	# Always enabled because we need it for chk generation.

diff --git a/dev-libs/nss/nss-3.16.1.ebuild b/dev-libs/nss/nss-3.16.1.ebuild
new file mode 100644
index 0000000..edad7e4
--- /dev/null
+++ b/dev-libs/nss/nss-3.16.1.ebuild
@@ -0,0 +1,325 @@
+# 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.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.6-r1"
+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="~amd64 ~x86"
+IUSE="+cacert +java +nss-pem utils"
+
+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-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+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"
+
+	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
+		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) 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)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	local myLDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) nspr --libs-only-L)"
+	unset NSPR_INCLUDE_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 FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fake-dir" \
+	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}" \
+		LDFLAGS="${myLDFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/${ABI}-fake-dir" \
+		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
+}
+
+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"
+	# 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"
+	if use java ; then
+	  cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	fi
+
+	# 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
+	if use java ; then
+		local javapc="${ED}"/usr/$(get_libdir)/pkgconfig/nss{,-softokn}.pc
+		cp -L "${ED}"/usr/$(get_libdir)/pkgconfig/nss.pc ${javapc}
+		sed -i -e 's#Libs:#Libs: -lfreebl#' -e 's#Cflags:#Cflags: -I${includedir}/private#' ${javapc}
+	fi
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	if use java ; then
+	  insinto /usr/include/nss/private
+	  doins private/nss/{blapi,alghmac}.h
+	fi
+
+	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"
+			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
+		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.
+	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-${ABI}"
+	doenvd "${T}/90nss-${ABI}"
+}
+
+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
+}