Version bump. Removed old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 17 insertions, 172 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 64e39036e825..7ef55237d02e 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.243 2013/10/09 17:10:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.244 2013/11/18 09:11:48 polynomial-c Exp $
+
+*nspr-4.10.2 (18 Nov 2013)
+
+  18 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -nspr-4.9.5.ebuild,
+  +nspr-4.10.2.ebuild, -files/nspr-4.6.1-config-1.patch,
+  -files/nspr-4.8-config.patch, -files/nspr-4.9-pkgconfig-gentoo.patch:
+  Version bump. Removed old.
 
   09 Oct 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.ebuild:
   Stable for sparc, wrt bug #486114
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 a7d536152520..000000000000
--- 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.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch
deleted file mode 100644
index e8fc6c112bf8..000000000000
--- a/dev-libs/nspr/files/nspr-4.8-config.patch
+++ /dev/null
@@ -1,47 +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
diff --git a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
deleted file mode 100644
index 56d7bb870fdc..000000000000
--- a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urN a/mozilla/nsprpub/config/config.mk b/mozilla/nsprpub/config/config.mk
---- a/mozilla/nsprpub/config/config.mk	2011-10-13 09:00:06.000000000 -0500
-+++ b/mozilla/nsprpub/config/config.mk	2012-02-20 17:52:11.364823693 -0600
-@@ -183,6 +183,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 -urN a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in
---- a/mozilla/nsprpub/config/Makefile.in	2009-03-03 16:04:23.000000000 -0600
-+++ b/mozilla/nsprpub/config/Makefile.in	2012-02-20 17:53:06.490819923 -0600
-@@ -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 a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in
---- a/mozilla/nsprpub/config/nspr-config.in	2005-05-10 19:53:41.000000000 -0500
-+++ b/mozilla/nsprpub/config/nspr-config.in	2012-02-20 17:55:10.947811413 -0600
-@@ -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 a/mozilla/nsprpub/config/nspr.pc.in b/mozilla/nsprpub/config/nspr.pc.in
---- a/mozilla/nsprpub/config/nspr.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/nsprpub/config/nspr.pc.in	2012-02-20 18:00:14.609790649 -0600
-@@ -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@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
-+Cflags: -I@includedir@
-diff -urN a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk
---- a/mozilla/nsprpub/config/rules.mk	2011-08-29 12:02:51.000000000 -0500
-+++ b/mozilla/nsprpub/config/rules.mk	2012-02-20 18:11:56.112742680 -0600
-@@ -207,10 +207,14 @@
- 	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
-+ifdef RELEASE_PC
-+	$(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig	
-+	$(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
-+endif
- ifdef RELEASE_HEADERS
- 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
- endif
-diff -urN a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
---- a/mozilla/nsprpub/configure.in	2012-02-14 13:06:00.000000000 -0600
-+++ b/mozilla/nsprpub/configure.in	2012-02-20 18:09:55.776750908 -0600
-@@ -3357,6 +3357,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-4.9.5.ebuild b/dev-libs/nspr/nspr-4.10.2.ebuild
index 6e76cdbaf82c..63fd5b052cec 100644
--- a/dev-libs/nspr/nspr-4.9.5.ebuild
+++ b/dev-libs/nspr/nspr-4.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.5.ebuild,v 1.11 2013/06/20 02:15:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.2.ebuild,v 1.1 2013/11/18 09:11:48 polynomial-c Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,33 +15,31 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_prepare() {
 	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.8-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	cd "${S}"/nspr/
 	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
 	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
 	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
 	epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-	# Patch needs updating
-	#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
+	# epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
 	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
 	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
 
 	# We must run eautoconf to regenerate configure
-	cd "${S}"/mozilla/nsprpub
 	eautoconf
 
 	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
 
 	# Respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/mozilla/nsprpub/config/rules.mk || die
+		"${S}"/nspr/config/rules.mk || die
 }
 
 src_configure() {
@@ -65,7 +63,7 @@ src_configure() {
 	esac
 
 	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+	LC_ALL="C" ECONF_SOURCE="../nspr" \
 	ac_cv_path_AR="${AR}" \
 	econf \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -89,18 +87,6 @@ src_install() {
 	einfo "removing static libraries as upstream has requested!"
 	rm -f *.a || die "failed to remove static libraries."
 
-	local n=
-	# aix-soname.patch does this already
-	[[ ${CHOST} == *-aix* ]] ||
-	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."
-		if [[ ${CHOST} == *-darwin* ]]; then
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
-		fi
-	done
-
 	# install nspr-config
 	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"