Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/, dev-libs/nspr/files/
Date: Fri, 28 Jul 2017 18:55:42
Message-Id: 1501268117.27eb4b03de4155b51257f810cc10cc69eac21c14.anarchy@gentoo
1 commit: 27eb4b03de4155b51257f810cc10cc69eac21c14
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 28 18:55:17 2017 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 28 18:55:17 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=27eb4b03
7
8 dev-libs/nspr: nspr-4.16 version bump
9
10 dev-libs/nspr/Manifest | 2 +-
11 dev-libs/nspr/files/nspr-4.15-configure_in.patch | 26 ----------------------
12 .../nspr/{nspr-4.15.ebuild => nspr-4.16.ebuild} | 2 --
13 dev-libs/nss/Manifest | 1 +
14 4 files changed, 2 insertions(+), 29 deletions(-)
15
16 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
17 index 8049e31..5194992 100644
18 --- a/dev-libs/nspr/Manifest
19 +++ b/dev-libs/nspr/Manifest
20 @@ -1 +1 @@
21 -DIST nspr-4.15.tar.gz 1140182 SHA256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 SHA512 1d6e9ba3ef71376ddb4f5ef2a6796bf3f95cf37abfac89d1745f02cc01003877d088a87946208d3827a3b3e28420215e543a647aadceff2ae6f9c1c70d4ac563 WHIRLPOOL c69216c577a466317c760e2745f2d1ea71915160990ee6ed2c649b45b314bbcef470e950cf001f43898213c09b39cb016df2a49dbe3f91448d0cc345d38017b1
22 +DIST nspr-4.16.tar.gz 1140681 SHA256 9b3102d97665504aeee73363c11a21c062ad67a2522242368b7f019f96a53cd1 SHA512 38cb8b26c2ee44063357a9484f1f6b24bab00a0d28a8f1644f64356205e7a407a1858d7a4d5cd2d6b62a39d3c0aea0cf2bddaa95fe61df272a633fe5fdee41b6 WHIRLPOOL a1c0ffb03df9cc79252cff6d39548e828617690b2ded0b6151f809ad2e78b394a001d15ceb8d6ca207b71c79d888bdd53fc4b10402bb0114ecc81291965e4d3b
23
24 diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
25 deleted file mode 100644
26 index a33717f..0000000
27 --- a/dev-libs/nspr/files/nspr-4.15-configure_in.patch
28 +++ /dev/null
29 @@ -1,26 +0,0 @@
30 -From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
31 -From: "Jory A. Pratt" <anarchy@g.o>
32 -Date: Wed, 7 Jun 2017 12:14:46 -0500
33 -Subject: [PATCH] Close out darwin if statement, will breakage configure.in
34 - rename to configure.ac
35 -
36 -Signed-off-by: Jory A. Pratt <anarchy@g.o>
37 ----
38 - configure.in | 1 +
39 - 1 file changed, 1 insertion(+)
40 -
41 -diff --git a/configure.in b/configure.in
42 -index 4b2e46d..dc14ee5 100644
43 ---- a/configure.in
44 -+++ b/configure.in
45 -@@ -1389,6 +1389,7 @@ case "$target" in
46 - changequote([,])
47 - if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
48 - AC_DEFINE(HAS_CONNECTX)
49 -+ fi
50 - AS='$(CC) -x assembler-with-cpp'
51 - CFLAGS="$CFLAGS -Wall -fno-common"
52 - case "${target_cpu}" in
53 ---
54 -2.13.1
55 -
56
57 diff --git a/dev-libs/nspr/nspr-4.15.ebuild b/dev-libs/nspr/nspr-4.16.ebuild
58 similarity index 97%
59 rename from dev-libs/nspr/nspr-4.15.ebuild
60 rename to dev-libs/nspr/nspr-4.16.ebuild
61 index 87057ab..56daac7 100644
62 --- a/dev-libs/nspr/nspr-4.15.ebuild
63 +++ b/dev-libs/nspr/nspr-4.16.ebuild
64 @@ -35,8 +35,6 @@ PATCHES=(
65 "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
66 # We do not need to pass -L$libdir via nspr-config --libs
67 "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
68 - # Fix configure.in to we can generate a working configure.ac
69 - "${FILESDIR}"/${PN}-4.15-configure_in.patch
70 )
71
72 src_prepare() {
73
74 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
75 index 619336e..1627dc6 100644
76 --- a/dev-libs/nss/Manifest
77 +++ b/dev-libs/nss/Manifest
78 @@ -1,3 +1,4 @@
79 DIST nss-3.31.tar.gz 9537011 SHA256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d SHA512 2b56405b32d37cc4386cbbe54462cc57092e47b3418a743adbae14e1825ca69d07256fbfe16c0cfd7540c46cea67259151b42a0d95419c80964015eacdcafea1 WHIRLPOOL b63b481436feaf48ef3acc03e7af3831b743e91fda802f1fb5d4e782cbefab979dda5b643766f3a600b16ff815a90dacabd0b06b79baa76386237b56e74676fb
80 +DIST nss-3.32.tar.gz 9493574 SHA256 35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335 SHA512 7a01f81e23ef9649fd26b8423b015f4df5878c94f6ff591727086644b01db3dbc36de4e131cf70a6f84564e46c8decb7c4f7780fca12270eb900de1f8a11ee3c WHIRLPOOL bd1a9a8da509143ba995c2a4aac43df991703c1170e2654a8e762fbaf1b26e4f95f85c9d06db45126247a6d52828060c5283fb9cf1e4328952bc518ee38316c4
81 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
82 DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836