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

["Jory Pratt" <anarchy@gentoo.org>]

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"