[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

2023-06-10 Thread Joonas Niilola 
commit: 5caead31afd6d66482e29c075b2a21675cb99015
Author: Violet Purcell  inventati  org>
AuthorDate: Sat Jun 10 04:46:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun 10 06:54:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5caead31

dev-libs/nspr: Fix Musl ipv6 patch for Musl 1.2.4

Closes: https://bugs.gentoo.org/906166
Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31370
Signed-off-by: Joonas Niilola  gentoo.org>

 .../nspr/files/nspr-4.21-ipv6-musl-support.patch   | 26 --
 .../{nspr-4.35-r1.ebuild => nspr-4.35-r2.ebuild}   |  0
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch 
b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
index 2c8ebd4ccbb2..72393ca5f470 100644
--- a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
+++ b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
@@ -1,19 +1,11 @@
-From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001
-From: Moritz Kick 
-Date: Wed, 20 Mar 2019 13:36:06 -0500
+From 2e6a43c751707b6983760669988ba4d2826ffd5b Mon Sep 17 00:00:00 2001
+From: Violet Purcell 
+Date: Sat, 10 Jun 2023 04:37:55 +
 Subject: [PATCH] Added IPv6 compatibility for musl libc
 
-Signed-off-by: Moritz Kick 
-Signed-off-by: Jory Pratt 

- pr/include/md/_linux.h | 13 +
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
-index 2370ab8..612184c 100644
 --- a/pr/include/md/_linux.h
 +++ b/pr/include/md/_linux.h
-@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, 
PRInt32 nv)
+@@ -315,33 +315,19 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, 
PRInt32 nv)
  #endif /* __arm__ */
  
  #define USE_SETJMP
@@ -22,17 +14,17 @@ index 2370ab8..612184c 100644
 -#endif
  #undef _PR_USE_POLL
  #define _PR_STAT_HAS_ONLY_ST_ATIME
- #if defined(__alpha) || defined(__ia64__)
+-#if defined(__alpha) || defined(__ia64__)
  #define _PR_HAVE_LARGE_OFF_T
 -#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
 -|| defined(ANDROID)
 -#define _PR_HAVE_OFF64_T
- #else
+-#else
 -#define _PR_NO_LARGE_FILES
-+#define _PR_HAVE_OFF64_T
- #endif
+-#endif
 -#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
 -|| defined(ANDROID)
++#define _FILE_OFFSET_BITS 64
  #define _PR_INET6
  #define _PR_HAVE_INET_NTOP
  #define _PR_HAVE_GETHOSTBYNAME2
@@ -49,5 +41,5 @@ index 2370ab8..612184c 100644
  #define _PR_HAVE_GETHOST_R_INT
  #endif
 -- 
-2.21.0
+2.41.0
 

diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild 
b/dev-libs/nspr/nspr-4.35-r2.ebuild
similarity index 100%
rename from dev-libs/nspr/nspr-4.35-r1.ebuild
rename to dev-libs/nspr/nspr-4.35-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

2023-05-11 Thread Joonas Niilola 
commit: 86b6c8fa090b96e4204bd8fc22c7e5d90162ab3a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu May 11 07:00:38 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu May 11 07:01:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b6c8fa

dev-libs/nspr: fix paths in musl patch file

Bug: https://bugs.gentoo.org/905998
Closes: https://bugs.gentoo.org/906093
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch 
b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
index d834c3e0b295..1ec17cd301f5 100644
--- a/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
+++ b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
@@ -1,9 +1,9 @@
 needed since 
https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
 --
-diff --git a/nspr/pr/include/md/_unixos.h b/nspr/pr/include/md/_unixos.h
+diff --git a/pr/include/md/_unixos.h b/pr/include/md/_unixos.h
 index 7d444cd..0099d2c 100644
 a/nspr/pr/include/md/_unixos.h
-+++ b/nspr/pr/include/md/_unixos.h
+--- a/pr/include/md/_unixos.h
 b/pr/include/md/_unixos.h
 @@ -589,7 +589,7 @@ typedef off64_t _MDOff64_t;
  
  #elif defined(_PR_HAVE_OFF64_T)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

