commit: df0904e6ce4711d56d6abb2ec6f435282b22fb28
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 19:08:57 2017 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 19:08:57 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=df0904e6
dev-libs/nss: nss-3.32 version bump, fix gentoo pkg-config patch
dev-libs/nss/Manifest | 1 -
...o-fixups.patch => nss-3.32-gentoo-fixups.patch} | 109 ++++++++++++++-------
dev-libs/nss/{nss-3.31.ebuild => nss-3.32.ebuild} | 4 +-
3 files changed, 73 insertions(+), 41 deletions(-)
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 1627dc6..2d3743d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,3 @@
-DIST nss-3.31.tar.gz 9537011 SHA256
e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d SHA512
2b56405b32d37cc4386cbbe54462cc57092e47b3418a743adbae14e1825ca69d07256fbfe16c0cfd7540c46cea67259151b42a0d95419c80964015eacdcafea1
WHIRLPOOL
b63b481436feaf48ef3acc03e7af3831b743e91fda802f1fb5d4e782cbefab979dda5b643766f3a600b16ff815a90dacabd0b06b79baa76386237b56e74676fb
DIST nss-3.32.tar.gz 9493574 SHA256
35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335 SHA512
7a01f81e23ef9649fd26b8423b015f4df5878c94f6ff591727086644b01db3dbc36de4e131cf70a6f84564e46c8decb7c4f7780fca12270eb900de1f8a11ee3c
WHIRLPOOL
bd1a9a8da509143ba995c2a4aac43df991703c1170e2654a8e762fbaf1b26e4f95f85c9d06db45126247a6d52828060c5283fb9cf1e4328952bc518ee38316c4
DIST nss-cacert-class1-class3.patch 22950 SHA256
6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
WHIRLPOOL
1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
DIST nss-pem-20160329.tar.xz 27732 SHA256
6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512
5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
WHIRLPOOL
16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836
diff --git a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
similarity index 76%
rename from dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
rename to dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
index 69aa652..1773da9 100644
--- a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
+++ b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
@@ -1,5 +1,54 @@
---- nss/config/Makefile
-+++ nss/config/Makefile
+From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <[email protected]>
+Date: Fri, 28 Jul 2017 14:00:41 -0500
+Subject: [PATCH] add pkg-config file
+
+Signed-off-by: Jory A. Pratt <[email protected]>
+---
+ Makefile | 11 +---
+ config/Makefile | 40 ++++++++++++++
+ config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ config/nss.pc.in | 12 +++++
+ manifest.mn | 2 +-
+ 5 files changed, 199 insertions(+), 11 deletions(-)
+ create mode 100644 config/Makefile
+ create mode 100644 config/nss-config.in
+ create mode 100644 config/nss.pc.in
+
+diff --git a/Makefile b/Makefile
+index 48bae37..9850883 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all latest
++nss_build_all: all latest
+
+ nss_clean_all: clobber_nspr clobber
+
+@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
+ --prefix='$(NSS_GYP_PREFIX)'
+ endif
+
+-build_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-
+-install_nspr: build_nspr
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
+-
+ build_docs:
+ $(MAKE) -C $(CORE_DEPTH)/doc
+
+diff --git a/config/Makefile b/config/Makefile
+new file mode 100644
+index 0000000..600fe48
+--- /dev/null
++++ b/config/Makefile
@@ -0,0 +1,40 @@
+CORE_DEPTH = ..
+DEPTH = ..
@@ -41,8 +90,11 @@
+
+dummy: all export libs
+
---- nss/config/nss-config.in
-+++ nss/config/nss-config.in
+diff --git a/config/nss-config.in b/config/nss-config.in
+new file mode 100644
+index 0000000..1d7c444
+--- /dev/null
++++ b/config/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
@@ -189,8 +241,11 @@
+ echo $libdirs
+fi
+
---- nss/config/nss.pc.in
-+++ nss/config/nss.pc.in
+diff --git a/config/nss.pc.in b/config/nss.pc.in
+new file mode 100644
+index 0000000..df9e2cf
+--- /dev/null
++++ b/config/nss.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -204,38 +259,16 @@
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
+
---- nss/Makefile
-+++ nss/Makefile
-@@ -46,7 +46,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
-
- nss_clean_all: clobber_nspr clobber
-
-@@ -143,15 +143,6 @@
- --prefix='$(NSS_GYP_PREFIX)'
- endif
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--install_nspr: build_nspr
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- $(MAKE) -C $(CORE_DEPTH)/doc
-
---- nss/manifest.mn
-+++ nss/manifest.mn
-@@ -10,4 +10,4 @@
+diff --git a/manifest.mn b/manifest.mn
+index 500a5ad..87c905e 100644
+--- a/manifest.mn
++++ b/manifest.mn
+@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
RELEASE = nss
--DIRS = coreconf lib cmd gtests
-+DIRS = coreconf lib cmd config
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil config
+--
+2.13.3
+
diff --git a/dev-libs/nss/nss-3.31.ebuild b/dev-libs/nss/nss-3.32.ebuild
similarity index 99%
rename from dev-libs/nss/nss-3.31.ebuild
rename to dev-libs/nss/nss-3.32.ebuild
index 3d6f566..2932e76 100644
--- a/dev-libs/nss/nss-3.31.ebuild
+++ b/dev-libs/nss/nss-3.32.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-NSPR_VER="4.13.1"
+NSPR_VER="4.16"
RTM_NAME="NSS_${PV//./_}_RTM"
# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
@@ -43,7 +43,7 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
# Custom changes for gentoo
- "${FILESDIR}/${PN}-3.28-gentoo-fixups.patch"
+ "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
)
