nspr: upgraded package to upstream
Upgraded dev-libs/nspr to version 4.10.2 on amd64, arm, x86
BUG=chromium:321783
TEST=emerge dev-libs/nss; HTTPS works as normal
CQ-DEPEND=CL:178908
Change-Id: I3738f649bc753121ebbd690eb02986c403e12930
Reviewed-on: https://chromium-review.googlesource.com/177971
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Tested-by: Ryan Sleevi <rsleevi@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/178874
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index aa996d3..7ecbbf9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.10.tar.gz 1103862 RMD160 9810c38741c5df0efe8c97c6c6a80deaca682331 SHA1 10dbf68c07497dab30be09db526931c885d5a7e9 SHA256 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16
+DIST nspr-4.10.2.tar.gz 1103130 SHA256 4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400 SHA512 bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 WHIRLPOOL 0cf2916c4cb595ee3ccd88da636a6599e2c3b5c51193608bbd2acfa9b3bcad89a7135af1f4cf42644495e17fc03c67a8b22719c0efb4faf8aacf1dcd0d0d9511
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.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch
deleted file mode 100644
index e8fc6c1..0000000
--- 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 56d7bb8..0000000
--- 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.10.ebuild b/dev-libs/nspr/nspr-4.10.2.ebuild
similarity index 96%
rename from dev-libs/nspr/nspr-4.10.ebuild
rename to dev-libs/nspr/nspr-4.10.2.ebuild
index 63e693e..f88d410 100644
--- a/dev-libs/nspr/nspr-4.10.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.10.ebuild,v 1.6 2013/08/26 16:58:51 ago 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"
diff --git a/metadata/md5-cache/dev-libs/nspr-4.10 b/metadata/md5-cache/dev-libs/nspr-4.10.2
similarity index 92%
rename from metadata/md5-cache/dev-libs/nspr-4.10
rename to metadata/md5-cache/dev-libs/nspr-4.10.2
index 251738a..23bf76b 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.10
+++ b/metadata/md5-cache/dev-libs/nspr-4.10.2
@@ -7,6 +7,6 @@
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
LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10/src/nspr-4.10.tar.gz
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.2/src/nspr-4.10.2.tar.gz
_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 0fd90d183673bf1107465ec45849d1ea multilib ded93e450747134a079e647d888aa80b multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
-_md5_=efdabb0f3a7dec50471cb747a04bb7ed
+_md5_=ca6c5082b238e7cd0e2f61ac6fd0c37d