[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nspr/files/, dev-libs/nss/, dev-libs/nspr/

[Lars Wendler]

commit:     5f6b5e9d4d3646f6138993de1edf46013774fccd
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 15:12:43 2014 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 15:12:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=5f6b5e9d

Some libs updated to latest version from portage.

---
 dev-libs/nspr/Manifest                             |  2 +-
 dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch    | 43 ----------------------
 .../{nspr-4.10.2.ebuild => nspr-4.10.3.ebuild}     |  6 +--
 dev-libs/nss/Manifest                              |  4 +-
 dev-libs/nss/files/nss-3.15.4-enable-pem.patch     | 13 +++++++
 .../nss/{nss-3.15.3.1.ebuild => nss-3.15.5.ebuild} | 32 ++++++++++------
 6 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7ecbbf9..fb60fd7 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.10.2.tar.gz 1103130 SHA256 4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400 SHA512 bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 WHIRLPOOL 0cf2916c4cb595ee3ccd88da636a6599e2c3b5c51193608bbd2acfa9b3bcad89a7135af1f4cf42644495e17fc03c67a8b22719c0efb4faf8aacf1dcd0d0d9511
+DIST nspr-4.10.3.tar.gz 1104478 SHA256 f25779b1a665dab0090b9c977dc6c29a63320f442956ed78629b66b405cb01e5 SHA512 f8f940e5536f29d9a686b023f3c418b40e24a785b6e4130f9d1f373fb7f1bb5879f52e8c2f1338ac742ff9225fea1a29a394b96cedc9f05b3bd4600885c63dec WHIRLPOOL 7fdc8d357e0b45e46d4a9b365bd38691144554a641827fa1ae4fb714f504ec16ad7fcabc27297019d020d3fe8d5207a18d053fb027c91603633c905b8516d50f

diff --git a/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch b/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch
deleted file mode 100644
index 667e699..0000000
--- a/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-NSPR does not set the soname on any platform yet:
-https://bugzilla.mozilla.org/show_bug.cgi?id=452873
-
-Supporting something like "soname" on AIX is tricky:
-http://bugs.gentoo.org/show_bug.cgi?id=213277
-
---- mozilla/nsprpub/config/rules.mk.orig	2010-02-23 15:55:00 +0100
-+++ mozilla/nsprpub/config/rules.mk	2010-02-23 16:04:31 +0100
-@@ -132,14 +132,17 @@
- else
- ifdef MKSHLIB
- SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-+ifeq ($(OS_ARCH), AIX)
-+IMPORT_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME).$(DLL_SUFFIX)
-+endif
- endif
- endif
- 
- endif
- endif
- 
- ifndef TARGETS
--ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-+ifeq (,$(filter-out WINNT WINCE OS2 AIX,$(OS_ARCH)))
- TARGETS		= $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
- ifndef BUILD_OPT
- ifdef MSC_VER
-@@ -327,6 +330,15 @@
- else
- ifeq (,$(filter-out WIN95 WINCE,$(OS_TARGET)))
- $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
-+else
-+ifdef IMPORT_LIBRARY
-+$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
-+	 ( echo '#! $(notdir $(SHARED_LIBRARY))' \
-+	 ; dump -Tv $(SHARED_LIBRARY) \
-+	 | awk '{ if ($$4 == "EXP" && $$6 != "SECdef") { print $$8 } }' \
-+	 | sort -u \
-+	 ) > $@
-+endif
- endif
- endif
- 

