Version bump. Removed old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

2 files changed, 10 insertions, 6 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index c8549a43dbeb..ad44f9cc075f 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.352 2014/03/19 21:05:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.353 2014/03/20 13:32:21 polynomial-c Exp $
+
+*nss-3.16 (20 Mar 2014)
+
+  20 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -nss-3.15.4-r1.ebuild,
+  +nss-3.16.ebuild:
+  Version bump. Removed old.
 
   19 Mar 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Clarify USE=cacert also installs SPI certs.
diff --git a/dev-libs/nss/nss-3.15.4-r1.ebuild b/dev-libs/nss/nss-3.16.ebuild
index ce307ecdf903..eefa5e7cf420 100644
--- a/dev-libs/nss/nss-3.15.4-r1.ebuild
+++ b/dev-libs/nss/nss-3.16.ebuild
@@ -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.4-r1.ebuild,v 1.1 2014/02/01 04:57:05 vapier Exp $
+# $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
@@ -49,7 +49,6 @@ src_prepare() {
 	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 @@ src_compile() {
 	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
 }