2022-10-27 Thread Joonas Niilola 
commit: 02ab199de0bea884d95f33d0ec5d2a6be6be4e69
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Oct 27 17:15:42 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 27 17:25:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ab199d

dev-libs/nspr: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27983
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/nspr/files/nspr-4.33-loong.patch | 100 --
 1 file changed, 100 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.33-loong.patch 
b/dev-libs/nspr/files/nspr-4.33-loong.patch
deleted file mode 100644
index 96772a2767c0..
--- a/dev-libs/nspr/files/nspr-4.33-loong.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-https://phabricator.services.mozilla.com/D142407
-
 a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -71,10 +71,12 @@
- #define _PR_SI_ARCHITECTURE "microblaze"
- #elif defined(__nds32__)
- #define _PR_SI_ARCHITECTURE "nds32"
- #elif defined(__xtensa__)
- #define _PR_SI_ARCHITECTURE "xtensa"
-+#elif defined(__loongarch64)
-+#define _PR_SI_ARCHITECTURE "loongarch64"
- #else
- #error "Unknown CPU architecture"
- #endif
- #define PR_DLL_SUFFIX   ".so"
- 
-@@ -139,10 +141,22 @@
- #define _MD_ATOMIC_ADD_PR_x86_64_AtomicAdd
- extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET_PR_x86_64_AtomicSet
- #endif
- 
-+#if defined(__loongarch__)
-+#if defined(__GNUC__)
-+/* Use GCC built-in functions */
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-+#endif
-+#endif
-+
- #if defined(__or1k__)
- #if defined(__GNUC__)
- /* Use GCC built-in functions */
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
 a/pr/include/md/_linux.cfg
-+++ b/pr/include/md/_linux.cfg
-@@ -1253,10 +1253,56 @@
- #define PR_ALIGN_OF_WORD8
- 
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__loongarch64)
-+
-+#undef  IS_BIG_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG25
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #else
- 
- #error "Unknown CPU architecture"
- 
- #endif
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

2019-10-22 Thread Lars Wendler 
commit: 7560c5c9e7bb5bcee9f90ae84e89852de7a0cc3d
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct 22 08:38:12 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct 22 08:40:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7560c5c9

dev-libs/nspr: Bump to version 4.23

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/nspr/Manifest |   1 +
 dev-libs/nspr/files/nspr-4.23-prtime.patch |  26 ++
 dev-libs/nspr/nspr-4.23.ebuild | 122 +
 3 files changed, 149 insertions(+)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7199373e004..cc9b498ae20 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,3 +1,4 @@
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 
2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49
 SHA512 
22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.21.tar.gz 1140741 BLAKE2B 
9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0
 SHA512 
4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 
8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62
 SHA512 
d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
+DIST nspr-4.23.tar.gz 1078660 BLAKE2B 
4599684e1bb80238e409472f41d0e9ba9bc731b48fb17578c99426b277bbfa9f3c8348570b58f679ad7fa94421a1c6b5972f9218e9d56fb5d1d49d45cf04363c
 SHA512 
19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1

diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch 
b/dev-libs/nspr/files/nspr-4.23-prtime.patch
new file mode 100644
index 000..087e427866f
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.23-prtime.patch
@@ -0,0 +1,26 @@
+--- a/pr/src/misc/prtime.c
 b/pr/src/misc/prtime.c
+@@ -1621,7 +1621,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;
+ }
+ }
+@@ -1677,11 +1677,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/nspr-4.23.ebuild b/dev-libs/nspr/nspr-4.23.ebuild
new file mode 100644
index 000..1f11ed37ec1
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.23.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/;
+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 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/nspr-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.23-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
+
+   default
+
+   use elibc_musl && eapply 
"${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+   # rename configure.in to configure.ac for new autotools compatibility
+   if [[ -e "${S}"/nspr/configure.in ]] ; then
+   einfo "Renaming configure.in to configure.ac"
+   mv "${S}"/nspr/configure.{in,ac} || die
+   else
+   elog "configure.in rename logic can be removed from ebuild."
+   fi
+
+   # We must run eautoconf to regenerate configure
+   eautoconf
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

