dev-libs/nspr: sync with main tree

11 files changed, 39 insertions, 132 deletions

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 505d199b..bf5aca14 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.12.tar.gz 1135458 SHA256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 WHIRLPOOL d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d
+DIST nspr-4.14.tar.gz 1136626 SHA256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 WHIRLPOOL e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
index 3ae8052e..6ae04f40 100644
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
@@ -1,7 +1,7 @@
 * drop Solaris linker stuff
 
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -1988,26 +1988,14 @@
      CPU_ARCH=`uname -p`
      MDCPUCFG_H=_solaris.cfg
diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch
deleted file mode 100644
index 46fe15b8..00000000
--- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
index ac509ef2..2de3ba34 100644
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/pr/src/misc/prtime.c
++++ b/pr/src/misc/prtime.c
 @@ -1536,7 +1536,7 @@
                  case TT_EET: zone_offset =  2 * 60; break;
                  case TT_JST: zone_offset =  9 * 60; break;
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
index 5d9e810a..1afab1dd 100644
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
@@ -1,8 +1,8 @@
 Same magic as haubi did for glib compilation, which works again here
 resolving a linker problem on Solaris with GNU ld.  Bug #222625
 
---- mozilla/nsprpub/pr/src/Makefile.in.orig	2008-06-22 22:24:56.671065000 +0200
-+++ mozilla/nsprpub/pr/src/Makefile.in	2008-06-23 14:38:52.320417000 +0200
+--- a/pr/src/Makefile.in
++++ b/pr/src/Makefile.in
 @@ -95,7 +95,7 @@
  endif
  
diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
deleted file mode 100644
index a0f14d55..00000000
--- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-* drop Solaris linker stuff
-
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
-@@ -1988,26 +1988,14 @@
-     CPU_ARCH=`uname -p`
-     MDCPUCFG_H=_solaris.cfg
-     PR_MD_CSRCS=solaris.c
--    LD=/usr/ccs/bin/ld
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     RESOLVE_LINK_SYMBOLS=1
--    case "${OS_RELEASE}" in
--    5.8|5.9)
--        ;;
--    *)
--        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
--        USE_B_DIRECT=1
--        ;;
--    esac
-     if test -n "$GNU_CC"; then
-         DSO_CFLAGS=-fPIC
-         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
-             GCC_USE_GNU_LD=1
-         fi
--        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
--        if test -n "$USE_B_DIRECT"; then
--            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
--        fi
-+		DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     else
-         DSO_CFLAGS=-KPIC
-         DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
---- nspr-4.7.4/mozilla/nsprpub/configure
-+++ nspr-4.7.4/mozilla/nsprpub/configure
-@@ -4765,26 +4765,14 @@
-     CPU_ARCH=`uname -p`
-     MDCPUCFG_H=_solaris.cfg
-     PR_MD_CSRCS=solaris.c
--    LD=/usr/ccs/bin/ld
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     RESOLVE_LINK_SYMBOLS=1
--    case "${OS_RELEASE}" in
--    5.8|5.9)
--        ;;
--    *)
--        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
--        USE_B_DIRECT=1
--        ;;
--    esac
-     if test -n "$GNU_CC"; then
-         DSO_CFLAGS=-fPIC
-         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
-             GCC_USE_GNU_LD=1
-         fi
--        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
--        if test -n "$USE_B_DIRECT"; then
--            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
--        fi
-+		DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     else
-         DSO_CFLAGS=-KPIC
-         DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
index 1258b608..4045e909 100644
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
@@ -1,8 +1,8 @@
 Don't use @executable_path, it messed up linking against nspr from e.g.
 nss.
 
---- mozilla/nsprpub/configure.in
-+++ mozilla/nsprpub/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -1007,7 +1007,7 @@
              ;;
      esac
@@ -12,8 +12,8 @@ nss.
      _OPTIMIZE_FLAGS=-O2
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      STRIP="$STRIP -x -S"
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
+--- a/configure
++++ b/configure
 @@ -1007,7 +1007,7 @@
              ;;
      esac
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
index dd3b132c..5d37018d 100644
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
@@ -5,8 +5,8 @@ autoparallelization).  Other flags are required when building and linking
 
 https://bugs.gentoo.org/365975
 
---- a/mozilla/nsprpub/config/autoconf.mk.in
-+++ b/mozilla/nsprpub/config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
 @@ -81,6 +81,7 @@ OS_DLLFLAGS	= @OS_DLLFLAGS@
  DLLFLAGS	= @DLLFLAGS@
  EXEFLAGS  = @EXEFLAGS@
@@ -15,8 +15,8 @@ https://bugs.gentoo.org/365975
  
  PROFILE_GEN_CFLAGS  = @PROFILE_GEN_CFLAGS@
  PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/mozilla/nsprpub/config/config.mk
-+++ b/mozilla/nsprpub/config/config.mk
+--- a/config/config.mk
++++ b/config/config.mk
 @@ -72,7 +72,7 @@ NOMD_CFLAGS	= $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
  NOMD_CCFLAGS	= $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
  		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
index d4f9a7e5..a22b0b93 100644
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
@@ -1,6 +1,5 @@
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in
---- a/mozilla/nsprpub/config/nspr-config.in	2012-03-06 07:13:39.000000000 -0600
-+++ b/mozilla/nsprpub/config/nspr-config.in	2013-02-16 20:53:53.893489345 -0600
+--- a/config/nspr-config.in
++++ b/config/nspr-config.in
 @@ -126,7 +126,7 @@
  fi
  
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
new file mode 100644
index 00000000..d9b367ed
--- /dev/null
+++ b/dev-libs/nspr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.12.ebuild b/dev-libs/nspr/nspr-4.14.ebuild
index a99d0b54..7b372afc 100644
--- a/dev-libs/nspr/nspr-4.12.ebuild
+++ b/dev-libs/nspr/nspr-4.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WANT_AUTOCONF="2.5"
 
-inherit autotools toolchain-funcs versionator multilib-minimal
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
 
 MIN_PV="$(get_version_component_range 2)"
 
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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"
 
 RDEPEND="
@@ -27,17 +27,20 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/nspr-config
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
 src_prepare() {
 	cd "${S}"/nspr || die
-	eapply -p2 "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	eapply -p2 "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	eapply -p3 "${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	eapply -p2 "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	eapply -p3 "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	eapply -p3 "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
 
-	eapply_user
+	default
 
 	# rename configure.in to configure.ac for new autotools compatibility
 	if [[ -e "${S}"/nspr/configure.in ]] ; then