Make nss respect CFLAGS thanks to Ed Catmur bug#143619

Package-Manager: portage-2.1.1

4 files changed, 129 insertions, 5 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 7365e32c4975..21504fc58486 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.73 2006/09/27 21:48:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.74 2006/10/06 23:08:35 alonbl Exp $
+
+*nss-3.11.3-r1 (06 Oct 2006)
+
+  06 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> +nss-3.11.3-r1.ebuild:
+  Make nss respect CFLAGS thanks to Ed Catmur bug#143619
 
   27 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> nss-3.11.3.ebuild:
   Stable on ia64.
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index bc9151fa110e..9234ede5faf1 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -51,6 +51,10 @@ EBUILD nss-3.11.2.ebuild 3959 RMD160 a5183c926b1e1a5525ec914fabb385a49a29fad6 SH
 MD5 d313fe101680e4934bade1f8ca8a7a82 nss-3.11.2.ebuild 3959
 RMD160 a5183c926b1e1a5525ec914fabb385a49a29fad6 nss-3.11.2.ebuild 3959
 SHA256 38c3a59e070344f593f7782aa37edb8db50290068148340bd5af93e93fd2fe10 nss-3.11.2.ebuild 3959
+EBUILD nss-3.11.3-r1.ebuild 3983 RMD160 59c63d92074bbf402f30d63a28063d2f663e2c86 SHA1 b7e5fe35622d633e46327cf38ab0261953947307 SHA256 886daa14be10351b828f3d5a508530eff60ff5c4b45fd5e720e545e118aa140c
+MD5 29d729ae3512321cd7f6f49bcf1a39d6 nss-3.11.3-r1.ebuild 3983
+RMD160 59c63d92074bbf402f30d63a28063d2f663e2c86 nss-3.11.3-r1.ebuild 3983
+SHA256 886daa14be10351b828f3d5a508530eff60ff5c4b45fd5e720e545e118aa140c nss-3.11.3-r1.ebuild 3983
 EBUILD nss-3.11.3.ebuild 3887 RMD160 e1cd8e45f6d6127834bbc5c64158912eaf7abafd SHA1 3614b016dee3d52e22d300523ce8e333c8dfd3cb SHA256 b46736413883a1ba461266c1abc2d2af6b9a4af07fad1cc58735c31a5216e752
 MD5 31d800d61d2946806a51c466ea4ae724 nss-3.11.3.ebuild 3887
 RMD160 e1cd8e45f6d6127834bbc5c64158912eaf7abafd nss-3.11.3.ebuild 3887
@@ -63,10 +67,10 @@ EBUILD nss-3.9.2-r3.ebuild 3318 RMD160 3f1c624d938d95d5ecdf210e8a1b42646ec655c8
 MD5 364680aea7c774c0de0f0849f99a6f81 nss-3.9.2-r3.ebuild 3318
 RMD160 3f1c624d938d95d5ecdf210e8a1b42646ec655c8 nss-3.9.2-r3.ebuild 3318
 SHA256 257823dd512909b0d4c37f3dc926aa087a908430d30a05cb23ab9988fbed16b5 nss-3.9.2-r3.ebuild 3318
-MISC ChangeLog 8835 RMD160 464a8c90a9daca9a550bb0a117f0827a207aefe5 SHA1 8c352a0639bf6929304092ab309d9b6c126817b9 SHA256 3735a16fbd060d93dcc50f5e5ef26e246d89733eab3c4ea9fa8c41f6dd8f27d7
-MD5 23725835fc19b3849da4f1fcf464c8ea ChangeLog 8835
-RMD160 464a8c90a9daca9a550bb0a117f0827a207aefe5 ChangeLog 8835
-SHA256 3735a16fbd060d93dcc50f5e5ef26e246d89733eab3c4ea9fa8c41f6dd8f27d7 ChangeLog 8835
+MISC ChangeLog 8994 RMD160 fbc213eb8f229452db1f86c55bbaab1fca215cbf SHA1 5c23e320f92c7eab20e78ec0bba09b65b785bac9 SHA256 4c15640ce2a626e68fd387f4205895dd475f965ce6f553ec62ca662be6bd26c0
+MD5 deaff1bd37de310ca3839df462ffc482 ChangeLog 8994
+RMD160 fbc213eb8f229452db1f86c55bbaab1fca215cbf ChangeLog 8994
+SHA256 4c15640ce2a626e68fd387f4205895dd475f965ce6f553ec62ca662be6bd26c0 ChangeLog 8994
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159
@@ -83,6 +87,9 @@ SHA256 07decf22415d2db641b6cb934a5d4b489e4a6cd89a85658a02ccc5c4d2b827e7 files/di
 MD5 06a2211638805e90648102e6b5ee6fff files/digest-nss-3.11.3 235
 RMD160 f5289d1ed97f0369e59d265ce8f0e41379d98aa1 files/digest-nss-3.11.3 235
 SHA256 2d9a5ffde98268d6d3aee0a56354a526a61e58988a2fd5b3bcbf972a3b3ebbd5 files/digest-nss-3.11.3 235