diff --git a/dev-libs/nspr/nspr-4.10.2.ebuild b/dev-libs/nspr/nspr-4.10.3.ebuild
similarity index 88%
rename from dev-libs/nspr/nspr-4.10.2.ebuild
rename to dev-libs/nspr/nspr-4.10.3.ebuild
index f46facf..93f225e 100644
--- a/dev-libs/nspr/nspr-4.10.2.ebuild
+++ b/dev-libs/nspr/nspr-4.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.3.ebuild,v 1.1 2014/02/05 07:43:05 polynomial-c Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
 
 src_prepare() {

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 5bec23c..44a3371 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,3 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.15-pem-support-20130617.patch.xz 27800 SHA256 01885877f12b0460798760617c9b0a1f8ed05ad0130e924211bd73fc344535cc SHA512 ebf0633e1683b3b9efe340d1117e02f1ced7e8381c7e867fff77efc3c41df1a32f017b18816ae6a04b35b5006c83e557c47a13ae576f50a84f9770c321dfa34b WHIRLPOOL 88f5edc621ca7862dc2e433836e11caa60752dc8f95bc7f49bcf07cdd0b3d8f2d7642ee02b018b8429a3e358e252ecdf3de40a1b12fab1f0fa13ca360e02a53c
-DIST nss-3.15.3.1.tar.gz 6289657 SHA256 607a913882540df81f74152e8aa492e0dd09c5d3f2c7321f18c69ee501fc6ba5 SHA512 a6b93df711a5af32afc29629132c72b3b93b880c0072916d892840088d23c0cf1c8db211a2f0ced9a97b5f80be2c9debdce9829a2a428be7bb4a7b62a91d9ab7 WHIRLPOOL 77a907ff069ff432e1aecf56ebcb37821310bde8628d949178e3f90483b16248b85a283db9dd19fe76934543b7ad48c495682cd5bcf035a7548aaa6b69489179
+DIST nss-3.15.5.tar.gz 6367893 SHA256 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 SHA512 4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca WHIRLPOOL c3c687ac53dca571d1c45bdf4a80e192ca58da07e06ef56de7ac9736480c97689dd12d14351860764b70a1d823092a1ddbc471328c4bae4a899edd0e331c8aee
+DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868

diff --git a/dev-libs/nss/files/nss-3.15.4-enable-pem.patch b/dev-libs/nss/files/nss-3.15.4-enable-pem.patch
new file mode 100644
index 0000000..8e61024
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15.4-enable-pem.patch
@@ -0,0 +1,13 @@
+Patches taken from http://pkgs.fedoraproject.org/cgit/nss.git/
+
+--- nss/lib/ckfw/manifest.mn.libpem
++++ nss/lib/ckfw/manifest.mn
+@@ -5,7 +5,7 @@
+ 
+ CORE_DEPTH = ../..
+ 
+-DIRS = builtins 
++DIRS = builtins pem
+ 
+ PRIVATE_EXPORTS = \
+ 	ck.h		  \

diff --git a/dev-libs/nss/nss-3.15.3.1.ebuild b/dev-libs/nss/nss-3.15.5.ebuild
similarity index 87%
rename from dev-libs/nss/nss-3.15.3.1.ebuild
rename to dev-libs/nss/nss-3.15.5.ebuild
index 24097d0..6817db8 100644
--- a/dev-libs/nss/nss-3.15.3.1.ebuild
+++ b/dev-libs/nss/nss-3.15.5.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.3.ebuild,v 1.1 2013/11/14 11:45:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.5.ebuild,v 1.1 2014/02/22 10:42:36 polynomial-c Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 NSPR_VER="4.10"
 RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
+PEM_P="${PN}-pem-${PEM_GIT_REV}"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
 HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
 SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
-	http://dev.gentoo.org/~anarchy/patches/${PN}-3.15-pem-support-20130617.patch.xz"
+	cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
+	nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cacert +nss-pem utils"
 
 DEPEND="virtual/pkgconfig
 	>=dev-libs/nspr-${NSPR_VER}"
-
 RDEPEND=">=dev-libs/nspr-${NSPR_VER}
 	>=dev-db/sqlite-3.5
 	sys-libs/zlib"
@@ -34,14 +36,21 @@ src_setup() {
 	export LC_ALL="C"
 }
 
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
 src_prepare() {
 	# Custom changes for gentoo
 	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
 	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
-	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-	epatch "${DISTDIR}/${PN}-3.15-pem-support-20130617.patch.xz"
+	use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
 	epatch "${FILESDIR}/${PN}-3.15-x32.patch"
-	epatch "${FILESDIR}/${PN}-3.15.1-fipstest-warnings.patch"
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
 	cd coreconf
 	# hack nspr paths
 	echo 'INCLUDES += -I$(DIST)/include/dbm' \
@@ -61,8 +70,6 @@ src_prepare() {
 	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
 		"${S}"/config/Makefile
 
-	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
-
 	# use host shlibsign if need be #436216
 	if tc-is-cross-compiler ; then
 		sed -i \
@@ -82,6 +89,7 @@ nssarch() {
 	# Most of the arches are the same as $ARCH
 	local t=${1:-${CHOST}}
 	case ${t} in
+	aarch64*)echo "aarch64";;
 	hppa*)   echo "parisc";;
 	i?86*)   echo "i686";;
 	x86_64*) echo "x86_64";;