revision bump, with proper modification for nss-config

(Portage version: 2.1_pre4-r1)

10 files changed, 406 insertions, 106 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index a1e415932589..05f0a1a36ad8 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2006/01/26 21:42:47 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.47 2006/01/30 17:36:32 anarchy Exp $
+
+*nss-3.11 (30 Jan 2006)
+
+  30 Jan 2006; <anarchy@gentoo.org> +files/nss-3.11-config.patch,
+  +files/nss-3.11-zdefs.patch, files/nss.pc.in, +files/nss-config.in,
+  -nss-3.10.ebuild, +nss-3.11.ebuild:
+  revision bump, with proper modification for nss-config
 
 *nss-3.10 (26 Jan 2006)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index b90ce8f87634..f35398838882 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,12 +1,51 @@
-MD5 05878d59376e2d58af9cd83b3096502a ChangeLog 5537
+MD5 d5a50393f5d74900464e86f4025a88a0 ChangeLog 5756
+RMD160 379d294f80cad1ebaa32f12edf470f5bc5ff39cb ChangeLog 5756
+SHA256 1e1624fd0a14fa23429562d6994027dabe60fc0cf694d7fe71bdb92e2657d307 ChangeLog 5756
 MD5 5ff9f249fea8d2955ae67d2af2047376 files/digest-nss-3.10 61
+RMD160 bb7ece6844c763153292f7cff687e68f97e7f24a files/digest-nss-3.10 61
+SHA256 3f2c63b701653285455871a11541bfd21a0fd627f00e655056a2fdabf630fe69 files/digest-nss-3.10 61
+MD5 93fb1be7be955df0ed2a022d6997abaf files/digest-nss-3.11 229
+RMD160 89faa75e6c5925884c3653d36d40297654219446 files/digest-nss-3.11 229
+SHA256 7961822db8eaec303b55897d6745dee2b5d1cb55ac79b88250bb016afe6c74fd files/digest-nss-3.11 229
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r2 62
+RMD160 e51cf2203f48656512cb80ad47985e2f00aafa50 files/digest-nss-3.9.2-r2 62
+SHA256 f6c7f9eb5d161150cb3ae3cd06411c8bf2d539d9569b8dbed8474abb34089780 files/digest-nss-3.9.2-r2 62
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r3 62
+RMD160 e51cf2203f48656512cb80ad47985e2f00aafa50 files/digest-nss-3.9.2-r3 62
+SHA256 f6c7f9eb5d161150cb3ae3cd06411c8bf2d539d9569b8dbed8474abb34089780 files/digest-nss-3.9.2-r3 62
+MD5 23a5eb94e38f7dcf481a83bb81143788 files/nss-3.11-config.patch 3167
+RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 files/nss-3.11-config.patch 3167
+SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c files/nss-3.11-config.patch 3167
+MD5 12bb7fc61eb53ac0d989dd31b1a5ce66 files/nss-3.11-zdefs.patch 545
+RMD160 77e0f5803d638f4e4c5565d32d184e4edbb45ad7 files/nss-3.11-zdefs.patch 545
+SHA256 f9283635903cf0c6cfda4b634263b9b02f64e65c00fa656d27592e5f2fc3458d files/nss-3.11-zdefs.patch 545
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/nss-3.9.2-gcc4.patch 1818
+RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e files/nss-3.9.2-gcc4.patch 1818
+SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046 files/nss-3.9.2-gcc4.patch 1818
 MD5 8e9778b27c44abf6fb4319b7f5289b21 files/nss-3.9.2-mips64.patch 508
+RMD160 17e750805ec8e3e6f5989810b43522bea344f133 files/nss-3.9.2-mips64.patch 508
+SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b files/nss-3.9.2-mips64.patch 508
 MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526
-MD5 6fff6f2a02f311ef3fb3dc6e870ec467 files/nss.pc.in 275
+RMD160 ba87b963b301cc0aaa3a19247ed14fc51794c790 files/nss-3.9.2-ppc64.patch 526
+SHA256 0fcf66819d218ca2bd3c48ccfde0a6365cc70a68f9c6861b82f2176449775031 files/nss-3.9.2-ppc64.patch 526
+MD5 99b1609eb56425f4ecafc6a0b457f83b files/nss-config.in 2238
+RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd files/nss-config.in 2238
+SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7 files/nss-config.in 2238
+MD5 33cb378486c19bd3ae4172c121fa7a15 files/nss.pc.in 269
+RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 files/nss.pc.in 269
+SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75 files/nss.pc.in 269
 MD5 5a175354c5a11c16ce7018948acc98be metadata.xml 218