+MD5 06a2211638805e90648102e6b5ee6fff files/digest-nss-3.11.3-r1 235
+RMD160 f5289d1ed97f0369e59d265ce8f0e41379d98aa1 files/digest-nss-3.11.3-r1 235
+SHA256 2d9a5ffde98268d6d3aee0a56354a526a61e58988a2fd5b3bcbf972a3b3ebbd5 files/digest-nss-3.11.3-r1 235
 MD5 9791a64525444c3bca0d2e76e050ef33 files/digest-nss-3.9.2-r2 232
 RMD160 fb37b59135e72457340d2ecd1859da535fc9d4ce files/digest-nss-3.9.2-r2 232
 SHA256 346b419b2d3747dc86365f6d2a1253aebc54900d885321d97e901b388d71d904 files/digest-nss-3.9.2-r2 232
diff --git a/dev-libs/nss/files/digest-nss-3.11.3-r1 b/dev-libs/nss/files/digest-nss-3.11.3-r1
new file mode 100644
index 000000000000..a6272bc9bb24
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.11.3-r1
@@ -0,0 +1,3 @@
+MD5 196c8d2746bd75d3561d129f64bbf9cf nss-3.11.3.tar.gz 3684552
+RMD160 da84f03f52453a307b27602e4a42205b20c02947 nss-3.11.3.tar.gz 3684552
+SHA256 41278699b80dc3767f3d505f3526e6acb2911fd75bf82167bb3b3753aa5f4c6f nss-3.11.3.tar.gz 3684552
diff --git a/dev-libs/nss/nss-3.11.3-r1.ebuild b/dev-libs/nss/nss-3.11.3-r1.ebuild
new file mode 100644
index 000000000000..de7fd5d6883c
--- /dev/null
+++ b/dev-libs/nss/nss-3.11.3-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.3-r1.ebuild,v 1.1 2006/10/06 23:08:35 alonbl Exp $
+
+inherit eutils flag-o-matic
+
+NSPR_VER="4.6.3"
+RTM_NAME="NSS_${PV//./_}_RTM"
+DESCRIPTION="Mozilla's Netscape 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"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/libc
+	app-arch/zip
+	>=dev-libs/nspr-${NSPR_VER}"
+
+src_unpack() {
+	unpack ${A}
+
+	# hack nspr paths
+	echo 'INCLUDES += -I${ROOT}/usr/include/nspr -I$(DIST)/include/dbm' \
+		>> ${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:${ROOT}/usr/'"$(get_libdir)"/nspr':' \
+		-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
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.11-config.patch
+	epatch ${FILESDIR}/${PN}-3.11-config-1.patch
+	epatch ${FILESDIR}/${PN}-mips64.patch
+}
+
+src_compile() {
+	strip-flags
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		export USE_64=1
+	fi
+	export NSDISTMODE=copy
+	cd ${S}/mozilla/security/coreconf
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed"
+	cd ${S}/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed"
+	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
+
+	# 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"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins private/nss/*.h
+	doins public/nss/*.h
+	cd ${D}/usr/$(get_libdir)/nss
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+
+	# 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
+
+	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
+	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}'`
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+		-e "s,@prefix@,/usr,g" \
+		-e "s,@exec_prefix@,\$\{prefix},g" \
+		-e "s,@includedir@,\$\{prefix}/include/nss,g" \
+		-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
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+	      -e "s,@prefix@,/usr,g" \
+	      -e "s,@exec_prefix@,\$\{prefix},g" \
+	      -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
+}