From 3f2522686c2c5bb7697cceec518efdc560034337 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 29 Jan 2015 17:14:21 +0000
Subject: [PATCH] nspr: bump version

---
 ...{nspr-4.10.6.recipe => nspr-4.10.8.recipe} |  2 +-
 ...r-4.10.6.patchset => nspr-4.10.8.patchset} | 51 +++++--------------
 2 files changed, 15 insertions(+), 38 deletions(-)
 rename dev-libs/nspr/{nspr-4.10.6.recipe => nspr-4.10.8.recipe} (96%)
 rename dev-libs/nspr/patches/{nspr-4.10.6.patchset => nspr-4.10.8.patchset} (93%)

diff --git a/dev-libs/nspr/nspr-4.10.6.recipe b/dev-libs/nspr/nspr-4.10.8.recipe
similarity index 96%
rename from dev-libs/nspr/nspr-4.10.6.recipe
rename to dev-libs/nspr/nspr-4.10.8.recipe
index 34c117777..017843f05 100644
--- a/dev-libs/nspr/nspr-4.10.6.recipe
+++ b/dev-libs/nspr/nspr-4.10.8.recipe
@@ -12,7 +12,7 @@ MPL v2.0
 COPYRIGHT="Mozilla Foundation"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
 SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
-CHECKSUM_SHA256="df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a"
+CHECKSUM_SHA256="507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/dev-libs/nspr/patches/nspr-4.10.6.patchset b/dev-libs/nspr/patches/nspr-4.10.8.patchset
similarity index 93%
rename from dev-libs/nspr/patches/nspr-4.10.6.patchset
rename to dev-libs/nspr/patches/nspr-4.10.8.patchset
index 938aa3c98..6007e98da 100644
--- a/dev-libs/nspr/patches/nspr-4.10.6.patchset
+++ b/dev-libs/nspr/patches/nspr-4.10.8.patchset
@@ -1,14 +1,14 @@
-From 2cfaa6bb114a3b809f1b5438685e44d080bb6d26 Mon Sep 17 00:00:00 2001
-From: Kacper Kasper <kacperkasper@gmail.com>
-Date: Fri, 4 Jul 2014 11:56:24 +0200
-Subject: Haiku support
+From c66dbd16637cadb9f5caa3392cf6a1c0abae7fad Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 27 Sep 2014 10:57:28 +0000
+Subject: Patch from 4.10.6
 
 
 diff --git a/configure.in b/configure.in
-index 9e9f1b1..5361a5b 100644
+index fba01ae..c6f1967 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1312,6 +1312,24 @@ case "$target" in
+@@ -1320,6 +1320,28 @@ case "$target" in
          ;;
      esac
      ;;
@@ -22,7 +22,11 @@ index 9e9f1b1..5361a5b 100644
 +    USE_PTHREADS=1
 +    IMPL_STRATEGY=_PTH
 +    MDCPUCFG_H=_linux.cfg
-+    PR_MD_ASFILES=os_Linux_x86.s
++    if test -n "$USE_64"; then
++    	PR_MD_ASFILES=os_Linux_x86_64.s
++    else
++    	PR_MD_ASFILES=os_Linux_x86.s
++    fi
 +    PR_MD_CSRCS=linux.c
 +    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
 +    DSO_CFLAGS=-fPIC
@@ -33,7 +37,7 @@ index 9e9f1b1..5361a5b 100644
  
  *-bsdi*)
      AC_DEFINE(XP_UNIX)
-@@ -2538,7 +2556,7 @@ dnl The same goes for BeOS.
+@@ -2557,7 +2579,7 @@ dnl The same goes for BeOS.
  dnl OS/2 has dlfcn in libc.
  
  case $target in
@@ -42,8 +46,8 @@ index 9e9f1b1..5361a5b 100644
      ;;
  *)
      AC_CHECK_LIB(dl, dlopen,
-@@ -2676,7 +2694,7 @@ echo "
- ])
+@@ -2663,7 +2685,7 @@ fi
+ esac
  
  case "$target_os" in
 -darwin*)
@@ -334,30 +338,3 @@ index 9ebd923..5a3276e 100644
 -- 
 1.8.3.4
 
-
-From 597b244c8133d6d267eea39894f85ae8d9634acf Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 25 Sep 2014 13:18:12 +0000
-Subject: Haiku x86_64 support
-
-
-diff --git a/configure.in b/configure.in
-index 5361a5b..f0b85e4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1322,7 +1322,11 @@ case "$target" in
-     USE_PTHREADS=1
-     IMPL_STRATEGY=_PTH
-     MDCPUCFG_H=_linux.cfg
--    PR_MD_ASFILES=os_Linux_x86.s
-+    if test -n "$USE_64"; then
-+    	PR_MD_ASFILES=os_Linux_x86_64.s
-+    else
-+    	PR_MD_ASFILES=os_Linux_x86.s
-+    fi
-     PR_MD_CSRCS=linux.c
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
--- 
-1.8.3.4
-