2017-11-18 Thread David Seifert 
commit: 4ea56ae57ef9ee9854792a51586cfbea7cb775a7
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Nov 17 19:18:22 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 18 18:03:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea56ae5

dev-libs/nspr: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6215

 dev-libs/nspr/files/nspr-4.15-configure_in.patch | 26 
 1 file changed, 26 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch 
b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
deleted file mode 100644
index a33717f41d6..000
--- a/dev-libs/nspr/files/nspr-4.15-configure_in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" 
-Date: Wed, 7 Jun 2017 12:14:46 -0500
-Subject: [PATCH] Close out darwin if statement, will breakage configure.in
- rename to configure.ac
-
-Signed-off-by: Jory A. Pratt 

- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index 4b2e46d..dc14ee5 100644
 a/configure.in
-+++ b/configure.in
-@@ -1389,6 +1389,7 @@ case "$target" in
- changequote([,])
- if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
- AC_DEFINE(HAS_CONNECTX)
-+fi
- AS='$(CC) -x assembler-with-cpp'
- CFLAGS="$CFLAGS -Wall -fno-common"
- case "${target_cpu}" in
--- 
-2.13.1
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

2017-06-07 Thread Jory Pratt 
commit: 953598e7f89e82f082cb5aec6908fa7af5c5f5fe
Author: Jory A. Pratt  gentoo  org>
AuthorDate: Wed Jun  7 22:55:22 2017 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Wed Jun  7 22:55:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953598e7

dev-libs/nspr: Upstream version bump, refer to changelog for full list
of changes

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/nspr/Manifest   |   1 +
 dev-libs/nspr/files/nspr-4.15-configure_in.patch |  26 +
 dev-libs/nspr/nspr-4.15.ebuild   | 127 +++
 3 files changed, 154 insertions(+)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 427b24e3e7a..815ffcb57cf 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,2 +1,3 @@
 DIST nspr-4.13.1.tar.gz 1136646 SHA256 
5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab SHA512 
4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
 WHIRLPOOL 
aa0b9731eb11b8418fced5a1ce52c801657dc738cba0f198fa4b685296e321dd168de8d4ba04335695ac1c6c345563b60e2a49af9a30069d301712c0c1c51f83
 DIST nspr-4.14.tar.gz 1136626 SHA256 
64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 
cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676
 WHIRLPOOL 
e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce
+DIST nspr-4.15.tar.gz 1140182 SHA256 
27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 SHA512 
1d6e9ba3ef71376ddb4f5ef2a6796bf3f95cf37abfac89d1745f02cc01003877d088a87946208d3827a3b3e28420215e543a647aadceff2ae6f9c1c70d4ac563
 WHIRLPOOL 
c69216c577a466317c760e2745f2d1ea71915160990ee6ed2c649b45b314bbcef470e950cf001f43898213c09b39cb016df2a49dbe3f91448d0cc345d38017b1

diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch 
b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
new file mode 100644
index 000..a33717f41d6
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
@@ -0,0 +1,26 @@
+From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" 
+Date: Wed, 7 Jun 2017 12:14:46 -0500
+Subject: [PATCH] Close out darwin if statement, will breakage configure.in
+ rename to configure.ac
+
+Signed-off-by: Jory A. Pratt 
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index 4b2e46d..dc14ee5 100644
+--- a/configure.in
 b/configure.in
+@@ -1389,6 +1389,7 @@ case "$target" in
+ changequote([,])
+ if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
+ AC_DEFINE(HAS_CONNECTX)
++fi
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
+-- 
+2.13.1
+