+RMD160 0d285ed934300df6fa69d767f86c130ec33e9701 metadata.xml 218
+SHA256 1ccd545528e7c3c425fbddbc5c9efa829b36555cd13b392c0e4a90b8c7d7949f metadata.xml 218
 MD5 98abb302fdce015234913d52f338fdf2 nss-3.10.ebuild 3508
+RMD160 d13058e53903629929ee173ffd6b543720e9b521 nss-3.10.ebuild 3508
+SHA256 42df64e21a6f6413021a227a480cede995646c4ac4469c2e0880cea4877555bf nss-3.10.ebuild 3508
+MD5 226d683137e4b47644bfe95d8373a301 nss-3.11.ebuild 3667
+RMD160 9da4991c2b6055f34fef9ebd5d6a69736e6d6f55 nss-3.11.ebuild 3667
+SHA256 d4d7435f9e9d8b462d8b065c7c726884e6ecf0721bdbe7989cce031db2b99b22 nss-3.11.ebuild 3667
 MD5 80437a059e77f1ec174f0985632dab5a nss-3.9.2-r2.ebuild 3263
+RMD160 6dcccf87e0822e4ac3b5d2f05adf0a96ce67307a nss-3.9.2-r2.ebuild 3263
+SHA256 7291dc61758116e17b85278a0b204fefbedc82a139787a0fd62c93d0a492920e nss-3.9.2-r2.ebuild 3263
 MD5 70c12077b7e7383d38606366f23b041f nss-3.9.2-r3.ebuild 3324
