remove stable ebuilds/files

(Portage version: 2.1.8.3/cvs/Linux x86_64)

20 files changed, 12 insertions, 1561 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 23059dba42bc..d09a2a1e2960 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.175 2010/04/08 15:28:38 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.176 2010/04/10 04:00:45 anarchy Exp $
+
+  10 Apr 2010; <anarchy@gentoo.org> -files/3.12-nss.pc.in,
+  -files/nss-3.11.5-config-1.patch, -nss-3.11.9-r1.ebuild,
+  -files/nss-3.11-config.patch, -nss-3.12.2.ebuild, -nss-3.12.3.ebuild,
+  -nss-3.12.3-r1.ebuild, -files/nss-3.12.3-executable-stacks.patch,
+  -files/nss-3.12-config-1.patch, -nss-3.12.4-r2.ebuild,
+  -files/nss-3.12.4-gentoo-fixups-1.diff, -files/3.12-nss-config.in,
+  -files/nss-3.11-config-1.patch, -files/nss-3.12-config.patch,
+  -files/nss.pc.in, -files/nss-config.in, -files/nss-fbsd7.patch,
+  -files/nss-mips64-2.patch, -files/nss-mips64.patch:
+  remove stable ebuilds/files
 
   08 Apr 2010; <anarchy@gentoo.org> nss-3.12.6-r1.ebuild:
   use nspr-config to determine includes/libdir
diff --git a/dev-libs/nss/files/3.12-nss-config.in b/dev-libs/nss/files/3.12-nss-config.in
deleted file mode 100644
index 3a88aaacd290..000000000000
--- a/dev-libs/nss/files/3.12-nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/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
-	nssutil
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=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
-      ;;
-    nssutil)
-      lib_nssutil=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
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/dev-libs/nss/files/3.12-nss.pc.in b/dev-libs/nss/files/3.12-nss.pc.in
deleted file mode 100644
index ab0726c9ffa2..000000000000
--- a/dev-libs/nss/files/3.12-nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSS
-Description: Network Security Services
-Version: @NSS_VERSION@
-Requires: nspr >= @NSPR_VERSION@
-Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
-Cflags: -I${includedir}
diff --git a/dev-libs/nss/files/nss-3.11-config-1.patch b/dev-libs/nss/files/nss-3.11-config-1.patch
deleted file mode 100644
index 3b2cd8a6ba93..000000000000
--- a/dev-libs/nss/files/nss-3.11-config-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux.mk	2006-02-09 05:27:36.000000000 +0000
-@@ -37,6 +37,8 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
-+NSS_VERSION_MINOR=11
-+
- #
- # The default implementation strategy for Linux is now pthreads
- #
---- mozilla/security/coreconf/Linux2.6.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux2.6.mk	2006-02-09 05:38:16.000000000 +0000
-@@ -38,8 +38,7 @@
- include $(CORE_DEPTH)/coreconf/Linux.mk
- 
- OS_REL_CFLAGS   += -DLINUX2_1
--MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
--
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR)
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
---- mozilla/security/coreconf/rules.mk.orig	2005-10-10 23:46:12.000000000 +0000
-+++ mozilla/security/coreconf/rules.mk	2006-02-09 06:27:46.000000000 +0000
-@@ -113,7 +113,10 @@
- 	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
- endif
- ifdef SHARED_LIBRARY
-+	mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR)
-+	ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY)
-	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+	$(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR)	
- endif
- ifdef IMPORT_LIBRARY
- 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
diff --git a/dev-libs/nss/files/nss-3.11-config.patch b/dev-libs/nss/files/nss-3.11-config.patch
deleted file mode 100644
index ac579c890875..000000000000
--- a/dev-libs/nss/files/nss-3.11-config.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- 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.5-config-1.patch b/dev-libs/nss/files/nss-3.11.5-config-1.patch
deleted file mode 100644
index a39e30dddf17..000000000000
--- a/dev-libs/nss/files/nss-3.11.5-config-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux.mk	2006-02-09 05:27:36.000000000 +0000
-@@ -37,6 +37,8 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
-+NSS_VERSION_MINOR=11
-+
- #
- # The default implementation strategy for Linux is now pthreads
- #
---- mozilla/security/coreconf/Linux2.6.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux2.6.mk	2006-02-09 05:38:16.000000000 +0000
-@@ -38,8 +38,7 @@
- include $(CORE_DEPTH)/coreconf/Linux.mk
- 
- OS_REL_CFLAGS   += -DLINUX2_1
--MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
--
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR)
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
---- mozilla/security/coreconf/rules.mk.orig	2005-10-10 23:46:12.000000000 +0000
-+++ mozilla/security/coreconf/rules.mk	2006-02-09 06:27:46.000000000 +0000
-@@ -113,7 +113,10 @@
-	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
- endif
- ifdef SHARED_LIBRARY
-+	mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR)
-+	ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY)
-	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+	$(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR)
- ifdef MOZ_DEBUG_SYMBOLS
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
-	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
-
diff --git a/dev-libs/nss/files/nss-3.12-config-1.patch b/dev-libs/nss/files/nss-3.12-config-1.patch
deleted file mode 100644
index 26289e1410fc..000000000000
--- a/dev-libs/nss/files/nss-3.12-config-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux.mk	2006-02-09 05:27:36.000000000 +0000
-@@ -37,6 +37,8 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
-+NSS_VERSION_MINOR=12
-+
- #
- # The default implementation strategy for Linux is now pthreads
- #
---- mozilla/security/coreconf/Linux2.6.mk.orig	2005-09-16 17:09:23.000000000 +0000
-+++ mozilla/security/coreconf/Linux2.6.mk	2006-02-09 05:38:16.000000000 +0000
-@@ -38,8 +38,7 @@
- include $(CORE_DEPTH)/coreconf/Linux.mk
- 
- OS_REL_CFLAGS   += -DLINUX2_1
--MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
--
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR)
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
---- mozilla/security/coreconf/rules.mk.orig	2005-10-10 23:46:12.000000000 +0000
-+++ mozilla/security/coreconf/rules.mk	2006-02-09 06:27:46.000000000 +0000
-@@ -113,7 +113,10 @@
-	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
- endif
- ifdef SHARED_LIBRARY
-+	mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR)
-+	ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY)
-	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+	$(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR)
- ifdef MOZ_DEBUG_SYMBOLS
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
-	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
-
diff --git a/dev-libs/nss/files/nss-3.12-config.patch b/dev-libs/nss/files/nss-3.12-config.patch
deleted file mode 100644
index 085648e11039..000000000000
--- a/dev-libs/nss/files/nss-3.12-config.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -ur mozilla.orig/security/nss/lib/ckfw/builtins/config.mk mozilla/security/nss/lib/ckfw/builtins/config.mk
---- mozilla.orig/security/nss/lib/ckfw/builtins/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ckfw/builtins/config.mk	2009-04-15 15:31:02.000000000 +0000
-@@ -79,3 +79,10 @@
- endif
- 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
-+
-Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.orig
-Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.rej
-diff -ur mozilla.orig/security/nss/lib/ckfw/capi/config.mk mozilla/security/nss/lib/ckfw/capi/config.mk
---- mozilla.orig/security/nss/lib/ckfw/capi/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ckfw/capi/config.mk	2009-04-15 15:29:42.000000000 +0000
-@@ -71,3 +71,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
-+
-Only in mozilla/security/nss/lib/ckfw/capi: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/freebl/Makefile mozilla/security/nss/lib/freebl/Makefile
---- mozilla.orig/security/nss/lib/freebl/Makefile	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/freebl/Makefile	2009-04-15 15:29:42.000000000 +0000
-@@ -143,6 +143,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
-Only in mozilla/security/nss/lib/freebl: Makefile.orig
-diff -ur mozilla.orig/security/nss/lib/nss/config.mk mozilla/security/nss/lib/nss/config.mk
---- mozilla.orig/security/nss/lib/nss/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/nss/config.mk	2009-04-15 15:29:42.000000000 +0000
-@@ -83,6 +83,11 @@
- 
- 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
- 
- # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
- SHARED_LIBRARY_LIBS = \
-Only in mozilla/security/nss/lib/nss: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk
---- mozilla.orig/security/nss/lib/smime/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/smime/config.mk	2009-04-15 15:31:30.000000000 +0000
-@@ -106,3 +106,8 @@
- 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
-Only in mozilla/security/nss/lib/smime: config.mk.orig
-Only in mozilla/security/nss/lib/smime: config.mk.rej
-diff -ur mozilla.orig/security/nss/lib/softoken/config.mk mozilla/security/nss/lib/softoken/config.mk
---- mozilla.orig/security/nss/lib/softoken/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/softoken/config.mk	2009-04-15 15:29:42.000000000 +0000
-@@ -114,6 +114,12 @@
- 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 ($(OS_TARGET),WINCE)
- DEFINES += -DDBM_USING_NSPR
- endif
-Only in mozilla/security/nss/lib/softoken: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk
---- mozilla.orig/security/nss/lib/ssl/config.mk	2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ssl/config.mk	2009-04-15 15:29:42.000000000 +0000
-@@ -130,4 +130,10 @@
- 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
-+
- endif
-Only in mozilla/security/nss/lib/ssl: config.mk.orig
diff --git a/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch b/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch
deleted file mode 100644
index aedbebf7fdad..000000000000
--- a/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/security/nss/lib/freebl/intel-aes.s-old	2009-06-21 14:20:10.491641710 -0500
-+++ mozilla/security/nss/lib/freebl/intel-aes.s	2009-06-21 14:21:33.846655888 -0500
-@@ -1633,4 +1633,10 @@
- 
- 	xor	%eax, %eax
- 	ret
--	.size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
-+	.size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+
-
diff --git a/dev-libs/nss/files/nss-3.12.4-gentoo-fixups-1.diff b/dev-libs/nss/files/nss-3.12.4-gentoo-fixups-1.diff
deleted file mode 100644
index b2563592305a..000000000000
--- a/dev-libs/nss/files/nss-3.12.4-gentoo-fixups-1.diff
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/Makefile	2009-09-14 21:45:45.619639265 -0500
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH      = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+	# Create the nss.pc file
-+	mkdir -p $(DIST)/lib/pkgconfig
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/gentoo/nss," \
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss.pc.in > nss.pc
-+	chmod 0644 nss.pc
-+	ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+	# Create the nss-config script
-+	mkdir -p $(DIST)/bin
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss-config.in > nss-config
-+	chmod 0755 nss-config
-+	ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in	2009-09-14 21:47:45.190638078 -0500
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_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
-+	nssutil
-+EOF
-+	exit $1
-+}
-+
-+if test $# -eq 0; then
-+	usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=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
-+      ;;
-+    nssutil)                                                      
-+      lib_nssutil=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=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+    includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+    libdir=`pkg-config --variable=libdir nss`
-+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
-+      if test -n "$lib_nssutil"; then
-+       libdirs="$libdirs -lnssutil${major_version}"
-+      fi
-+      echo $libdirs
-+fi      
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in	2009-09-14 21:45:45.653637310 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
-+Cflags: -I${includedir}
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/Makefile	2008-12-02 17:24:39.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/Makefile	2009-09-14 21:45:45.678657145 -0500
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
- 
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
- 
-@@ -140,12 +140,6 @@
- 	--with-dist-prefix='$(NSPR_PREFIX)' \
- 	--with-dist-includedir='$(NSPR_PREFIX)/include'
- 
--build_nspr: $(NSPR_CONFIG_STATUS)
--	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
--	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
--
- build_dbm:
- ifndef NSS_DISABLE_DBM
- 	cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
-diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn
---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn	2008-04-04 15:36:59.000000000 -0500
-+++ nss-3.12.4/mozilla/security/nss/manifest.mn	2009-09-14 21:45:45.703656167 -0500
-@@ -42,6 +42,6 @@
- 
- RELEASE = nss
- 
--DIRS = lib cmd
-+DIRS = lib cmd config
- 
- 
diff --git a/dev-libs/nss/files/nss-config.in b/dev-libs/nss/files/nss-config.in
deleted file mode 100644
index 664fafeed06e..000000000000
--- a/dev-libs/nss/files/nss-config.in
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/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-fbsd7.patch b/dev-libs/nss/files/nss-fbsd7.patch
deleted file mode 100644
index 932f9e0ea639..000000000000
--- a/dev-libs/nss/files/nss-fbsd7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=436806
-
-objformat has been deprecated for a while. elf has been the default format for
-FreeBSD for a while too. objformat is gone from FreeBSD 7, so we default to elf.
-
---- nss-3.12/mozilla/security/coreconf/FreeBSD.mk.old	2008-09-05 11:38:11 +0200
-+++ nss-3.12/mozilla/security/coreconf/FreeBSD.mk	2008-09-05 11:38:28 +0200
-@@ -65,7 +65,7 @@
- 
- ARCH			= freebsd
- 
--MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
- 
- ifeq ($(MOZ_OBJFORMAT),elf)
- DLL_SUFFIX		= so
diff --git a/dev-libs/nss/files/nss-mips64-2.patch b/dev-libs/nss/files/nss-mips64-2.patch
deleted file mode 100644
index 8257eb4d9095..000000000000
--- a/dev-libs/nss/files/nss-mips64-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig	2008-12-11 09:12:48.000000000 +0000
-+++ mozilla/security/coreconf/Linux.mk	2008-12-11 09:13:51.000000000 +0000
-@@ -119,6 +119,10 @@
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = mips
- else
-+ifeq ($(OS_TEST),mips64)
-+	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-+	CPU_ARCH        = mips64
-+else
- ifeq (,$(filter-out i%86,$(OS_TEST)))
- 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
- 	CPU_ARCH	= x86
-@@ -140,6 +144,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/files/nss-mips64.patch b/dev-libs/nss/files/nss-mips64.patch
deleted file mode 100644
index 5abb26634743..000000000000
--- a/dev-libs/nss/files/nss-mips64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig	2004-08-21 00:07:08.000000000 -0400
-+++ mozilla/security/coreconf/Linux.mk	2004-08-20 23:28:52.000000000 -0400
-@@ -106,6 +106,10 @@
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = mips
- else
-+ifeq ($(OS_TEST),mips64)
-+	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-+	CPU_ARCH        = mips64
-+else
- 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
- 	CPU_ARCH	= x86
- endif
-@@ -122,6 +126,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/files/nss.pc.in b/dev-libs/nss/files/nss.pc.in
deleted file mode 100644
index 1c5ac9626409..000000000000
--- a/dev-libs/nss/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: 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.11.9-r1.ebuild b/dev-libs/nss/nss-3.11.9-r1.ebuild
deleted file mode 100644
index bb42e858a2cc..000000000000
--- a/dev-libs/nss/nss-3.11.9-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.9-r1.ebuild,v 1.1 2008/11/25 14:50:17 armin76 Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.6.8"
-RTM_NAME="NSS_${PV//./_}_RTM"
-DESCRIPTION="Mozilla's Network 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 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="utils"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/mozilla/security/coreconf
-	# hack nspr paths
-	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> 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 location.mk
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	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() {
-	strip-flags
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		export USE_64=1
-	fi
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	cd "${S}"/mozilla/security/coreconf
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || 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
-
-	if use utils; then
-		cd "${S}"/mozilla/security/dist/*/bin/
-		for f in *; do
-			newbin ${f} nss${f}
-		done
-	fi
-}
diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild
deleted file mode 100644
index 74105c2a0302..000000000000
--- a/dev-libs/nss/nss-3.12.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.2.ebuild,v 1.6 2009/04/12 14:56:16 bluebird Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.3"
-RTM_NAME="NSS_${PV//./_}_RTM"
-DESCRIPTION="Mozilla's Network 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"
-SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="utils"
-
-S="${WORKDIR}"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/mozilla/security/coreconf
-	# hack nspr paths
-	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> 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 location.mk
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.11-config.patch
-	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
-	epatch "${FILESDIR}"/${PN}-mips64-2.patch
-}
-
-src_compile() {
-	strip-flags
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	*64-bit*) export USE_64=1;;
-	*32-bit*) ;;
-	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	export NSDISTMODE=copy
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSS_ENABLE_ECC=1
-	cd "${S}"/mozilla/security/coreconf
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed"
-}
-
-src_install () {
-	MINOR_VERSION=12
-	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}"/3.12-nss-config.in "${D}"/usr/bin/nss-config
-	cp "${FILESDIR}"/3.12-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
-
-	if use utils; then
-		cd "${S}"/mozilla/security/dist/*/bin/
-		for f in *; do
-			newbin ${f} nss${f}
-		done
-	fi
-}
diff --git a/dev-libs/nss/nss-3.12.3-r1.ebuild b/dev-libs/nss/nss-3.12.3-r1.ebuild
deleted file mode 100644
index ebc44ffaab5c..000000000000
--- a/dev-libs/nss/nss-3.12.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3-r1.ebuild,v 1.8 2009/09/05 20:39:37 keytoaster Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-RTM_NAME="NSS_${PV//./_}_RTM"
-DESCRIPTION="Mozilla's Network 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.bz2"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-#	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="utils"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/mozilla/security/coreconf
-	# hack nspr paths
-	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> 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 location.mk
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.12-config.patch
-	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
-	epatch "${FILESDIR}"/${PN}-mips64-2.patch
-	epatch "${FILESDIR}"/${P}-executable-stacks.patch
-}
-
-src_compile() {
-	strip-flags
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	*64-bit*) export USE_64=1;;
-	*32-bit*) ;;
-	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	export NSDISTMODE=copy
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSS_ENABLE_ECC=1
-	export NSPR_LIB_DIR="/usr/$(get_libdir)/nspr"
-	cd "${S}"/mozilla/security/coreconf
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed"
-}
-
-src_install () {
-	MINOR_VERSION=12
-	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}"/3.12-nss-config.in "${D}"/usr/bin/nss-config
-	cp "${FILESDIR}"/3.12-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
-
-	if use utils; then
-		cd "${S}"/mozilla/security/dist/*/bin/
-		for f in *; do
-			newbin ${f} nss${f}
-		done
-	fi
-}
diff --git a/dev-libs/nss/nss-3.12.3.ebuild b/dev-libs/nss/nss-3.12.3.ebuild
deleted file mode 100644
index 6110ee02cfb2..000000000000
--- a/dev-libs/nss/nss-3.12.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3.ebuild,v 1.1 2009/04/15 13:37:53 armin76 Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-RTM_NAME="NSS_${PV//./_}_RTM"
-DESCRIPTION="Mozilla's Network 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.bz2"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-#	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="utils"
-
-S="${WORKDIR}/${P}"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/mozilla/security/coreconf
-	# hack nspr paths
-	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> 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 location.mk
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.12-config.patch
-	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
-	epatch "${FILESDIR}"/${PN}-mips64-2.patch
-}
-
-src_compile() {
-	strip-flags
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	*64-bit*) export USE_64=1;;
-	*32-bit*) ;;
-	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	export NSDISTMODE=copy
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSS_ENABLE_ECC=1
-	cd "${S}"/mozilla/security/coreconf
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
-	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed"
-}
-
-src_install () {
-	MINOR_VERSION=12
-	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}"/3.12-nss-config.in "${D}"/usr/bin/nss-config
-	cp "${FILESDIR}"/3.12-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
-
-	if use utils; then
-		cd "${S}"/mozilla/security/dist/*/bin/
-		for f in *; do
-			newbin ${f} nss${f}
-		done
-	fi
-}
diff --git a/dev-libs/nss/nss-3.12.4-r2.ebuild b/dev-libs/nss/nss-3.12.4-r2.ebuild
deleted file mode 100644
index e9c7004bb05c..000000000000
--- a/dev-libs/nss/nss-3.12.4-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4-r2.ebuild,v 1.2 2009/11/06 13:29:36 anarchy Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-RTM_NAME="NSS_${PV//./_}_RTM"
-DESCRIPTION="Mozilla's Network 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"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-#	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="utils"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5"
-
-src_unpack() {
-	unpack ${A}
-
-	# Custom changes for gentoo
-	epatch "${FILESDIR}"/"${P}"-gentoo-fixups-1.diff
-
-	cd "${S}"/mozilla/security/coreconf
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	# Ensure we stay multilib aware
-	sed -i -e "s:gentoo:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile
-}
-
-src_compile() {
-	strip-flags
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	*64-bit*) export USE_64=1;;
-	*32-bit*) ;;
-	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-	export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export XCFLAGS="${CFLAGS}"
-	export FREEBL_NO_DEPEND=1
-
-	cd "${S}"/mozilla/security/coreconf
-	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
-	emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
-	emake -j1 CC="$(tc-getCC)" || die "nss make failed"
-}
-
-src_install () {
-	MINOR_VERSION=12
-	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"
-
-	# Install nspr-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${D}"/usr/bin
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${D}"/usr/$(get_libdir)/pkgconfig
-
-	# 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
-
-	if use utils; then
-		cd "${S}"/mozilla/security/dist/*/bin/
-		for f in *; do
-			newbin ${f} nss${f}
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "We have reverted back to using upstreams soname."
-	elog "Please run revdep-rebuild --library libnss3.so.12 , this"
-	elog "will correct most issues. If you find a binary that does"
-	elog "not run please re-emerge package to ensure it properly"
-	elog " links after upgrade."
-	elog
-}