3.11.7 tested and working on MIPS... Marked stable. Quoting in 3.11.5 fixed.

(Portage version: 2.1.3.19)

3 files changed, 30 insertions, 26 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 12cbd9d5dc5b..4121523d6970 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.105 2007/12/12 14:14:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.106 2007/12/17 23:09:49 redhatter Exp $
+
+  17 Dec 2007; Stuart Longland <redhatter@gentoo.org> nss-3.11.5.ebuild,
+  nss-3.11.7.ebuild:
+  Mark 3.11.7 stable on MIPS, and fix some quoting issues in version 3.11.5
 
   12 Dec 2007; Raúl Porcel <armin76@gentoo.org> nss-3.11.7.ebuild,
   nss-3.12_alpha2_p2.ebuild:
diff --git a/dev-libs/nss/nss-3.11.5.ebuild b/dev-libs/nss/nss-3.11.5.ebuild
index f725b7768ff3..0a610fbe7864 100644
--- a/dev-libs/nss/nss-3.11.5.ebuild
+++ b/dev-libs/nss/nss-3.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.5.ebuild,v 1.14 2007/10/16 17:19:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.5.ebuild,v 1.15 2007/12/17 23:09:49 redhatter Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -22,20 +22,20 @@ src_unpack() {
 
 	# hack nspr paths
 	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include"
+		>> "${S}/mozilla/security/coreconf/headers.mk" || die "failed to append include"
 
 	# cope with nspr being in /usr/$(get_libdir)/nspr
 	sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \
-		-i ${S}/mozilla/security/coreconf/location.mk
+		-i "${S}/mozilla/security/coreconf/location.mk"
 
 	# modify install path
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i ${S}/mozilla/security/coreconf/source.mk
+		-i "${S}/mozilla/security/coreconf/source.mk"
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.11-config.patch
-	epatch ${FILESDIR}/${PN}-3.11.5-config-1.patch
-	epatch ${FILESDIR}/${PN}-mips64.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-3.11-config.patch"
+	epatch "${FILESDIR}/${PN}-3.11.5-config-1.patch"
+	epatch "${FILESDIR}/${PN}-mips64.patch"
 }
 
 src_compile() {
@@ -44,30 +44,30 @@ src_compile() {
 		export USE_64=1
 	fi
 	export NSDISTMODE=copy
-	cd ${S}/mozilla/security/coreconf
+	cd "${S}/mozilla/security/coreconf"
 	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed"
-	cd ${S}/mozilla/security/dbm
+	cd "${S}/mozilla/security/dbm"
 	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed"
-	cd ${S}/mozilla/security/nss
+	cd "${S}/mozilla/security/nss"
 	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "nss make failed"
 }
 
 src_install () {
 	MINOR_VERSION=11
-	cd ${S}/mozilla/security/dist
+	cd "${S}/mozilla/security/dist"
 
 	# put all *.a files in /usr/lib/nss (because some have conflicting names
 	# with existing libraries)
 	dodir /usr/$(get_libdir)/nss
-	cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed"
-	cp -L */lib/*.chk ${D}/usr/$(get_libdir)/nss || die "copying chk files failed"
-	cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed"
+	cp -L */lib/*.so "${D}/usr/$(get_libdir)/nss" || die "copying shared libs failed"
+	cp -L */lib/*.chk "${D}/usr/$(get_libdir)/nss" || die "copying chk files failed"
+	cp -L */lib/*.a "${D}/usr/$(get_libdir)/nss" || die "copying libs failed"
 
 	# all the include files
 	insinto /usr/include/nss
 	doins private/nss/*.h
 	doins public/nss/*.h
-	cd ${D}/usr/$(get_libdir)/nss
+	cd "${D}/usr/$(get_libdir)/nss"
 	for file in *.so; do
 		mv ${file} ${file}.${MINOR_VERSION}
 		ln -s ${file}.${MINOR_VERSION} ${file}
@@ -76,12 +76,12 @@ src_install () {
 	# coping with nss being in a different path. We move up priority to
 	# ensure that nss/nspr are used specifically before searching elsewhere.
 	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/08nss
+	echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}/etc/env.d/08nss"
 
 	dodir /usr/bin
 	dodir /usr/$(get_libdir)/pkgconfig
-	cp ${FILESDIR}/nss-config.in ${D}/usr/bin/nss-config
-	cp ${FILESDIR}/nss.pc.in ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
+	cp "${FILESDIR}/nss-config.in" "${D}/usr/bin/nss-config"
+	cp "${FILESDIR}/nss.pc.in" "${D}/usr/$(get_libdir)/pkgconfig/nss.pc"
 	NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
 	NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
 	NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
@@ -93,8 +93,8 @@ src_install () {
 		-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
 		-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
 		-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-		-i ${D}/usr/bin/nss-config
-	chmod 755 ${D}/usr/bin/nss-config
+		-i "${D}/usr/bin/nss-config"
+	chmod 755 "${D}/usr/bin/nss-config"
 
 	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
 	      -e "s,@prefix@,/usr,g" \
@@ -102,6 +102,6 @@ src_install () {
 	      -e "s,@includedir@,\$\{prefix}/include/nss," \
 	      -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \
 	      -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \
-	      -i ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
-	chmod 644 ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
+	      -i "${D}/usr/$(get_libdir)/pkgconfig/nss.pc"
+	chmod 644 "${D}/usr/$(get_libdir)/pkgconfig/nss.pc"
 }
diff --git a/dev-libs/nss/nss-3.11.7.ebuild b/dev-libs/nss/nss-3.11.7.ebuild
index 9ad743e18fd4..9d725c04949c 100644
--- a/dev-libs/nss/nss-3.11.7.ebuild
+++ b/dev-libs/nss/nss-3.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild,v 1.12 2007/12/12 14:14:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild,v 1.13 2007/12/17 23:09:49 redhatter Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="utils"
 
 DEPEND=">=dev-libs/nspr-${NSPR_VER}"