Fix to build with gcc4. Patch from halcy0n's overlay.

(Portage version: 2.0.51.20-r4)

5 files changed, 147 insertions, 4 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 84eda1df0397..e7857f047084 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.43 2005/02/04 06:09:54 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.44 2005/04/25 09:36:58 azarah Exp $
+
+*nss-3.9.2-r3 (25 Apr 2005)
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/nss-3.9.2-gcc4.patch, +nss-3.9.2-r3.ebuild:
+  Fix to build with gcc4.  Patch from halcy0n's overlay.
 
   04 Feb 2005; Stephen P. Becker <geoman@gentoo.org> nss-3.9.2-r2.ebuild:
   stable on mips
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 49f329791040..a28a76b926b4 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,13 +1,16 @@
+MD5 71d1c738c99b927ab27d35b4f765c72d nss-3.8.ebuild 2605
 MD5 9f76096b9ca6eaeae44fa1605fc434bb ChangeLog 4927
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 71d1c738c99b927ab27d35b4f765c72d nss-3.8.ebuild 2605
 MD5 ce0895de1cbdb062720ab2d65b0724f7 nss-3.9.2.ebuild 2227
 MD5 80437a059e77f1ec174f0985632dab5a nss-3.9.2-r2.ebuild 3263
+MD5 4a4f891fe6da2966ab6a1fbed9653bc6 nss-3.9.2-r3.ebuild 3325
+MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
 MD5 80da1f67cfbd587017f411109c5ca57b files/digest-nss-3.8 60
-MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
 MD5 c0b014e0fdabd7754008a3112553be18 files/nss-3.8-mips.patch 689
-MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
+MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2 62
 MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r2 62
 MD5 8e9778b27c44abf6fb4319b7f5289b21 files/nss-3.9.2-mips64.patch 508
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/nss-3.9.2-gcc4.patch 1818
+MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r3 62
diff --git a/dev-libs/nss/files/digest-nss-3.9.2-r3 b/dev-libs/nss/files/digest-nss-3.9.2-r3
new file mode 100644
index 000000000000..c8fd29d3966d
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.9.2-r3
@@ -0,0 +1 @@
+MD5 c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz 4734817
diff --git a/dev-libs/nss/files/nss-3.9.2-gcc4.patch b/dev-libs/nss/files/nss-3.9.2-gcc4.patch
new file mode 100644
index 000000000000..2d0a04949072
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.9.2-gcc4.patch
@@ -0,0 +1,46 @@
+diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
+@@ -43,12 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
+@@ -233,12 +233,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+     ;
+ 
+diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
+@@ -55,7 +55,9 @@
+ 
+ PR_BEGIN_EXTERN_C
+ 
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+ 
diff --git a/dev-libs/nss/nss-3.9.2-r3.ebuild b/dev-libs/nss/nss-3.9.2-r3.ebuild
new file mode 100644
index 000000000000..4d29571b74db
--- /dev/null
+++ b/dev-libs/nss/nss-3.9.2-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.9.2-r3.ebuild,v 1.1 2005/04/25 09:36:58 azarah Exp $
+
+inherit eutils
+
+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"
+IUSE=""
+
+DEPEND="virtual/libc
+	app-arch/zip
+	>=dev-libs/nspr-4.4.1-r2"
+
+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"
+
+	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \
+		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \
+		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile
+	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \
+		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \
+		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
+
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:-L$(DIST)/lib.:-L$(DIST)/lib/ -L/usr/'"$(get_libdir)"'/nspr/ :g' \
+		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile \
+		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/manifest.mn \
+		-i ${S}/mozilla/security/nss/lib/ckfw/dbm/manifest.mn \
+		-i ${S}/mozilla/security/nss/cmd/platlibs.mk \
+		-i ${S}/mozilla/security/nss/cmd/pkiutil/platlibs.mk \
+		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile \
+		-i ${S}/mozilla/security/nss/lib/freebl/config.mk \
+		-i ${S}/mozilla/security/nss/lib/nss/config.mk \
+		-i ${S}/mozilla/security/nss/lib/smime/config.mk \
+		-i ${S}/mozilla/security/nss/lib/softoken/config.mk \
+		-i ${S}/mozilla/security/nss/lib/ssl/config.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}-${PV}-ppc64.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-mips64.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-gcc4.patch
+}
+
+src_compile() {
+	cd ${S}/mozilla/security/coreconf
+
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+	cd ${S}/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 || die "dbm make failed"
+	cd ${S}/mozilla/security/nss
+	emake -j1 BUILD_OPT=1 || die "nss make failed"
+}
+
+src_install () {
+	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/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed"
+	cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins private/nss/*.h
+	doins public/nss/*.h
+
+	# coping with nss being in a different path
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/50nss
+
+	# NOTE: we ignore the binary files
+}