diff --git a/dev-libs/nspr/nspr-4.15.ebuild b/dev-libs/nspr/nspr-4.15.ebuild
new file mode 100644
index 000..87057ab1082
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.15.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/;
+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"
+IUSE="debug"
+
+RDEPEND="
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )"
+
+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
+   # Fix configure.in to we can generate a working configure.ac
+   "${FILESDIR}"/${PN}-4.15-configure_in.patch
+)
+
+src_prepare() {
+   cd "${S}"/nspr || die
+
+   default
+
+   # rename configure.in to configure.ac for new autotools compatibility
+   if [[ -e "${S}"/nspr/configure.in ]] ; then
+   einfo "Renaming configure.in to configure.ac"
+   mv "${S}"/nspr/configure.{in,ac} || die
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

2016-10-24 Thread Lars Wendler 
commit: d3588128f9a3681ef12c58a30258bf389f6f897c
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct 24 09:12:32 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct 24 09:13:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3588128

dev-libs/nspr: Removed old.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/nspr/Manifest |   3 -
 .../nspr/files/nspr-4.10.10-musl-support.patch |  21 
 dev-libs/nspr/nspr-4.10.10-r1.ebuild   | 122 -
 dev-libs/nspr/nspr-4.10.10.ebuild  | 120 
 dev-libs/nspr/nspr-4.10.8.ebuild   | 120 
 dev-libs/nspr/nspr-4.11.ebuild | 122 -
 6 files changed, 508 deletions(-)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7b2f77a..8d8e3ff 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,3 @@
-DIST nspr-4.10.10.tar.gz 1134164 SHA256 
343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512 
60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376
 WHIRLPOOL 
db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
-DIST nspr-4.10.8.tar.gz 1131130 SHA256 
507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 
f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9
 WHIRLPOOL 
67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c
-DIST nspr-4.11.tar.gz 1134106 SHA256 
cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 SHA512 
26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02
 WHIRLPOOL 
f8707154d1981a09140d31d359d5a40867eaad447620a4731a11c770cae13b8e9a64ef45c82123083e37e2effedfb0c367cc57969a3baf65628ff1e9ccf41517
 DIST nspr-4.12.tar.gz 1135458 SHA256 
e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 
138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460
 WHIRLPOOL 
d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d
 DIST nspr-4.13.1.tar.gz 1136646 SHA256 
5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab SHA512 
4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
 WHIRLPOOL 
aa0b9731eb11b8418fced5a1ce52c801657dc738cba0f198fa4b685296e321dd168de8d4ba04335695ac1c6c345563b60e2a49af9a30069d301712c0c1c51f83
 DIST nspr-4.13.tar.gz 1136571 SHA256 
19c4bb3fa6d24800ffa65d7d806c54ad5f8c3758a5c11352ad43212ab181 SHA512 
6af8671aa32d2dd08e900f235950c200e27c7052be2456651cbd8d508f376f60bdbdaa2ac984397027706618e0c794749c9dbf09c1972d9ba5280dadec37a562
 WHIRLPOOL 
5b93db16eb4bf1e8ee3e39b2df7f880cf42d80583a8b191395d5602090120eab83881eb2459869ff12de070cbd4be969f97d94445b40ac56ae810682008b16e3

diff --git a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch 
b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
deleted file mode 100644
index 0588414..
--- a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Felix Janda 
-# Date 1429558773 -7200
-#  Mon Apr 20 21:39:33 2015 +0200
-# Node ID 12494ff1de6cd7020c134d97b0b1ca81feb20520
-# Parent  c5cb946571388f1643ab0fb04b3bfacd93cf818e
-Fix compilation with musl libc - try 2
-
-diff -r c5cb94657138 -r 12494ff1de6c pr/src/misc/prnetdb.c
 a/pr/src/misc/prnetdb.cMon Apr 20 14:37:29 2015 -0400
-+++ b/pr/src/misc/prnetdb.cMon Apr 20 21:39:33 2015 +0200
-@@ -63,8 +63,7 @@
- 
- #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
-   || (defined(LINUX) && defined(_REENTRANT) \
--&& !(defined(__GLIBC__) && __GLIBC__ >= 2) \
--&& !defined(ANDROID))
-+&& defined(__GLIBC__) && __GLIBC__ < 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif

diff --git a/dev-libs/nspr/nspr-4.10.10-r1.ebuild 
b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
deleted file mode 100644
index 76a4fd2..
--- a/dev-libs/nspr/nspr-4.10.10-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

2016-09-04 Thread Jory Pratt 
commit: 17e2d66110c1a1d6e27ab3261e93e897267e4b7a
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Sep  4 11:50:49 2016 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sun Sep  4 22:58:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e2d661

dev-libs/nspr: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2230

Signed-off-by: Jory A. Pratt  gentoo.org>

 dev-libs/nspr/files/nspr-4.6.1-lang.patch| 41 --
 dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 
 2 files changed, 103 deletions(-)

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 46fe15b..
--- 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.4-solaris.patch 
b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
deleted file mode 100644
index a0f14d5..
--- 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'

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

2015-11-26 Thread Jory Pratt 
commit: 71653e27381a0b12b56e7d2db32a2f1588ab6053
Author: Jory A. Pratt  gentoo  org>
AuthorDate: Thu Nov 26 21:44:12 2015 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Thu Nov 26 21:44:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71653e27

dev-libs/nspr - add musl support

 .../nspr/files/nspr-4.10.10-musl-support.patch |  21 
 dev-libs/nspr/nspr-4.10.10-r1.ebuild   | 122 +
 2 files changed, 143 insertions(+)

diff --git a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch 
b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
new file mode 100644
index 000..0588414
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Felix Janda 
+# Date 1429558773 -7200
+#  Mon Apr 20 21:39:33 2015 +0200
+# Node ID 12494ff1de6cd7020c134d97b0b1ca81feb20520
+# Parent  c5cb946571388f1643ab0fb04b3bfacd93cf818e
+Fix compilation with musl libc - try 2
+
+diff -r c5cb94657138 -r 12494ff1de6c pr/src/misc/prnetdb.c
+--- a/pr/src/misc/prnetdb.cMon Apr 20 14:37:29 2015 -0400
 b/pr/src/misc/prnetdb.cMon Apr 20 21:39:33 2015 +0200
+@@ -63,8 +63,7 @@
+ 
+ #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+   || (defined(LINUX) && defined(_REENTRANT) \
+-&& !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+-&& !defined(ANDROID))
++&& defined(__GLIBC__) && __GLIBC__ < 2)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif

