Cleanup

(Portage version: 2.1.2.4)

13 files changed, 8 insertions, 845 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index cf22f3bce7a8..b1877954ba3b 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.78 2007/04/20 12:09:39 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.79 2007/04/20 13:22:26 armin76 Exp $
+
+  20 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/nspr-4.3-amd64.patch, -files/nspr-4.4.1-hppa.patch,
+  -files/nspr-4.4.1-ppc64.patch, -files/nspr-4.6.3-fbsd62.patch,
+  -nspr-4.6.3.ebuild, -nspr-4.6.3-r1.ebuild, -nspr-4.6.4.ebuild,
+  -nspr-4.6.4-r3.ebuild:
+  Cleanup
 
   20 Apr 2007; Stuart Longland <redhatter@gentoo.org> nspr-4.6.5-r1.ebuild:
   Tested and marked stable on mips as per bug #169751
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3 b/dev-libs/nspr/files/digest-nspr-4.6.3
deleted file mode 100644
index ea0a022c4dd6..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965
-RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965
-SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3-r1 b/dev-libs/nspr/files/digest-nspr-4.6.3-r1
deleted file mode 100644
index ea0a022c4dd6..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965
-RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965
-SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4 b/dev-libs/nspr/files/digest-nspr-4.6.4
deleted file mode 100644
index bda30b21c53b..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz 1301886
-RMD160 d893554bc49c13787ec33bd2c7580f51bf8e89ac nspr-4.6.4.tar.gz 1301886
-SHA256 49e12321adb3eacf8dac5f799ab52fb1a797021fcb2893736e7bfbd517a02413 nspr-4.6.4.tar.gz 1301886
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4-r3 b/dev-libs/nspr/files/digest-nspr-4.6.4-r3
deleted file mode 100644
index bda30b21c53b..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz 1301886
-RMD160 d893554bc49c13787ec33bd2c7580f51bf8e89ac nspr-4.6.4.tar.gz 1301886
-SHA256 49e12321adb3eacf8dac5f799ab52fb1a797021fcb2893736e7bfbd517a02413 nspr-4.6.4.tar.gz 1301886
diff --git a/dev-libs/nspr/files/nspr-4.3-amd64.patch b/dev-libs/nspr/files/nspr-4.3-amd64.patch
deleted file mode 100644
index e284b635f2d1..000000000000
--- a/dev-libs/nspr/files/nspr-4.3-amd64.patch
+++ /dev/null
@@ -1,224 +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 --git a/dev-libs/nspr/files/nspr-4.4.1-hppa.patch b/dev-libs/nspr/files/nspr-4.4.1-hppa.patch
deleted file mode 100644
index 33b1c5494eba..000000000000
--- a/dev-libs/nspr/files/nspr-4.4.1-hppa.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -uNr nspr-4.4.1.orig/mozilla/nsprpub/config/Linux.mk nspr-4.4.1/mozilla/nsprpub/config/Linux.mk
---- nspr-4.4.1.orig/mozilla/nsprpub/config/Linux.mk	2004-04-05 15:09:53.000000000 +0000
-+++ nspr-4.4.1/mozilla/nsprpub/config/Linux.mk	2004-04-05 15:10:21.000000000 +0000
-@@ -66,12 +66,17 @@
- 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 (,$(filter-out arm% sa110,$(OS_TEST)))
- CPU_ARCH		:= arm
- else
- CPU_ARCH		:= $(OS_TEST)
- endif
- endif
-+endif
- CPU_ARCH_TAG		= _$(CPU_ARCH)
- 
- CC			= gcc
-diff -uNr nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.cfg nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg
---- nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 15:09:54.000000000 +0000
-+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-04-05 15:10:21.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 nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.h nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h
---- nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 15:09:54.000000000 +0000
-+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h	2004-04-05 15:12:45.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 --git a/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch b/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch
deleted file mode 100644
index a98848d2ebc8..000000000000
--- a/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg.orig	2003-01-23 18:03:19.000000000 +0100
-+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg	2004-10-28 17:23:36.137131376 +0200
-@@ -45,7 +45,53 @@
- 
- #define PR_AF_INET6 10  /* same as AF_INET6 */
- 
--#ifdef __powerpc__
-+#ifdef __powerpc64__
-+
-+#undef  IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN    1
-+#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(__powerpc__)
- 
- #undef  IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN    1
-
---- nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h.orig	2004-10-28 17:28:02.931175520 +0200
-+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h	2004-10-28 17:28:52.716195584 +0200
-@@ -43,7 +43,9 @@
- 
- #define PR_LINKER_ARCH	"linux"
- #define _PR_SI_SYSNAME  "LINUX"
--#ifdef __powerpc__
-+#ifdef __powerpc64__
-+#define _PR_SI_ARCHITECTURE "ppc64"
-+#elif defined(__powerpc__)
- #define _PR_SI_ARCHITECTURE "ppc"
- #elif defined(__alpha)
- #define _PR_SI_ARCHITECTURE "alpha"
diff --git a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch
deleted file mode 100644
index 525c44775d82..000000000000
--- a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c
-===================================================================
---- nspr-4.6.3.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c
-+++ nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c
-@@ -108,6 +108,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
- 
-+#if __FreeBSD_version >= 602000
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+
- #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
diff --git a/dev-libs/nspr/nspr-4.6.3-r1.ebuild b/dev-libs/nspr/nspr-4.6.3-r1.ebuild
deleted file mode 100644
index cbb47141c371..000000000000
--- a/dev-libs/nspr/nspr-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3-r1.ebuild,v 1.2 2007/03/08 14:23:13 beandog Exp $
-
-inherit eutils gnuconfig multilib
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 debug"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.6.3-fbsd62.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	cd build
-
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	../mozilla/nsprpub/configure \
-		--build=${CBUILD:-${CHOST}} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/nspr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$(use_enable debug) \
-		${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	cd ${S}/build
-	make install
-	insinto /usr
-	doins -r dist/*
-	rm -rf ${D}/usr/bin/lib*.so
-
-	#removing includes/nspr/md as per fedora spec
-	# i.e a waste of space!
-	rm -rf ${D}/usr/include/nspr/md
-
-	# there have been /usr/lib/nspr changes (like the ldpath below), but never
-	# have I seen any libraries end up in this directory. lets fix that.
-	# note: I tried doing this fix via the build system. It wont work.
-	if [ ! -e ${D}/usr/lib/nspr ] ; then
-		mkdir -p ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
-	fi
-	# and while we're at it, lets make it actually use the arch's libdir damnit
-	if [ "lib" != "$(get_libdir)" ] ; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	cd ${D}/usr/$(get_libdir)/nspr
-	for file in *.so; do
-		mv ${file} ${file}.${MINOR_VERSION}
-		ln -s ${file}.${MINOR_VERSION} ${file}
-	done
-	# cope with libraries being in /usr/lib/nspr
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
-
-	# install nspr-config
-	insinto	 /usr/bin
-	doins ${S}/build/config/nspr-config
-	chmod a+x ${D}/usr/bin/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins ${S}/build/config/nspr.pc
-}
diff --git a/dev-libs/nspr/nspr-4.6.3.ebuild b/dev-libs/nspr/nspr-4.6.3.ebuild
deleted file mode 100644
index 25244953ca74..000000000000
--- a/dev-libs/nspr/nspr-4.6.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3.ebuild,v 1.14 2007/03/08 14:23:13 beandog Exp $
-
-inherit eutils gnuconfig multilib
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.6.3-fbsd62.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	cd build
-
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	../mozilla/nsprpub/configure \
-		--build=${CBUILD:-${CHOST}} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/nspr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	cd ${S}/build
-	make install
-	insinto /usr
-	doins -r dist/*
-	rm -rf ${D}/usr/bin/lib*.so
-
-	#removing includes/nspr/md as per fedora spec
-	# i.e a waste of space!
-	rm -rf ${D}/usr/include/nspr/md
-
-	# there have been /usr/lib/nspr changes (like the ldpath below), but never
-	# have I seen any libraries end up in this directory. lets fix that.
-	# note: I tried doing this fix via the build system. It wont work.
-	if [ ! -e ${D}/usr/lib/nspr ] ; then
-		mkdir -p ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
-	fi
-	# and while we're at it, lets make it actually use the arch's libdir damnit
-	if [ "lib" != "$(get_libdir)" ] ; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	cd ${D}/usr/$(get_libdir)/nspr
-	for file in *.so; do
-		mv ${file} ${file}.${MINOR_VERSION}
-		ln -s ${file}.${MINOR_VERSION} ${file}
-	done
-	# cope with libraries being in /usr/lib/nspr
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
-
-	# install nspr-config
-	insinto	 /usr/bin
-	doins ${S}/build/config/nspr-config
-	chmod a+x ${D}/usr/bin/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins ${S}/build/config/nspr.pc
-}
diff --git a/dev-libs/nspr/nspr-4.6.4-r3.ebuild b/dev-libs/nspr/nspr-4.6.4-r3.ebuild
deleted file mode 100644
index 4b76a6a02048..000000000000
--- a/dev-libs/nspr/nspr-4.6.4-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.4-r3.ebuild,v 1.2 2007/03/08 14:23:13 beandog Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 debug"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-}
-
-src_compile() {
-	cd build
-
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr"
-
-	ECONF_SOURCE="../mozilla/nsprpub" econf \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	cd ${S}/build
-	make install
-	insinto /usr
-	doins -r dist/*
-	rm -rf ${D}/usr/bin/lib*.so
-
-	#removing includes/nspr/md as per fedora spec
-	# i.e a waste of space!
-	rm -rf ${D}/usr/include/nspr/md
-
-	# there have been /usr/lib/nspr changes (like the ldpath below), but never
-	# have I seen any libraries end up in this directory. lets fix that.
-	# note: I tried doing this fix via the build system. It wont work.
-	if [ ! -e ${D}/usr/lib/nspr ] ; then
-		mkdir -p ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
-	fi
-	# and while we're at it, lets make it actually use the arch's libdir damnit
-	if [ "lib" != "$(get_libdir)" ] ; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	cd ${D}/usr/$(get_libdir)/nspr
-	for file in *.so; do
-		mv ${file} ${file}.${MINOR_VERSION}
-		ln -s ${file}.${MINOR_VERSION} ${file}
-	done
-	# cope with libraries being in /usr/lib/nspr
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
-
-	# install nspr-config
-	insinto	 /usr/bin
-	doins ${S}/build/config/nspr-config
-	chmod a+x ${D}/usr/bin/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins ${S}/build/config/nspr.pc
-}
diff --git a/dev-libs/nspr/nspr-4.6.4.ebuild b/dev-libs/nspr/nspr-4.6.4.ebuild
deleted file mode 100644
index d8a1c51ef898..000000000000
--- a/dev-libs/nspr/nspr-4.6.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.4.ebuild,v 1.2 2007/03/08 14:23:13 beandog Exp $
-
-inherit eutils gnuconfig multilib
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 debug"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	cd build
-
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	../mozilla/nsprpub/configure \
-		--build=${CBUILD:-${CHOST}} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/nspr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$(use_enable debug) \
-		${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	cd ${S}/build
-	make install
-	insinto /usr
-	doins -r dist/*
-	rm -rf ${D}/usr/bin/lib*.so
-
-	#removing includes/nspr/md as per fedora spec
-	# i.e a waste of space!
-	rm -rf ${D}/usr/include/nspr/md
-
-	# there have been /usr/lib/nspr changes (like the ldpath below), but never
-	# have I seen any libraries end up in this directory. lets fix that.
-	# note: I tried doing this fix via the build system. It wont work.
-	if [ ! -e ${D}/usr/lib/nspr ] ; then
-		mkdir -p ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
-		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
-	fi
-	# and while we're at it, lets make it actually use the arch's libdir damnit
-	if [ "lib" != "$(get_libdir)" ] ; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	cd ${D}/usr/$(get_libdir)/nspr
-	for file in *.so; do
-		mv ${file} ${file}.${MINOR_VERSION}
-		ln -s ${file}.${MINOR_VERSION} ${file}
-	done
-	# cope with libraries being in /usr/lib/nspr
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
-
-	# install nspr-config
-	insinto	 /usr/bin
-	doins ${S}/build/config/nspr-config
-	chmod a+x ${D}/usr/bin/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins ${S}/build/config/nspr.pc
-}