summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-06-19 12:55:07 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-06-19 12:55:07 +0000
commite4874e8af6400c0d1134fdf272376a4dca08fc6c (patch)
treed03e6be4949e1f4e45eeccfd25d7ab119c6f8cc7 /dev-libs/nspr/files
parentRemoved old versions (diff)
downloadgentoo-2-e4874e8af6400c0d1134fdf272376a4dca08fc6c.tar.gz
gentoo-2-e4874e8af6400c0d1134fdf272376a4dca08fc6c.tar.bz2
gentoo-2-e4874e8af6400c0d1134fdf272376a4dca08fc6c.zip
Removed old versions
(Portage version: 2.2.0_alpha181/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-libs/nspr/files')
-rw-r--r--dev-libs/nspr/files/nspr-4.6.1-config.patch89
-rw-r--r--dev-libs/nspr/files/nspr-4.7.0-prtime.patch26
-rw-r--r--dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch126
-rw-r--r--dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch126
-rw-r--r--dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch43
-rw-r--r--dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch91
6 files changed, 0 insertions, 501 deletions
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config.patch b/dev-libs/nspr/files/nspr-4.6.1-config.patch
deleted file mode 100644
index ffbbf1ad8141..000000000000
--- a/dev-libs/nspr/files/nspr-4.6.1-config.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000
-+++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000
-@@ -112,6 +112,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
-
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000
-+++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000
-@@ -102,6 +102,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
-
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000
-+++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000
-@@ -168,6 +168,7 @@
- else
- OS_LIBS = -ldl
- endif
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
- endif
-
- ifeq ($(OS_ARCH),HP-UX)
---- mozilla/nsprpub/config/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000
-+++ mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000
-@@ -54,7 +54,7 @@
- # because it is included by every makefile.
- DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
-
--RELEASE_BINS = nspr-config
-+RELEASE_BINS = nspr-config nspr.pc
-
- include $(topsrcdir)/config/config.mk
-
-@@ -139,6 +139,7 @@
-
- export:: $(TARGETS)
- rm -f $(dist_bindir)/nspr-config
-+ rm -f $(dist_bindir)/nspr.pc
-
- ifdef WRAP_SYSTEM_INCLUDES
- export::
---- mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000
-+++ mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir}
-+Cflags: -I${includedir}
---- mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000
-+++ mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000
-@@ -5899,6 +5899,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
---- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000
-+++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000
-@@ -122,7 +122,7 @@
- fi
-
- if test "$echo_libs" = "yes"; then
-- libdirs=-L$libdir
-+ libdirs="-Wl,-R$libdir -L$libdir"
- if test -n "$lib_plds"; then
- libdirs="$libdirs -lplds${major_version}"
- fi
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
deleted file mode 100644
index ac509ef23d5c..000000000000
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200
-@@ -1536,7 +1536,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1578,11 +1578,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch
deleted file mode 100644
index 3309ae085feb..000000000000
--- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500
-@@ -162,3 +162,4 @@
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
-+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in
---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500
-@@ -52,9 +52,10 @@
-
- # autoconf.mk must be deleted last (from the top-level directory)
- # because it is included by every makefile.
--DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
-+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc
-
- RELEASE_BINS = nspr-config
-+RELEASE_PC = nspr.pc
-
- include $(topsrcdir)/config/config.mk
-
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500
-@@ -92,13 +92,13 @@
-
- # Set variables that may be dependent upon other variables
- if test -z "$exec_prefix"; then
-- exec_prefix=@exec_prefix@
-+ exec_prefix=`pkg-config --variable=exec_prefix nspr`
- fi
- if test -z "$includedir"; then
-- includedir=@includedir@
-+ includedir=`pkg-config --variable=includedir nspr`
- fi
- if test -z "$libdir"; then
-- libdir=@libdir@
-+ libdir=`pkg-config --variable=libdir nspr`
- fi
-
- if test "$echo_prefix" = "yes"; then
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread
-+Cflags: -I${includedir}
-+
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500
-@@ -211,7 +211,7 @@
- rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
- +$(LOOP_OVER_DIRS)
-
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
- ifdef RELEASE_BINS
- $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
- endif
-@@ -221,6 +221,9 @@
- ifdef RELEASE_LIBS
- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
- endif
-+ifdef RELEASE_PC
-+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
-+endif
- +$(LOOP_OVER_DIRS)
-
- release:: export
-@@ -272,6 +275,23 @@
- fi
- cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
- endif
-+ifdef RELEASE_PC
-+ @echo "Copying pkg-config files to release directory"
-+ @if test -z "$(BUILD_NUMBER)"; then \
-+ echo "BUILD_NUMBER must be defined"; \
-+ false; \
-+ else \
-+ true; \
-+ fi
-+ @if test ! -d $(RELEASE_PC_DEST); then \
-+ rm -rf $(RELEASE_PC_DEST); \
-+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\
-+ else \
-+ true; \
-+ fi
-+ cp $(RELEASE_PC) $(RELEASE_PC_DEST)
-+endif
-+
- +$(LOOP_OVER_DIRS)
-
- alltags:
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure
---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500
-@@ -6037,6 +6037,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in
---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500
-@@ -2871,6 +2871,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
diff --git a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch
deleted file mode 100644
index 2525928db4ff..000000000000
--- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500
-@@ -162,3 +162,4 @@
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
-+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in
---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500
-@@ -52,9 +52,10 @@
-
- # autoconf.mk must be deleted last (from the top-level directory)
- # because it is included by every makefile.
--DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
-+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc
-
- RELEASE_BINS = nspr-config
-+RELEASE_PC = nspr.pc
-
- include $(topsrcdir)/config/config.mk
-
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500
-@@ -92,13 +92,13 @@
-
- # Set variables that may be dependent upon other variables
- if test -z "$exec_prefix"; then
-- exec_prefix=@exec_prefix@
-+ exec_prefix=`pkg-config --variable=exec_prefix nspr`
- fi
- if test -z "$includedir"; then
-- includedir=@includedir@
-+ includedir=`pkg-config --variable=includedir nspr`
- fi
- if test -z "$libdir"; then
-- libdir=@libdir@
-+ libdir=`pkg-config --variable=libdir nspr`
- fi
-
- if test "$echo_prefix" = "yes"; then
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir}
-+Cflags: -I${includedir}
-+
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500
-@@ -211,7 +211,7 @@
- rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
- +$(LOOP_OVER_DIRS)
-
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
- ifdef RELEASE_BINS
- $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
- endif
-@@ -221,6 +221,9 @@
- ifdef RELEASE_LIBS
- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
- endif
-+ifdef RELEASE_PC
-+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
-+endif
- +$(LOOP_OVER_DIRS)
-
- release:: export
-@@ -272,6 +275,23 @@
- fi
- cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
- endif
-+ifdef RELEASE_PC
-+ @echo "Copying pkg-config files to release directory"
-+ @if test -z "$(BUILD_NUMBER)"; then \
-+ echo "BUILD_NUMBER must be defined"; \
-+ false; \
-+ else \
-+ true; \
-+ fi
-+ @if test ! -d $(RELEASE_PC_DEST); then \
-+ rm -rf $(RELEASE_PC_DEST); \
-+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\
-+ else \
-+ true; \
-+ fi
-+ cp $(RELEASE_PC) $(RELEASE_PC_DEST)
-+endif
-+
- +$(LOOP_OVER_DIRS)
-
- alltags:
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure
---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500
-@@ -6037,6 +6037,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in
---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500
-@@ -2871,6 +2871,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
diff --git a/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch b/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch
deleted file mode 100644
index 667e699c202e..000000000000
--- a/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-NSPR does not set the soname on any platform yet:
-https://bugzilla.mozilla.org/show_bug.cgi?id=452873
-
-Supporting something like "soname" on AIX is tricky:
-http://bugs.gentoo.org/show_bug.cgi?id=213277
-
---- mozilla/nsprpub/config/rules.mk.orig 2010-02-23 15:55:00 +0100
-+++ mozilla/nsprpub/config/rules.mk 2010-02-23 16:04:31 +0100
-@@ -132,14 +132,17 @@
- else
- ifdef MKSHLIB
- SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-+ifeq ($(OS_ARCH), AIX)
-+IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(DLL_SUFFIX)
-+endif
- endif
- endif
-
- endif
- endif
-
- ifndef TARGETS
--ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-+ifeq (,$(filter-out WINNT WINCE OS2 AIX,$(OS_ARCH)))
- TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
- ifndef BUILD_OPT
- ifdef MSC_VER
-@@ -327,6 +330,15 @@
- else
- ifeq (,$(filter-out WIN95 WINCE,$(OS_TARGET)))
- $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
-+else
-+ifdef IMPORT_LIBRARY
-+$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
-+ ( echo '#! $(notdir $(SHARED_LIBRARY))' \
-+ ; dump -Tv $(SHARED_LIBRARY) \
-+ | awk '{ if ($$4 == "EXP" && $$6 != "SECdef") { print $$8 } }' \
-+ | sort -u \
-+ ) > $@
-+endif
- endif
- endif
-
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
deleted file mode 100644
index 68801418367a..000000000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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