* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2011-08-27 22:41 Jory Pratt
0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2011-08-27 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 0f6293e46632c2d648933f9264e0dd2bf74b9634
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 22:37:46 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 22:37:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0f6293e4
update nss/nspr for latest release, multiple bug fixes.
---
dev-libs/nspr/Manifest | 4 ++--
.../{nspr-4.8.7_beta2.ebuild => nspr-4.8.9.ebuild} | 15 ++++++++-------
dev-libs/nss/Manifest | 4 ++--
...{nss-3.12.9_beta2.ebuild => nss-3.12.11.ebuild} | 10 +++++-----
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7e64978..695df1c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,5 +8,5 @@ AUX nspr-4.8-pkgconfig-gentoo-3.patch 4726 RMD160 c8e93e2a06b90d6e69a12dce4cfaba
AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
-DIST nspr-4.8.7_beta2.tar.bz2 903850 RMD160 d3e1d594e9fe2ca70dcd20585550eff034fc091a SHA1 b2410371acc2b60214c5049a90dafe7f5fb6a0a6 SHA256 1a3e9a21e705c84557899b08d0ec2ba1f3477db9d455f1bf52faa139a0f097c0
-EBUILD nspr-4.8.7_beta2.ebuild 3472 RMD160 c8c398be5cc0f1758b2d9da2b85ee7c3659e217f SHA1 ee3c8d209f9875b1c8cc4c8162c04d9134b9a8c8 SHA256 fd4bcfbe08e05600619209ffd7bd60bcf8ee96b07b32e688b3fb037feaf81b52
+DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce
+EBUILD nspr-4.8.9.ebuild 3559 RMD160 cb5afab90bc68ffaf93873228ee7914d4d89e82f SHA1 a74633357fea657dee06ede6acb79270c6f8e6e5 SHA256 d1b0c1abf7e2cbc8294a7303d09b827c7f78f934bf9e623182583ab8c0519b70
diff --git a/dev-libs/nspr/nspr-4.8.7_beta2.ebuild b/dev-libs/nspr/nspr-4.8.9.ebuild
similarity index 85%
rename from dev-libs/nspr/nspr-4.8.7_beta2.ebuild
rename to dev-libs/nspr/nspr-4.8.9.ebuild
index 65f5bac..b7963b4 100644
--- a/dev-libs/nspr/nspr-4.8.7_beta2.ebuild
+++ b/dev-libs/nspr/nspr-4.8.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild,v 1.3 2010/07/21 23:18:27 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.8.ebuild,v 1.1 2011/05/13 21:13:30 anarchy Exp $
EAPI=3
@@ -10,7 +10,7 @@ MIN_PV="$(get_version_component_range 2)"
DESCRIPTION="Netscape Portable Runtime"
HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="http://dev.gentoo.org/~anarchy/dist/${P}.tar.bz2"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
@@ -27,6 +27,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
+ # Patch needs updating
#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
# make sure it won't find Perl out of Prefix
@@ -42,9 +43,9 @@ src_configure() {
echo > "${T}"/test.c
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
- case $(file "${T}"/test.o) in
- *64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
- *32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;;
+ case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in
+ ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";;
+ ELFCLASS32*|POWERPC*|I386*|ARM*) ;;
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
esac
@@ -70,7 +71,7 @@ src_install () {
cd "${ED}"/usr/$(get_libdir)
for file in *.a; do
einfo "removing static libraries as upstream has requested!"
- rm -f ${file} || die "failed to remove staic libraries."
+ rm -f ${file} || die "failed to remove static libraries."
done
local n=
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 90a5856..ef682de 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,5 @@
AUX nss-3.12.4-solaris-gcc.patch 842 RMD160 83324ac0ecde97e1976bf5162e7ce01ab2ca07e6 SHA1 769562dc8fd7ecc85e4f06a88d568433f2f3f5e2 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865
AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
-DIST nss-3.12.9_beta2.tar.bz2 4501513 RMD160 78824a51fc54b6c8ec4a577a57871cd7d975950c SHA1 c3caa94c3088769a168cacf772f5fe30a42032e3 SHA256 e841061f3d619739ca68668291fc2e8301bd88677210f6c811005e29c6e7c58d
-EBUILD nss-3.12.9_beta2.ebuild 6576 RMD160 bb06a76d2623831b41a888481821d3f2e7ad38e4 SHA1 46f1dba2585bdde330116a3f8884386cc6920569 SHA256 54b1f37089d2043ac41030b1e22077b33cf046bfcfd782af16b3d8c01be6492e
+DIST nss-3.12.11.tar.gz 5944840 RMD160 4528d4be996bce801ff5f4c978457bd17c8e8625 SHA1 187ae83a8368512bb8729c206da2ed34db1725ad SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16
+EBUILD nss-3.12.11.ebuild 6625 RMD160 3bf09ff1cc38df747bc74264d28b732d0a293fef SHA1 b0d71bd7112a1145d6634b8d40e768accb8902b0 SHA256 e182ebdeb1012af160e873327ac9ca49d70b75990cbc7ddb7497d72c06ac6acf
diff --git a/dev-libs/nss/nss-3.12.9_beta2.ebuild b/dev-libs/nss/nss-3.12.11.ebuild
similarity index 93%
rename from dev-libs/nss/nss-3.12.9_beta2.ebuild
rename to dev-libs/nss/nss-3.12.11.ebuild
index 640f0e8..c0d8283 100644
--- a/dev-libs/nss/nss-3.12.9_beta2.ebuild
+++ b/dev-libs/nss/nss-3.12.11.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.8.ebuild,v 1.8 2010/10/31 12:01:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.10.ebuild,v 1.2 2011/07/31 14:29:19 anarchy Exp $
EAPI=3
inherit eutils flag-o-matic multilib toolchain-funcs
-NSPR_VER="4.8.6"
+NSPR_VER="4.8.9"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="http://dev.gentoo.org/~anarchy/dist/${P}.tar.bz2"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="utils"
DEPEND="dev-util/pkgconfig"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2012-03-04 4:31 Jory Pratt
0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2012-03-04 4:31 UTC (permalink / raw
To: gentoo-commits
commit: de5fc35fe45489679ce134d3cee3327d1f50566d
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 04:31:09 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 4 04:31:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=de5fc35f
ensure we use C locale when building nss/nspr
---
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/nspr-4.9.ebuild | 4 ++++
dev-libs/nss/Manifest | 2 +-
dev-libs/nss/nss-3.13.3.ebuild | 4 ++++
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 5dfb6ea..0a864a6 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -10,4 +10,4 @@ AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
AUX nspr-4.9-pkgconfig-gentoo.patch 3710 RMD160 c25988e23698df566f69618989eb864dd8bd8848 SHA1 c10e52de61057047a53d8a45f56e7ad901014b57 SHA256 1483506296818ffffbb292d28d336d37147154e5e3db35e7e07d37bb728e2253
DIST nspr-4.9.tar.gz 1218528 RMD160 35298a4752aa657196b9d2f41ad46f1bef7e22a2 SHA1 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a
-EBUILD nspr-4.9.ebuild 3414 RMD160 ae521f48e8c134010880269198458df06a27dbb2 SHA1 a00a9e94300190c3f6ceb6ca1de5aa1866aa064b SHA256 ae702462d83c03ad51595d3e600e60978e137ff29a946f5216477a510035f5d0
+EBUILD nspr-4.9.ebuild 3450 RMD160 53a7c2f1b09133bff35d0ad6a03584fdbcdc56b9 SHA1 efd3b8b30f1fb4b86b3595d90b2ba8ce176ebb59 SHA256 296b7bf54a755d2be43ea1a78eeeb6c631ea1e49153e4892aba02ad8982eacfb
diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.ebuild
index ae1792a..5fa4b39 100644
--- a/dev-libs/nspr/nspr-4.9.ebuild
+++ b/dev-libs/nspr/nspr-4.9.ebuild
@@ -18,6 +18,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
+src_setup() {
+ export LC_ALL="C"
+}
+
src_prepare() {
mkdir build inst
epatch "${FILESDIR}"/${PN}-4.8-config.patch
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 025e6ed..2ffe106 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,4 +3,4 @@ AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347
AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b
DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb21 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e
DIST nss-3.13.3.tar.gz 6083507 RMD160 844958f0cad39d0283d046104fd41349ff4dda4c SHA1 6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6 SHA256 efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587
-EBUILD nss-3.13.3.ebuild 6658 RMD160 3182f223701aa0c8b07810f135210ece1b0f73fe SHA1 6fc93873492fcd5ce0c61fd18f94e0f39917e162 SHA256 7eda2c3d50d94dbb4d926865b85d8070d79d73a52f9e89ba8c79ac8f310868fe
+EBUILD nss-3.13.3.ebuild 6694 RMD160 d1c9d790b5a4a8cb80abfd495e498143af23e518 SHA1 5c1f5dd98be18c3d1f014df39eac1187adcc9287 SHA256 4e4c13834698cb2153a6431ca10e3a6b14968ec651c7784665c618ec3484c24e
diff --git a/dev-libs/nss/nss-3.13.3.ebuild b/dev-libs/nss/nss-3.13.3.ebuild
index 534da53..019a901 100644
--- a/dev-libs/nss/nss-3.13.3.ebuild
+++ b/dev-libs/nss/nss-3.13.3.ebuild
@@ -23,6 +23,10 @@ RDEPEND=">=dev-libs/nspr-${NSPR_VER}
>=dev-db/sqlite-3.5
sys-libs/zlib"
+src_setup() {
+ export LC_ALL="C"
+}
+
src_prepare() {
# Custom changes for gentoo
epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2012-06-06 13:09 Jory Pratt
0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2012-06-06 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 6efc64c5b3e4ac757120b33a98d1cac4c913aea8
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 13:08:50 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 13:08:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6efc64c5
Fix keywords on nss/nspr
---
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/nspr-4.9.1.ebuild | 2 +-
dev-libs/nss/Manifest | 2 +-
dev-libs/nss/nss-3.13.5.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 16ef6eb..683f7b0 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,4 +9,4 @@ AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1.ebuild 3639 RMD160 476168270b833e5f28d1c1017d9ab39fcd942e33 SHA1 64d924c04cd3e67aef333684b9f733600b4f252a SHA256 5208b17ee8dd3c84f911a08de14aa49994f158ff0755f2aedb858412d82d0945
+EBUILD nspr-4.9.1.ebuild 3651 RMD160 d13d12a0eb5cfbef63687930bf5110c405752b6f SHA1 92b4ac2a96ad4e9bf62de3d941fc7abdf409fdda SHA256 9f33a59933a14448b22273d37cae80dc39bb98a76d8451968dbbcd531b4b253f
diff --git a/dev-libs/nspr/nspr-4.9.1.ebuild b/dev-libs/nspr/nspr-4.9.1.ebuild
index 3f7426a..cddaeee 100644
--- a/dev-libs/nspr/nspr-4.9.1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 e4f7f09..0c18528 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,4 +4,4 @@ AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446a
DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb21 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e
DIST nss-3.13.3_pem.support 191571 RMD160 875a6ca4328f582cfb42ca8427144f9c4f7f185a SHA1 17701871db5ce22edd64f9f7076a51f2b64f9d11 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c
DIST nss-3.13.5.tar.gz 6087983 RMD160 208ef2bda665946f921d7907b1ff606131b9a9d4 SHA1 22cfe2cbccc93189699e6eed283eca288b45f6cb SHA256 ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a
-EBUILD nss-3.13.5.ebuild 6808 RMD160 fe9c266908d8af2096f8612297c4c060f713ae8a SHA1 5965e1f44a56ec563876b1272b3b29135024d0aa SHA256 d92f341a73b8015967c9d91967815c1154b1cf7d794fbd9562ba31b4d293e558
+EBUILD nss-3.13.5.ebuild 6820 RMD160 493a73ac4d3d4351b6f7364aabf7c80e085dc6d4 SHA1 400302fd6b819b8d84ca40edd90816b5002f7331 SHA256 8c7e2c396e99ea2bdd0f88176aac5bd8ad8b97095e2cab43332e3cc07abbc9d8
diff --git a/dev-libs/nss/nss-3.13.5.ebuild b/dev-libs/nss/nss-3.13.5.ebuild
index cf5a9e4..3d41e1f 100644
--- a/dev-libs/nss/nss-3.13.5.ebuild
+++ b/dev-libs/nss/nss-3.13.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="utils"
DEPEND="virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2012-06-22 13:06 Jory Pratt
0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2012-06-22 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 73f61940588687b31f6861c1ddac37f767609291
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 13:05:58 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 13:05:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=73f61940
Fix keywords in nss/nspr
---
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/nspr-4.9.1-r1.ebuild | 4 ++--
dev-libs/nss/Manifest | 2 +-
dev-libs/nss/nss-3.13.5-r1.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 009784c..ef7301c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -10,4 +10,4 @@ AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
AUX nspr-4.9.1-x32.patch 1799 RMD160 3bd442b2be01d5031aac2340d0584359cc6f3cdc SHA1 d8772443f935e3ffa0dd6a8be89710ae81295dae SHA256 629e013fbe7968d69e3bb0ccd43a3538ce0b649e3238cca89daf84116acae446
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1-r1.ebuild 3695 RMD160 fed9c53ee5df774ac44f6c2a478c24c9f43707da SHA1 07d4f33295c04d4e848b2816c431933d1ab88229 SHA256 99e4490cffae470d6d948435b59ae27098870a35d046a0346842744b800c1a78
+EBUILD nspr-4.9.1-r1.ebuild 3698 RMD160 973f4db9bf307d78bbea0282c523cbd28ff52fd9 SHA1 cbdef5b02c74ded9ece6ad75d82ae33a8a8778e3 SHA256 3ea29134d0a928148e370cf8e04cc2673c67d7c50714455b51beef60cded3bce
diff --git a/dev-libs/nspr/nspr-4.9.1-r1.ebuild b/dev-libs/nspr/nspr-4.9.1-r1.ebuild
index de71a1a..3ba6659 100644
--- a/dev-libs/nspr/nspr-4.9.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.8.ebuild,v 1.1 2011/05/13 21:13:30 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r1.ebuild,v 1.1 2012/06/22 02:57:33 anarchy Exp $
EAPI=3
WANT_AUTOCONF="2.1"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 9f2c98e..bc7d066 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,4 +5,4 @@ AUX nss-3.13.5-x32.patch 2304 RMD160 2475d16741d39e74b91568d6a9208484cc7ba15a SH
DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb21 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e
DIST nss-3.13.3_pem.support 191571 RMD160 875a6ca4328f582cfb42ca8427144f9c4f7f185a SHA1 17701871db5ce22edd64f9f7076a51f2b64f9d11 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c
DIST nss-3.13.5.tar.gz 6087983 RMD160 208ef2bda665946f921d7907b1ff606131b9a9d4 SHA1 22cfe2cbccc93189699e6eed283eca288b45f6cb SHA256 ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a
-EBUILD nss-3.13.5-r1.ebuild 6934 RMD160 d766ec32688c8bb343cb88787a015febac18dc83 SHA1 6ccc104e81f751056491196ef139b9c703095bb7 SHA256 94b3077d8cbcbba255d4584f207afe66c04c65af5bfee0587e78a684399dd828
+EBUILD nss-3.13.5-r1.ebuild 6936 RMD160 c50950df839e3c008888c11824d5616dbeb8f38a SHA1 3d7531cbd55b05211cb0704d963aa31e67f28dfb SHA256 ea30c1c38e8a5851832b30a3e4e819490a895d00a7c1c2de7c1afbde5186d122
diff --git a/dev-libs/nss/nss-3.13.5-r1.ebuild b/dev-libs/nss/nss-3.13.5-r1.ebuild
index d043ee9..21b4c73 100644
--- a/dev-libs/nss/nss-3.13.5-r1.ebuild
+++ b/dev-libs/nss/nss-3.13.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="utils"
DEPEND="virtual/pkgconfig
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2013-02-05 22:05 Jory Pratt
0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2013-02-05 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 969d25306bd3738ffaed0a695c052e6c74a94433
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 22:05:05 2013 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 22:05:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=969d2530
Fix nss dep on nspr, add nspr-4.9.5
---
dev-libs/nspr/Manifest | 4 ++--
.../{nspr-4.9.4-r1.ebuild => nspr-4.9.5.ebuild} | 0
dev-libs/nss/Manifest | 2 +-
dev-libs/nss/nss-3.14.2.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 17547b9..06cd7cf 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -7,5 +7,5 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f3
AUX nspr-4.8.3-aix-soname.patch 1164 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa SHA512 8c82c281ebc3ffade81445bef28323a89199e47a95b7ec8351cf14dc441f71d1126f112d564431e6c73657ae2de0c7cbdc701ff133d7086fd970e6c61cd58add WHIRLPOOL 90dca0ac6ae7931468d5b3835e786a817deaae1c4021fb033f127dd9aabae42975bcc8c4ccb3ea7db713b3224ec90669179cbb71a8492910a5aa75e0f8d1beac
AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab SHA512 1c62eaea00c4eebe6885bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec9909d6754491dc7caa977203e6010623fef4d WHIRLPOOL 1f5674fe691d75dbf7b9549d58700fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978676c9a55d894b646e029f8ba7280
AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512 3c20019b5a378bc0cec1925c2324fc1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9072ea01283a6f671dcd26b049 WHIRLPOOL 695310cfd54140b2c333f0b6556d8c049441b246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b09862972a39df0cc00c7ca
-DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707
-EBUILD nspr-4.9.4-r1.ebuild 3975 SHA256 70c73749c64340dcb75c8915486cceb682a6d84fd5f7c86861da9ae952b7d252 SHA512 558689f724284f1fcfc135ca443257f2a50fd4ddfa6ca4c0a777e11846b21d1b96d71a20e51a860fc6065e2501a84f4ff079369ddc7c95859630236607095fe0 WHIRLPOOL 27408c962e1355219838c4c3dfb9e3f2c32f3e4bde70ec83351e4fcdfbf5da25e85a812565d4978f60a4d0da9f6e8f4361e511b8ae25a6f1dabfa6f026be057b
+DIST nspr-4.9.5.tar.gz 1156396 SHA256 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 SHA512 cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27 WHIRLPOOL d2792148805a99d1f2de919b57e48cfd03290b1f8faaec55d4374004574a578ed3fef110956fbb767a2f7f6d00cb9d594aa3a534e29df5790f3284c4fcea8b7b
+EBUILD nspr-4.9.5.ebuild 3975 SHA256 70c73749c64340dcb75c8915486cceb682a6d84fd5f7c86861da9ae952b7d252 SHA512 558689f724284f1fcfc135ca443257f2a50fd4ddfa6ca4c0a777e11846b21d1b96d71a20e51a860fc6065e2501a84f4ff079369ddc7c95859630236607095fe0 WHIRLPOOL 27408c962e1355219838c4c3dfb9e3f2c32f3e4bde70ec83351e4fcdfbf5da25e85a812565d4978f60a4d0da9f6e8f4361e511b8ae25a6f1dabfa6f026be057b
diff --git a/dev-libs/nspr/nspr-4.9.4-r1.ebuild b/dev-libs/nspr/nspr-4.9.5.ebuild
similarity index 100%
rename from dev-libs/nspr/nspr-4.9.4-r1.ebuild
rename to dev-libs/nspr/nspr-4.9.5.ebuild
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 659b6a3..cb9d283 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,4 +8,4 @@ DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad
DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5 SHA512 f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e WHIRLPOOL 8b292433ec764cfe857bd7cb25c216905b785c536176ece14571c9e7017a93c7a8562502645d71eed7da9f5cc52c65564c294a8a2b75ea43bda19049d6c393bb
DIST nss-3.14.2.tar.gz 6178419 SHA256 a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95 SHA512 65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137 WHIRLPOOL 71063478b5083e7cad64e06e84fc8a713c45b85ce9d6f0ad1af16c38b5cbb89779fd35c93813644a8d0c0c1e729805b957c44b6b0f7acf60c8032ed0eb98b4a9
EBUILD nss-3.14.1-r1.ebuild 8036 SHA256 3623df7d0a49c990a5180e6c964e2bc0c325dcab0ed157a5dfc662cdb2d641c1 SHA512 66472b0d4106b80af2455d97edf403be7722324b63cdf90e699b0a2067e8a9127548f5503d0ae413d69bae763c3f2a39210fbf1a46a7e14f8e60864846e87869 WHIRLPOOL 32f07ec3cc57c79508d74a9391fc9ac920255f6c51b1cd71f0d4e2984b954f98e348eaf68464c892c082e7238fc4928c5fd90f422d9b62ac6637c1c125752bdb
-EBUILD nss-3.14.2.ebuild 8081 SHA256 bb0477ab072b4e6601d7974c3c401e74f994ae7d1bdb3744a2b3cdcb8fdae622 SHA512 3e917597b4c07f41e47cc132446428416c4e1f6941ac0d76ed695c7fb51b13d0aace29174d4aacfa6c25d19f50628ea9e37c51120aff048422d11d937cf164ba WHIRLPOOL c826e91456fada4c8e0e00582cc1a2bfcbab1c3faf32d991d895bf95b494cf1bd1fc838241e94c79ea8fa69471d0b685e994090f4722afe10c6694c87da35c75
+EBUILD nss-3.14.2.ebuild 8081 SHA256 1eb0b25ffb7f3284b7dff580f37f5d97398148dec7c6e6f0fdf51b6bce875531 SHA512 b84cc1b8b5b3cfd84bed418eb89bf10ffa8ce72dca64a2d75c780d8dc6c760308dc9676315e9c59ec4cfbb89efef169bd8447bf24b088e5d7ab1ba014ea6eb1b WHIRLPOOL b3719a5e1763a486b839dd7bb1e70454543d1a0d54f39eda186c593f34a3cc8045148aa7f5e3e1d89dcf00ecd79837df41a6c690174a78a216c09058fc41990d
diff --git a/dev-libs/nss/nss-3.14.2.ebuild b/dev-libs/nss/nss-3.14.2.ebuild
index bffc85f..d889d43 100644
--- a/dev-libs/nss/nss-3.14.2.ebuild
+++ b/dev-libs/nss/nss-3.14.2.ebuild
@@ -5,7 +5,7 @@
EAPI=3
inherit eutils flag-o-matic multilib toolchain-funcs
-NSPR_VER="4.9.2"
+NSPR_VER="4.9.5"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2014-03-20 13:33 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2014-03-20 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 4e0cf74eaa8ef3249c0132954a93b5dbbfc326c0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 20 13:33:22 2014 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 20 13:33:22 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4e0cf74e
Synced with portage
---
dev-libs/nspr/nspr-4.10.4.ebuild | 14 +++++++-------
dev-libs/nss/nss-3.16.ebuild | 7 +++----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dev-libs/nspr/nspr-4.10.4.ebuild b/dev-libs/nspr/nspr-4.10.4.ebuild
index 93f225e..4a61b84 100644
--- a/dev-libs/nspr/nspr-4.10.4.ebuild
+++ b/dev-libs/nspr/nspr-4.10.4.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $
-EAPI=3
+EAPI=5
WANT_AUTOCONF="2.1"
inherit autotools eutils multilib toolchain-funcs versionator
@@ -74,22 +74,22 @@ src_configure() {
src_compile() {
cd "${S}"/build
- emake || die "failed to build"
+ emake
}
src_install() {
# Their build system is royally confusing, as usual
MINOR_VERSION=${MIN_PV} # Used for .so version
cd "${S}"/build
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
cd "${ED}"/usr/$(get_libdir)
einfo "removing static libraries as upstream has requested!"
- rm -f *.a || die "failed to remove static libraries."
+ rm *.a || die "failed to remove static libraries."
# install nspr-config
- dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
+ dobin "${S}"/build/config/nspr-config
# Remove stupid files in /usr/bin
- rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+ rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
}
diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild
index ccd6b92..eefa5e7 100644
--- a/dev-libs/nss/nss-3.16.ebuild
+++ b/dev-libs/nss/nss-3.16.ebuild
@@ -1,6 +1,6 @@
# 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.5.ebuild,v 1.1 2014/02/22 10:42:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.1 2014/03/20 13:32:21 polynomial-c Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -150,13 +150,12 @@ src_compile() {
XCFLAGS="${BUILD_CFLAGS}" \
emake -j1 -C coreconf \
CC="${BUILD_CC}" \
- $(nssbits BUILD_) \
- || die
+ $(nssbits BUILD_)
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
# Then build the target tools.
for d in . lib/dbm ; do
- emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed"
+ emake -j1 "${makeargs[@]}" -C ${d}
done
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2014-06-15 13:03 Ian Stakenvicius
0 siblings, 0 replies; 8+ messages in thread
From: Ian Stakenvicius @ 2014-06-15 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 9be11c2069a9c343291a6622005b11811cd33794
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 13:01:46 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 13:02:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=9be11c20
sync'ed nspr and nss ebuilds with updates from the portage tree
---
dev-libs/nspr/Manifest | 1 -
dev-libs/nspr/nspr-4.10.6-r1.ebuild | 18 ++++----
dev-libs/nspr/nspr-4.10.6.ebuild | 24 +++++++----
dev-libs/nss/nss-3.16-r1.ebuild | 86 ++++++++++++++++++++-----------------
4 files changed, 70 insertions(+), 59 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index e376918..f5a5b28 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,2 +1 @@
-DIST nspr-4.10.4.tar.gz 1107127 SHA256 eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838 SHA512 9aadd94473e840246b08b4377ac68ec8a1474997b7a08484993186843afdaca65157cf8797d8922f137d881a4df6fda66edc188ba579fdc6bba429571a701222 WHIRLPOOL b52435751f7cb131523d8aef27cc0b1400fe281a018f9f7370cb8d894920d71df49d37450ba057c381590998a81796221858d2f2f06597fd71c93082854717a9
DIST nspr-4.10.6.tar.gz 1131328 SHA256 df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a SHA512 a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d WHIRLPOOL 6f7f422f50343f177896d9243a9ae89878823e92ffd3511131546a32b3cf481c9af34f5fef43c8a7c1d5974fc0959e1fa06ddd67133034563e06128e50a6f1f2
diff --git a/dev-libs/nspr/nspr-4.10.6-r1.ebuild b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
index f874b0b..74ecfe0 100644
--- a/dev-libs/nspr/nspr-4.10.6-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.1 2014/06/13 14:19:49 axs Exp $
EAPI=5
WANT_AUTOCONF="2.5"
@@ -58,15 +58,15 @@ multilib_src_configure() {
case "${ABI}" in
x32) myconf+=" --enable-x32";;
s390x|*64) myconf+=" --enable-64bit";;
- default) # no abi actually set, figure it out the old way
+ default) # no abi actually set, fall back to old check
einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac ;;
+ echo > "${T}"/test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ esac ;;
*) ;;
esac
diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild
index 06d6929..305b273 100644
--- a/dev-libs/nspr/nspr-4.10.6.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.2 2014/06/13 16:14:10 zlogene Exp $
EAPI=5
WANT_AUTOCONF="2.5"
@@ -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 ~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"
+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() {
@@ -55,13 +55,13 @@ src_configure() {
local myconf
einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
+ echo > "${T}"/test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ esac
# Ancient autoconf needs help finding the right tools.
LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
@@ -73,7 +73,13 @@ src_configure() {
${myconf}
}
+src_compile() {
+ cd "${S}"/build || die
+ emake
+}
+
src_install() {
+ cd "${S}"/build
# Their build system is royally confusing, as usual
MINOR_VERSION=${MIN_PV} # Used for .so version
emake DESTDIR="${D}" install
diff --git a/dev-libs/nss/nss-3.16-r1.ebuild b/dev-libs/nss/nss-3.16-r1.ebuild
index 428c13c..50e7104 100644
--- a/dev-libs/nss/nss-3.16-r1.ebuild
+++ b/dev-libs/nss/nss-3.16-r1.ebuild
@@ -1,6 +1,6 @@
# 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.16.ebuild,v 1.1 2014/03/20 13:32:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16-r1.ebuild,v 1.1 2014/06/14 08:27:39 mgorny Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
@@ -22,14 +22,14 @@ SLOT="0"
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
+DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]
>=dev-libs/nspr-${NSPR_VER}"
RDEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5
- sys-libs/zlib
+ >=dev-db/sqlite-3.5[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
RESTRICT="test"
@@ -62,66 +62,73 @@ src_prepare() {
# modify install path
sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk
+ -i source.mk || die
# Respect LDFLAGS
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null
+ popd >/dev/null || die
# Fix pkgconfig file for Prefix
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile
+ config/Makefile || die
# use host shlibsign if need be #436216
if tc-is-cross-compiler ; then
sed -i \
-e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh
+ cmd/shlibsign/sign.sh || die
fi
# dirty hack
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk
+ lib/ssl/config.mk || die
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk
+ cmd/platlibs.mk || die
multilib_copy_sources
- abi_specific_src_prepare() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${BUILD_DIR}"/config/Makefile
- }
+ strip-flags
+}
- multilib_parallel_foreach_abi abi_specific_src_prepare
+multilib_src_configure() {
+ # Ensure we stay multilib aware
+ sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
}
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";;
- *) tc-arch ${t};;
+ aarch64*)echo "aarch64";;
+ hppa*) echo "parisc";;
+ i?86*) echo "i686";;
+ x86_64*) echo "x86_64";;
+ *) tc-arch ${t};;
esac
}
nssbits() {
- local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- echo > "${T}"/test.c || die
- ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ # use ABI first, this will work for most cases
+ case "${ABI}" in
+ alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+ n32) echo USE_N32=1;;
+ x32) echo USE_X32=1;;
+ s390x|*64) echo USE_64=1;;
+ default) # no abi actually set, fall back to old check
+ einfo "Running a short build test to determine 64bit'ness"
+ echo > "${T}"/test.c || die
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*) echo USE_X32=1;;
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ esac ;;
+ *) ;;
esac
}
multilib_src_compile() {
- strip-flags
-
tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
local makeargs=(
CC="${CC}"
@@ -240,7 +247,7 @@ multilib_src_install() {
insinto /usr/include/nss
doins public/nss/*.h
- popd >/dev/null
+ popd >/dev/null || die
local f nssutils
# Always enabled because we need it for chk generation.
@@ -261,7 +268,7 @@ multilib_src_install() {
for f in ${nssutils}; do
dobin ${f}
done
- popd >/dev/null
+ popd >/dev/null || die
fi
# Prelink breaks the CHK files. We don't have any reliable way to run
@@ -276,8 +283,7 @@ multilib_src_install() {
}
pkg_postinst() {
-
- abi_specific_pkg_postinst() {
+ multilib_pkg_postinst() {
# We must re-sign the libraries AFTER they are stripped.
local shlibsign="${EROOT}/usr/bin/shlibsign"
# See if we can execute it (cross-compiling & such). #436216
@@ -288,13 +294,13 @@ pkg_postinst() {
generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
}
- multilib_foreach_abi abi_specific_pkg_postinst
+ multilib_foreach_abi multilib_pkg_postinst
}
pkg_postrm() {
- abi_specific_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
+ multilib_pkg_postrm() {
+ cleanup_chk "${EROOT}"/usr/$(get_libdir)
}
- multilib_foreach_abi abi_specific_pkg_postrm
+ multilib_foreach_abi multilib_pkg_postrm
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/
@ 2014-07-05 9:21 Ian Stakenvicius
0 siblings, 0 replies; 8+ messages in thread
From: Ian Stakenvicius @ 2014-07-05 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 0d7b3f8482e4c7bb64fe37812e2e452173154e75
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 5 09:21:11 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Jul 5 09:21:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0d7b3f84
updated nss ebuild to match the tree, removed old nspr ebuild
---
dev-libs/nspr/nspr-4.10.4.ebuild | 95 --------
dev-libs/nss/Manifest | 1 -
.../nss/{nss-3.16-r1.ebuild => nss-3.16.1.ebuild} | 79 +++---
dev-libs/nss/nss-3.16.ebuild | 270 ---------------------
4 files changed, 43 insertions(+), 402 deletions(-)
diff --git a/dev-libs/nspr/nspr-4.10.4.ebuild b/dev-libs/nspr/nspr-4.10.4.ebuild
deleted file mode 100644
index 4a61b84..0000000
--- a/dev-libs/nspr/nspr-4.10.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.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"
-
-src_prepare() {
- mkdir build inst
- cd "${S}"/nspr/
- epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
- # epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.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
-
- # 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
-}
-
-src_configure() {
- cd "${S}"/build
-
- # 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
- echo > "${T}"/test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="../nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- ${myconf}
-}
-
-src_compile() {
- cd "${S}"/build
- emake
-}
-
-src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- cd "${S}"/build
- emake DESTDIR="${D}" install
-
- cd "${ED}"/usr/$(get_libdir)
- einfo "removing static libraries as upstream has requested!"
- rm *.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin "${S}"/build/config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 9fbe9cf..b75a965 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,3 @@
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
DIST nss-3.16.1.tar.gz 6409506 SHA256 fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e SHA512 ea70dd417d6491e2a2a43ce2576e16511c3c78b4683af61ee80458c08768045eeb2b5bc410e536e3c7ab3200b3e80008abb5c5b40f0eb93418b8f2813cba3b46 WHIRLPOOL 46c37623655a426a328e47197b15d945717ad24828008d65fee0027c7ae48fdfd1aef7e1a7e3adbe2f6e851fe462496a854092b4d7809d40b9474c66156f159b
-DIST nss-3.16.tar.gz 6378110 SHA256 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f WHIRLPOOL d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868
diff --git a/dev-libs/nss/nss-3.16-r1.ebuild b/dev-libs/nss/nss-3.16.1.ebuild
similarity index 82%
rename from dev-libs/nss/nss-3.16-r1.ebuild
rename to dev-libs/nss/nss-3.16.1.ebuild
index 50e7104..3899837 100644
--- a/dev-libs/nss/nss-3.16-r1.ebuild
+++ b/dev-libs/nss/nss-3.16.1.ebuild
@@ -1,11 +1,11 @@
# 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.16-r1.ebuild,v 1.1 2014/06/14 08:27:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.1.ebuild,v 1.2 2014/07/04 19:51:37 axs Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-NSPR_VER="4.10"
+NSPR_VER="4.10.6-r1"
RTM_NAME="NSS_${PV//./_}_RTM"
# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
@@ -22,13 +22,13 @@ SLOT="0"
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[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
@@ -108,41 +108,48 @@ nssarch() {
}
nssbits() {
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) echo USE_N32=1;;
- x32) echo USE_X32=1;;
- s390x|*64) echo USE_64=1;;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac ;;
- *) ;;
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ if [[ ${1} == BUILD_ ]]; then
+ cc=$(tc-getBUILD_CC)
+ else
+ cc=$(tc-getCC)
+ fi
+ echo > "${T}"/test.c || die
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+ case $(file "${T}/${1}test.o") in
+ *32-bit*x86-64*) echo USE_X32=1;;
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
esac
}
multilib_src_compile() {
- tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+ # use ABI to determine bit'ness, or fallback if unset
+ local buildbits mybits
+ case "${ABI}" in
+ n32) mybits="USE_N32=1";;
+ x32) mybits="USE_X32=1";;
+ s390x|*64) mybits="USE_64=1";;
+ default) mybits=$(nssbits);;
+ esac
+ # bitness of host may differ from target
+ if tc-is-cross-compiler; then
+ buildbits=$(nssbits BUILD_)
+ fi
+
local makeargs=(
- CC="${CC}"
- AR="${AR} rc \$@"
- RANLIB="${RANLIB}"
+ CC="$(tc-getCC)"
+ AR="$(tc-getAR) rc \$@"
+ RANLIB="$(tc-getRANLIB)"
OPTIMIZER=
- $(nssbits)
+ ${mybits}
)
# Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $(${PKG_CONFIG} nspr --cflags)"
- local myLDFLAGS="${LDFLAGS} $(${PKG_CONFIG} nspr --libs-only-L)"
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+ local myLDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) nspr --libs-only-L)"
unset NSPR_INCLUDE_DIR
- #export NSPR_LIB_DIR=${T}/fake-dir-${ABI} - do this further down now
# Do not let `uname` be used.
if use kernel_linux ; then
@@ -165,10 +172,10 @@ multilib_src_compile() {
# Build the host tools first.
LDFLAGS="${BUILD_LDFLAGS}" \
XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/${ABI}-fake-dir" \
+ NSPR_LIB_DIR="${T}/fake-dir" \
emake -j1 -C coreconf \
- CC="${BUILD_CC}" \
- $(nssbits BUILD_)
+ CC="$(tc-getBUILD_CC)" \
+ ${buildbits:-${mybits}}
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
# Then build the target tools.
diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild
deleted file mode 100644
index 3dadff6..0000000
--- a/dev-libs/nss/nss-3.16.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# 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.16.ebuild,v 1.1 2014/03/20 13:32:21 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
- 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 ~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"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-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"
- 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}/nss-3.14.2-solaris-gcc.patch"
- cd coreconf
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- "${S}"/config/Makefile
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- "${S}"/cmd/shlibsign/sign.sh
- fi
-
- # dirty hack
- cd "${S}"
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk
-}
-
-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";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- echo > "${T}"/test.c || die
- ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-src_compile() {
- strip-flags
-
- tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
- local makeargs=(
- CC="${CC}"
- AR="${AR} rc \$@"
- RANLIB="${RANLIB}"
- OPTIMIZER=
- $(nssbits)
- )
-
- # Take care of nspr settings #436216
- append-cppflags $(${PKG_CONFIG} nspr --cflags)
- append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
- unset NSPR_INCLUDE_DIR
- export NSPR_LIB_DIR=${T}/fake-dir
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
- export FREEBL_NO_DEPEND=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- emake -j1 -C coreconf \
- CC="${BUILD_CC}" \
- $(nssbits BUILD_)
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-src_install() {
- cd "${S}"/dist
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
- # We generate these after stripping the libraries, else they don't match.
- #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
- cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED}"/usr/bin
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.h
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils="shlibsign"
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
- cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
- nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
- pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
- symkeyutil tstclnt vfychain vfyserv"
- fi
- cd "${S}"/dist/*/bin/
- for f in ${nssutils}; do
- dobin ${f}
- done
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- local l libs=() liblist
- for l in ${NSS_CHK_SIGN_LIBS} ; do
- libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
- done
- liblist=$(printf '%s:' "${libs[@]}")
- echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
- doenvd "${T}/90nss"
-}
-
-pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-}
-
-pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-07-05 9:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 4:31 [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2014-07-05 9:21 Ian Stakenvicius
2014-06-15 13:03 Ian Stakenvicius
2014-03-20 13:33 Lars Wendler
2013-02-05 22:05 Jory Pratt
2012-06-22 13:06 Jory Pratt
2012-06-06 13:09 Jory Pratt
2011-08-27 22:41 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox