remove old versions - fixes bug #61166. crypto herd to maintainers

(Portage version: 2.0.51.22-r2)

10 files changed, 14 insertions, 605 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index e7857f047084..7237c5a0d4e1 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.44 2005/04/25 09:36:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.45 2005/08/06 07:18:28 dragonheart Exp $
+
+  06 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/nss-3.8-amd64.patch, -files/nss-3.8-hppa.patch,
+  -files/nss-3.8-mips.patch, metadata.xml, -nss-3.8.ebuild,
+  -nss-3.9.2.ebuild:
+  remove old versions - fixes bug #61166. crypto herd maintaince too.
 
 *nss-3.9.2-r3 (25 Apr 2005)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 6fde33f49c02..48714bde6f5d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 71d1c738c99b927ab27d35b4f765c72d nss-3.8.ebuild 2605
 MD5 9c67937af0825aaf6682ae1e73e64735 ChangeLog 5119
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 ce0895de1cbdb062720ab2d65b0724f7 nss-3.9.2.ebuild 2227
+MD5 5a175354c5a11c16ce7018948acc98be metadata.xml 218
+MD5 b3b588ed4b4b949457df7f1caa76b7f8 nss-3.10.ebuild 3250
 MD5 80437a059e77f1ec174f0985632dab5a nss-3.9.2-r2.ebuild 3263
 MD5 70c12077b7e7383d38606366f23b041f nss-3.9.2-r3.ebuild 3324
-MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
-MD5 80da1f67cfbd587017f411109c5ca57b files/digest-nss-3.8 60
-MD5 c0b014e0fdabd7754008a3112553be18 files/nss-3.8-mips.patch 689
-MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
+MD5 70c8bab69a5a14a00cd2ef6b3acf2ed0 files/digest-nss-3.10 61
+MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.10-ppc64.patch 526
+MD5 8e9778b27c44abf6fb4319b7f5289b21 files/nss-3.10-mips64.patch 508
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbLtG1ZcsMnZjRyIRApeHAKCZcgynbARstc8Bh/hLK9bN8l3pQgCfaa2e
-ignVcRGRCDVGzyX6/R7qx64=
-=h/42
------END PGP SIGNATURE-----
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/nss-3.9.2-gcc4.patch 1818
diff --git a/dev-libs/nss/files/digest-nss-3.8 b/dev-libs/nss/files/digest-nss-3.8
deleted file mode 100644
index e728e0bb89b4..000000000000
--- a/dev-libs/nss/files/digest-nss-3.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a186160159d51eebe636358f584d6b5 nss-3.8.tar.gz 4860543
diff --git a/dev-libs/nss/files/digest-nss-3.9.2 b/dev-libs/nss/files/digest-nss-3.9.2
deleted file mode 100644
index c8fd29d3966d..000000000000
--- a/dev-libs/nss/files/digest-nss-3.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz 4734817
diff --git a/dev-libs/nss/files/nss-3.8-amd64.patch b/dev-libs/nss/files/nss-3.8-amd64.patch
deleted file mode 100644
index 27d262e65690..000000000000
--- a/dev-libs/nss/files/nss-3.8-amd64.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -ruN mozilla.old/nsprpub/configure mozilla/nsprpub/configure
---- mozilla.old/nsprpub/configure	2003-05-19 15:05:42.000000000 -0400
-+++ mozilla/nsprpub/configure	2003-09-27 16:20:55.085325144 -0400
-@@ -3729,6 +3729,9 @@
-     ia64)
-         PR_MD_ASFILES=os_Linux_ia64.s
-         ;;
-+    x86_64)
-+        PR_MD_ASFILES=os_Linux_x86_64.s
-+        ;;
-     m68k)
-         CFLAGS="$CFLAGS -m68020-60"
-         CXXFLAGS="$CXXFLAGS -m68020-60"
-diff -ruN mozilla.old/nsprpub/configure.in mozilla/nsprpub/configure.in
---- mozilla.old/nsprpub/configure.in	2003-05-19 15:05:48.000000000 -0400
-+++ mozilla/nsprpub/configure.in	2003-09-27 16:20:55.077326360 -0400
-@@ -1218,6 +1218,9 @@
-     ia64)
-         PR_MD_ASFILES=os_Linux_ia64.s
-         ;;
-+    x86_64)
-+        PR_MD_ASFILES=os_Linux_x86_64.s
-+        ;;
-     m68k)
-         CFLAGS="$CFLAGS -m68020-60"
-         CXXFLAGS="$CXXFLAGS -m68020-60"
-diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
---- mozilla.old/nsprpub/pr/include/md/_linux.cfg	2003-02-26 18:53:38.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_linux.cfg	2003-09-27 16:20:55.053330008 -0400
-@@ -182,6 +182,52 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__x86_64__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #elif defined(__mc68000__)
- 
- #undef  IS_LITTLE_ENDIAN
-diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
---- mozilla.old/nsprpub/pr/include/md/_linux.h	2003-02-26 18:53:39.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_linux.h	2003-09-27 16:20:55.053330008 -0400
-@@ -49,6 +49,8 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
-+#elif defined(__x86_64__)
-+#define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__sparc__)
-@@ -107,6 +109,19 @@
- #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
- #endif
- 
-+#if defined(__x86_64__)
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-+#define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
-+extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
-+#define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
-+extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-+#define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
-+extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
-+#define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
-+#endif
-+
- #define USE_SETJMP
- #if defined(__GLIBC__) && __GLIBC__ >= 2
- #define _PR_POLL_AVAILABLE
-diff -ruN mozilla.old/nsprpub/pr/src/io/prprf.c mozilla/nsprpub/pr/src/io/prprf.c
---- mozilla.old/nsprpub/pr/src/io/prprf.c	2003-02-26 18:53:42.000000000 -0500
-+++ mozilla/nsprpub/pr/src/io/prprf.c	2003-09-27 16:20:55.068327728 -0400
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__powerpc__)) || \
-+#if (defined(LINUX) && defined(__x86_64__))
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
-     defined(WIN16) || defined(QNX) || \
-diff -ruN mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
---- mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s	1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s	2003-09-27 16:20:55.068327728 -0400
-@@ -0,0 +1,91 @@
-+/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+/ 
-+/ The contents of this file are subject to the Mozilla Public
-+/ License Version 1.1 (the "License"); you may not use this file
-+/ except in compliance with the License. You may obtain a copy of
-+/ the License at http://www.mozilla.org/MPL/
-+/ 
-+/ Software distributed under the License is distributed on an "AS
-+/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+/ implied. See the License for the specific language governing
-+/ rights and limitations under the License.
-+/ 
-+/ The Original Code is the Netscape Portable Runtime (NSPR).
-+/ 
-+/ The Initial Developer of the Original Code is Netscape
-+/ Communications Corporation.  Portions created by Netscape are 
-+/ Copyright (C) 2000 Netscape Communications Corporation.  All
-+/ Rights Reserved.
-+/ 
-+/ Contributor(s):
-+/ 
-+/ Alternatively, the contents of this file may be used under the
-+/ terms of the GNU General Public License Version 2 or later (the
-+/ "GPL"), in which case the provisions of the GPL are applicable 
-+/ instead of those above.  If you wish to allow use of your 
-+/ version of this file only under the terms of the GPL and not to
-+/ allow others to use your version of this file under the MPL,
-+/ indicate your decision by deleting the provisions above and
-+/ replace them with the notice and other provisions required by
-+/ the GPL.  If you do not delete the provisions above, a recipient
-+/ may use your version of this file under either the MPL or the
-+/ GPL.
-+/ 
-+
-+/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
-+/
-+/ Atomically increment the integer pointed to by 'val' and return
-+/ the result of the increment.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicIncrement
-+    .align 4
-+_PR_x86_64_AtomicIncrement:
-+    movl $1, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    incl %eax
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
-+/
-+/ Atomically decrement the integer pointed to by 'val' and return
-+/ the result of the decrement.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicDecrement
-+    .align 4
-+_PR_x86_64_AtomicDecrement:
-+    movl $-1, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    decl %eax
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
-+/
-+/ Atomically set the integer pointed to by 'val' to the new
-+/ value 'newval' and return the old value.
-+    .text
-+    .globl _PR_x86_64_AtomicSet
-+    .align 4
-+_PR_x86_64_AtomicSet:
-+    movl %esi, %eax
-+    lock
-+    xchgl %eax, (%rdi)
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-+/
-+/ Atomically add 'val' to the integer pointed to by 'ptr'
-+/ and return the result of the addition.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicAdd
-+    .align 4
-+_PR_x86_64_AtomicAdd:
-+    movl %esi, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    addl %esi, %eax
-+    ret
-diff -ruN mozilla.old/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
---- mozilla.old/security/coreconf/Linux.mk	2003-04-30 20:31:20.000000000 -0400
-+++ mozilla/security/coreconf/Linux.mk	2003-09-27 16:20:55.093323928 -0400
-@@ -66,6 +66,10 @@
- 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH	= ia64
- else
-+ifeq ($(OS_TEST),x86_64)
-+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-+	CPU_ARCH	= x86_64
-+else
- ifeq ($(OS_TEST),sparc)
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = sparc
-@@ -107,6 +111,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/files/nss-3.8-hppa.patch b/dev-libs/nss/files/nss-3.8-hppa.patch
deleted file mode 100644
index 0d378ccfd0ca..000000000000
--- a/dev-libs/nss/files/nss-3.8-hppa.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -uNr nss-3.8.orig/mozilla/nsprpub/config/Linux.mk nss-3.8/mozilla/nsprpub/config/Linux.mk
---- nss-3.8.orig/mozilla/nsprpub/config/Linux.mk	2004-04-05 20:27:43.000000000 +0000
-+++ nss-3.8/mozilla/nsprpub/config/Linux.mk	2004-04-05 20:28:07.000000000 +0000
-@@ -66,12 +66,22 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPU_ARCH		:= x86
- else
-+ifeq ($(OS_TEST),parisc)
-+OS_REL_CFLAGS		= -DLINUX1_2 -D_XOPEN_SOURCE
-+CPU_ARCH		= hppa
-+else
-+ifeq ($(OS_TEST),parisc64)
-+OS_REL_CFLAGS		= -DLINUX1_2 -D_XOPEN_SOURCE
-+CPU_ARCH		= hppa
-+else
- ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
- CPU_ARCH		:= arm
- else
- CPU_ARCH		:= $(OS_TEST)
- endif
- endif
-+endif
-+endif
- CPU_ARCH_TAG		= _$(CPU_ARCH)
- 
- CC			= gcc
-diff -uNr nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.cfg nss-3.8/mozilla/nsprpub/pr/include/md/_linux.cfg
---- nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 20:27:45.000000000 +0000
-+++ nss-3.8/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 20:28:07.000000000 +0000
-@@ -414,6 +414,96 @@
- #define PR_BYTES_PER_WORD_LOG2   2
- #define PR_BYTES_PER_DWORD_LOG2  3
- 
-+#elif defined(__hppa__)
-+
-+#undef  IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN    1
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD    4
-+
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#elif defined(__hppa__)
-+
-+#undef  IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN    1
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD    4
-+
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
- #elif defined(__s390__)
- 
- #define IS_BIG_ENDIAN 1
-diff -uNr nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.h nss-3.8/mozilla/nsprpub/pr/include/md/_linux.h
---- nss-3.8.orig/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 20:27:45.000000000 +0000
-+++ nss-3.8/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 20:28:07.000000000 +0000
-@@ -63,6 +63,8 @@
- #define _PR_SI_ARCHITECTURE "s390"
- #elif defined(__s390x__)
- #define _PR_SI_ARCHITECTURE "s390x"
-+#elif defined(__hppa__)
-+#define _PR_SI_ARCHITECTURE "hppa"
- #else
- #error "Unknown CPU architecture"
- #endif
-diff -uNr nss-3.8.orig/mozilla/security/coreconf/Linux.mk nss-3.8/mozilla/security/coreconf/Linux.mk
---- nss-3.8.orig/mozilla/security/coreconf/Linux.mk	2004-04-05 20:27:49.000000000 +0000
-+++ nss-3.8/mozilla/security/coreconf/Linux.mk	2004-04-05 20:28:23.000000000 +0000
-@@ -78,6 +78,10 @@
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = arm
- else
-+ifeq ($(OS_TEST),parisc)
-+	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-+	CPU_ARCH        = hppa
-+else
- ifeq ($(OS_TEST),parisc64)
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = hppa
-@@ -102,6 +106,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/files/nss-3.8-mips.patch b/dev-libs/nss/files/nss-3.8-mips.patch
deleted file mode 100644
index 5eacd266cd9f..000000000000
--- a/dev-libs/nss/files/nss-3.8-mips.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mozilla/security/coreconf/Linux.mk.orig     2004-08-26 00:47:42.000000000 -0600
-+++ mozilla/security/coreconf/Linux.mk  2004-08-26 00:48:25.000000000 -0600
-@@ -90,6 +90,14 @@
-        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-        CPU_ARCH        = s390x
- else
-+ifeq ($(OS_TEST),mips)
-+       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        = mips
-+else
-        OS_REL_CFLAGS   = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-        CPU_ARCH        = x86
- endif
-@@ -102,6 +110,8 @@
- endif
- endif
- endif
-+endif
-+endif
- 
- 
- LIBC_TAG               = _glibc
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index 76b9f6f406d5..6f6b6c562517 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>crypto</herd>
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nss/nss-3.8.ebuild b/dev-libs/nss/nss-3.8.ebuild
deleted file mode 100644
index ce3c65b50739..000000000000
--- a/dev-libs/nss/nss-3.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.8.ebuild,v 1.31 2005/01/20 21:41:58 agriffis 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 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/zip
-	>=dev-libs/nspr-4.3"
-
-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/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
-		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile
-	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
-		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-
-	# modify install path
-	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i ${S}/mozilla/security/coreconf/source.mk
-
-	# workaround to satisfy linux-2.6* (#24626)
-	cp ${S}/mozilla/security/coreconf/Linux2.5.mk ${S}/mozilla/security/coreconf/Linux2.6.mk
-
-	if [ "${ARCH}" = "amd64" ]
-	then
-		cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-amd64.patch
-	elif [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-${PV}-hppa.patch
-	fi
-
-	if use mips ; then
-		cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-mips.patch
-	fi
-}
-
-src_compile() {
-	cd ${S}/mozilla/security/coreconf
-
-	# Fix for Linux 2.6
-	cp Linux2.5.mk Linux2.6.mk
-
-	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/lib/nss
-	cp -L */lib/*.a ${D}/usr/lib/nss || die "copying libs failed"
-	cp -L */lib/*.so ${D}/usr/lib/nss || die "copying shared libs failed"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins private/nss/*.h
-	doins public/nss/*.h
-
-	# NOTE: we ignore the binary files
-}
diff --git a/dev-libs/nss/nss-3.9.2.ebuild b/dev-libs/nss/nss-3.9.2.ebuild
deleted file mode 100644
index 2b5e12b2ed87..000000000000
--- a/dev-libs/nss/nss-3.9.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.ebuild,v 1.10 2005/01/20 21:41:58 agriffis 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="x86 alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/zip
-	>=dev-libs/nspr-4.3"
-
-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/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
-		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile
-	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
-		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-
-	# 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
-}
-
-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/lib/nss
-	cp -L */lib/*.a ${D}/usr/lib/nss || die "copying libs failed"
-	cp -L */lib/*.so ${D}/usr/lib/nss || die "copying shared libs failed"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins private/nss/*.h
-	doins public/nss/*.h
-
-	# NOTE: we ignore the binary files
-}