Version bump, remove stale x32 build

(Portage version: 2.1.11.9/cvs/Linux x86_64)

2 files changed, 91 insertions, 156 deletions

diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
deleted file mode 100644
index 3de2a0f95dcf..000000000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
---- a/mozilla/nsprpub/pr/include/md/_linux.cfg
-+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg
-@@ -206,17 +206,17 @@
- #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(__x86_64__)
--
-+#ifdef __LP64__
- #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
-@@ -251,16 +251,64 @@
- #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
- 
-+#else
-+
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+
-+#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   4
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  4
-+#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
-+
-+#endif
-+
- #elif defined(__mc68000__)
- 
- #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
-diff --git a/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
---- a/mozilla/nsprpub/pr/include/md/_linux.h
-+++ b/mozilla/nsprpub/pr/include/md/_linux.h
-@@ -22,25 +22,25 @@
- #ifdef __powerpc64__
- #define _PR_SI_ARCHITECTURE "ppc64"
- #elif defined(__powerpc__)
- #define _PR_SI_ARCHITECTURE "ppc"
- #elif defined(__alpha)
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) && defined(__LP64__)
- #define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__sparc__) && defined(__arch64__)
- #define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
--#elif defined(__i386__)
-+#elif defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
- #elif defined(__arm__)
- #define _PR_SI_ARCHITECTURE "arm"
- #elif defined(__hppa__)
- #define _PR_SI_ARCHITECTURE "hppa"
- #elif defined(__s390x__)
-@@ -73,17 +73,17 @@
- #if defined(ANDROID)
- #define NO_DLOPEN_NULL
- #endif
- 
- #ifdef __FreeBSD_kernel__
- #define _PR_HAVE_SOCKADDR_LEN
- #endif
- 
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
- extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
- extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
-@@ -99,17 +99,17 @@ extern PRInt32 _PR_ia64_AtomicIncrement(
- extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
- extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
- extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
- #endif
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && defined(__LP64__)
- #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
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch
new file mode 100644
index 000000000000..68801418367a
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# Parent 6b1ef31834235cde5153f91a7443b29398b541d9
+# User Jory A. Pratt <anarchy@gentoo.org>
+Add initial support for x32 abi
+
+diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- a/mozilla/nsprpub/pr/include/md/_linux.cfg
++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg
+@@ -207,16 +207,63 @@
+ #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(__x86_64__)
+ 
++#ifdef __ILP32__
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
++#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   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#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
++
++#else
++
+ #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
+@@ -251,16 +298,18 @@
+ #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
+ 
++#endif
++
+ #elif defined(__mc68000__)
+ 
+ #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