diff --git a/dev-libs/nspr/nspr-4.10.10-r1.ebuild 
b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
new file mode 100644
index 000..76a4fd2
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/;
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/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"
+IUSE="debug"
+
+RDEPEND="
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )"
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/nspr-config
+)
+
+src_prepare() {
+   cd "${S}"/nspr || die
+   epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+   epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+   epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
+   # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
+   epatch "${FILESDIR}"/${P}-musl-support.patch
+
+   # rename configure.in to configure.ac for new autotools compatibility
+   if [[ -e "${S}"/nspr/configure.in ]] ; then
+   einfo "Renaming configure.in to configure.ac"
+   mv "${S}"/nspr/configure.{in,ac} || die
+   fi
+   # We must run eautoconf to regenerate configure
+   eautoconf
+
+   # make sure it won't find Perl out of Prefix
+   sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+   # Respect LDFLAGS
+   sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+   "${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+   # We use the standard BUILD_xxx but nspr uses HOST_xxx
+   tc-export_build_env BUILD_CC
+   export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} 
HOST_LDFLAGS=${BUILD_LDFLAGS}
+   tc-export AR CC CXX RANLIB
+   [[ ${CBUILD} != ${CHOST} ]] \
+   && export CROSS_COMPILE=1 \
+   || unset CROSS_COMPILE
+
+   local myconf=()
+
+   # The configure has some fancy --enable-{{n,x}32,64bit} switches
+   # that trigger some code conditional to platform & arch. This really
+   # matters for the few common arches (x86, ppc) but we pass a little
+   # more of them to be future-proof.
+
+   # use ABI first, this will work for most cases
+   case "${ABI}" in
+   alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+   n32) myconf+=( --enable-n32 );;
+   x32) myconf+=( --enable-x32 );;
+   s390x|*64) myconf+=( --enable-64bit );;
+   default) # no abi actually set, fall back