6 files changed, 0 insertions, 301 deletions
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
deleted file mode 100644
index e200cfb..0000000
--- a/dev-libs/nspr/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036e4b96a3f88b57818d01721ed4f6adca98 SHA256 d8589298735028e9899e767da382523d83331f2c358440beaccf34ca569567be
-AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
-AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2
-AUX pkgconfig.patch 4163 RMD160 819ccb5a25eea74b5e8cca4bb51153561e6a32f3 SHA1 c537e724a98b59571e96dc82c30508d1086b55eb SHA256 2dc4474319af965486d5c32686806f25b90cc21d756f561a94fff06ec8471bcc
-EBUILD nspr-9999.ebuild 1882 RMD160 4c471a603d6123d81ff729f8b94ff8a90851bcaa SHA1 b3b7b8d3febf386fe6d936594881f461c7838973 SHA256 5823acf46c8636118cb5394290db270831691598e66b3ee952fd3fd0eafced96
diff --git a/dev-libs/nspr/files/libs.patch b/dev-libs/nspr/files/libs.patch
deleted file mode 100644
index 2266ee5..0000000
--- a/dev-libs/nspr/files/libs.patch
+++ /dev/null
@@ -1,58 +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/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
---- mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
-+++ mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
-@@ -3893,7 +3893,7 @@
-     PR_MD_CSRCS=linux.c
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
--    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
-     _OPTIMIZE_FLAGS=-O2
-     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                    # combo is not yet good at debugging inlined
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
deleted file mode 100644
index a7d5361..0000000
--- a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
-+++ mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
-@@ -3893,7 +3893,7 @@
-     PR_MD_CSRCS=linux.c
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
--    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
-     _OPTIMIZE_FLAGS=-O2
-     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                    # combo is not yet good at debugging inlined
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 af6dce6..0000000
--- 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/pkgconfig.patch b/dev-libs/nspr/files/pkgconfig.patch
deleted file mode 100644
index 25ad5bd..0000000
--- a/dev-libs/nspr/files/pkgconfig.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -r 40ebe6af8a66 nsprpub/config/Makefile.in
---- a/nsprpub/config/Makefile.in	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/config/Makefile.in	Sat Apr 16 19:03:01 2011 +0200
-@@ -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 -r 40ebe6af8a66 nsprpub/config/config.mk
---- a/nsprpub/config/config.mk	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/config/config.mk	Sat Apr 16 19:03:01 2011 +0200
-@@ -175,6 +175,7 @@
- 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
-
- # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
- # this file
-diff -r 40ebe6af8a66 nsprpub/config/nspr-config.in
---- a/nsprpub/config/nspr-config.in	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/config/nspr-config.in	Sat Apr 16 19:03:01 2011 +0200
-@@ -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 -r 40ebe6af8a66 nsprpub/config/nspr.pc.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/nsprpub/config/nspr.pc.in	Sat Apr 16 19:03:01 2011 +0200
-@@ -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 -r 40ebe6af8a66 nsprpub/config/rules.mk
---- a/nsprpub/config/rules.mk	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/config/rules.mk	Sat Apr 16 19:03:01 2011 +0200
-@@ -207,7 +207,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
-@@ -217,6 +217,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
-@@ -252,6 +255,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 -r 40ebe6af8a66 nsprpub/configure.in
---- a/nsprpub/configure.in	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/configure.in	Sat Apr 16 19:03:01 2011 +0200
-@@ -3348,6 +3348,7 @@
-     config/nsprincl.mk
-     config/nsprincl.sh
-     config/nspr-config
-+    config/nspr.pc
-     lib/Makefile
-     lib/ds/Makefile
-     lib/libc/Makefile
-diff -r 40ebe6af8a66 nsprpub/configure
---- a/nsprpub/configure	Sat Apr 16 17:57:51 2011 +0200
-+++ b/nsprpub/configure	Sat Apr 16 19:03:01 2011 +0200
-@@ -6676,6 +6676,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/nspr-9999.ebuild b/dev-libs/nspr/nspr-9999.ebuild
deleted file mode 100644
index 7c395ee..0000000
--- a/dev-libs/nspr/nspr-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit mozilla-scm
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug static-libs"
-
-src_prepare() {
-	mkdir inst
-	#epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/libs.patch
-	epatch "${FILESDIR}"/pkgconfig.patch
-	sed -i -e 's/perl5//g' nsprpub/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		nsprpub/config/rules.mk
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	ECONF_SOURCE="../nsprpub" econf \
-		$(use_enable amd64 64bit) \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		|| die "econf failed"
-}
-
-src_compile() {
-	cd "${S}"/build
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build"
-}
-
-src_install () {
-	# Their build system is royally confusing, as usual
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd "${ED}"/usr/$(get_libdir)
-	if ! use static-libs; then
-		for file in *.a; do
-			rm -f ${file} || die "failed to remove static libraries."
-		done
-	fi
-
-	local n=
-	MINOR_VERSION=$(sed -n -r -e 's|.*NSPR_[0-9]+_([0-9]+)(_[0-9]+)?.*|\1|p' "${S}"/nsprpub/TAG-INFO)
-	for file in *$(get_libname); do
-		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
-		mv ${file} ${n} || die "failed to mv files around"
-		ln -s ${n} ${file} || die "failed to symlink files."
-	done
-
-	# Remove stupid files in /usr/bin
-	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "Please make sure you run revdep-rebuild after upgrade."
-	ewarn "This is *extremely* important to ensure your system nspr works properly."
-	ewarn
-}