+RMD160 e5763db29ccbe7eb1b99c1e59b67833a50b5a4a6 nss-3.9.2-r3.ebuild 3324
+SHA256 d5d299abe3da5ec80e885bcbd02bd750220e08c03278d82b3d9fe21028e411cf nss-3.9.2-r3.ebuild 3324
diff --git a/dev-libs/nss/files/digest-nss-3.10 b/dev-libs/nss/files/digest-nss-3.10
deleted file mode 100644
index 09ec1b0b9833..000000000000
--- a/dev-libs/nss/files/digest-nss-3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0d75d52aff21f88d9c055bdb78f54f8 nss-3.10.tar.gz 3622858
diff --git a/dev-libs/nss/files/digest-nss-3.11 b/dev-libs/nss/files/digest-nss-3.11
new file mode 100644
index 000000000000..802d7b71a488
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.11
@@ -0,0 +1,3 @@
+MD5 9be73bd73e361e5e36edf77f456fa20a nss-3.11.tar.gz 5002908
+RMD160 90be4b42e490084c23451ce8abcf089150357d1e nss-3.11.tar.gz 5002908
+SHA256 35b65a672c699f1e5fc082fccc29bcc65102ef8d31cff106f2ec68beace96809 nss-3.11.tar.gz 5002908
diff --git a/dev-libs/nss/files/nss-3.11-config.patch b/dev-libs/nss/files/nss-3.11-config.patch
new file mode 100644
index 000000000000..ac579c890875
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11-config.patch
@@ -0,0 +1,91 @@
+--- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig	2005-01-20 02:25:46.000000000 +0000
++++ mozilla/security/nss/lib/ckfw/builtins/config.mk	2006-01-15 05:13:08.000000000 +0000
+@@ -69,3 +69,9 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/ckfw/capi/config.mk.orig	2005-11-04 02:05:04.000000000 +0000
++++ mozilla/security/nss/lib/ckfw/capi/config.mk	2006-01-15 05:13:52.000000000 +0000
+@@ -69,3 +69,9 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2005-11-22 07:13:32.000000000 +0000
++++ mozilla/security/nss/lib/freebl/Makefile	2006-01-15 05:16:05.000000000 +0000
+@@ -132,6 +132,7 @@
+ endif
+ 
+ ifeq ($(OS_TARGET),Linux)
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
+ ifeq ($(CPU_ARCH),x86_64)
+     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
+     ASFLAGS += -march=opteron -m64 -fPIC
+--- mozilla/security/nss/lib/nss/config.mk.orig	2005-07-21 23:48:28.000000000 +0000
++++ mozilla/security/nss/lib/nss/config.mk	2006-01-15 05:11:58.000000000 +0000
+@@ -122,6 +122,11 @@
+ endif
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
+ 
+ ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
+ ifndef NS_USE_GCC
+--- mozilla/security/nss/lib/smime/config.mk.orig	2005-09-02 01:24:57.000000000 +0000
++++ mozilla/security/nss/lib/smime/config.mk	2006-01-15 05:05:53.000000000 +0000
+@@ -97,3 +97,10 @@
+ # dependencies in the same directory where it resides.
+ MKSHLIB += -R '$$ORIGIN'
+ endif
++
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/softoken/config.mk.orig	2005-10-19 01:03:31.000000000 +0000
++++ mozilla/security/nss/lib/softoken/config.mk	2006-01-15 05:07:15.000000000 +0000
+@@ -93,6 +93,12 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+ ifeq ($(OS_TARGET),WINCE)
+ DEFINES += -DDBM_USING_NSPR
+ endif
+--- mozilla/security/nss/lib/ssl/config.mk.orig	2005-10-19 01:04:16.000000000 +0000
++++ mozilla/security/nss/lib/ssl/config.mk	2006-01-15 05:10:38.000000000 +0000
+@@ -119,6 +119,12 @@
+ #EXTRA_SHARED_LIBS += -ldl -lrt -lc -z defs
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+ endif
+ 
+ # indicates dependency on freebl static lib
diff --git a/dev-libs/nss/files/nss-3.11-zdefs.patch b/dev-libs/nss/files/nss-3.11-zdefs.patch
new file mode 100644
index 000000000000..0e8128cbcaf1
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11-zdefs.patch
@@ -0,0 +1,16 @@
+Index: mozilla/security/coreconf/Linux.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
+retrieving revision 1.27
+diff -u -r1.27 Linux.mk
+--- mozilla/security/coreconf/Linux.mk	16 Sep 2005 17:09:23 -0000	1.27
++++ mozilla/security/coreconf/Linux.mk	15 Dec 2005 21:25:00 -0000
+@@ -165,7 +165,7 @@
+ ARCH			= linux
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -shared $(ARCHFLAG) -z defs
++DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,-z,defs
+ DSO_LDFLAGS		=
+ LDFLAGS			+= $(ARCHFLAG)
+ 
diff --git a/dev-libs/nss/files/nss-config.in b/dev-libs/nss/files/nss-config.in
new file mode 100644
index 000000000000..664fafeed06e
--- /dev/null
+++ b/dev-libs/nss/files/nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+    includedir=@includedir@
+fi
+if test -z "$libdir"; then
+    libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-R$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/dev-libs/nss/files/nss.pc.in b/dev-libs/nss/files/nss.pc.in
index c8e9ada7c36b..1c5ac9626409 100644
--- a/dev-libs/nss/files/nss.pc.in
+++ b/dev-libs/nss/files/nss.pc.in
@@ -1,11 +1,11 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib/nss
-includedir=/usr/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: NSS
-Description: Mozilla Network Security Services
-Version: @NSS_VER@
-Requires: nspr >= @NSPR_VER@
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -Wl,-R${libdir}
-Cflags: -I${includedir}/nss
+Description: Network Security Services
+Version: @NSS_VERSION@
+Requires: nspr >= @NSPR_VERSION@
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
+Cflags: -I${includedir}
diff --git a/dev-libs/nss/nss-3.10.ebuild b/dev-libs/nss/nss-3.10.ebuild
deleted file mode 100644
index f836a9e3ec7c..000000000000
--- a/dev-libs/nss/nss-3.10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.10.ebuild,v 1.1 2006/01/26 21:42:47 vanquirius Exp $
-
-inherit eutils
-
-NSPR_VER="4.6.1"
-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-${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"
-
-	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
-}
-
-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
-
-	# create pkg-config file
-	mkdir -p ${D}/usr/$(get_libdir)/pkgconfig/
-	sed -e "s:@NSS_VER@:${PV}:g" \
-		-e "s:@NSPR_VER@:${NSPR_VER}:g" \
-		-e "s:libdir=/usr/lib/nss:libdir=/usr/$(get_libdir)/nss:g" \
-		< ${FILESDIR}/${PN}.pc.in \
-		> ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc \
-		|| die "pkg-config file creation failed!"
-}
diff --git a/dev-libs/nss/nss-3.11.ebuild b/dev-libs/nss/nss-3.11.ebuild
new file mode 100644
index 000000000000..144a5d6ec9e9
--- /dev/null
+++ b/dev-libs/nss/nss-3.11.ebuild
@@ -0,0 +1,101 @@
+# 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.ebuild,v 1.1 2006/01/30 17:36:32 anarchy Exp $
+
+inherit eutils
+
+NSPR_VER="4.6.1"
+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-${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}-${PV}-zdefs.patch
+	epatch ${FILESDIR}/${PN}-${PV}-config.patch
+}
+
+src_compile() {
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		export USE_64=1
+	fi
+
+	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/*.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
+
+	# 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
+}