From: Jory Pratt <anarchy@gentoo.org>
Date: Sun, 28 Mar 2010 14:49:55 +0000 (+0000)
Subject: Use official release media for completeness, fix bug #310149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d2a5e409200c5a12c32ed51cd5faaa25c52dfb7;p=gentoo.git

Use official release media for completeness, fix bug #310149
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index d5923fa0bf4e..4e2c40270834 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.173 2010/03/24 22:31:07 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.174 2010/03/28 14:49:55 anarchy Exp $
+
+*nss-3.12.6-r1 (28 Mar 2010)
+
+  28 Mar 2010; <anarchy@gentoo.org> -nss-3.12.6.ebuild,
+  +nss-3.12.6-r1.ebuild:
+  Use official release media for completeness, fix bug #310149
 
 *nss-3.12.6 (24 Mar 2010)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 39b5b7353ac0..892f86efcc91 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -19,7 +19,7 @@ DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04
 DIST nss-3.12.3.tar.bz2 4066954 RMD160 b5339eda9dfc87385b2c11e2ca53be249b75ed69 SHA1 eeca14a37629287baa10eb7562a5fb927e9dd171 SHA256 68152f9ad62b49c8860306a6056f5c42f1a66095749e97346a2c3001528075f4
 DIST nss-3.12.4.tar.gz 5412877 RMD160 4c451f5dd1c5205a6886a3c3abb014638f87395d SHA1 a152bf980f3a3dcf575c2d149fb279058ef2e757 SHA256 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
 DIST nss-3.12.5.tar.gz 5397000 RMD160 2592c4cf107d5de907c74b2e7ae260650be3c446 SHA1 ec12c6eddba5fb4609a174b079095b374935d37c SHA256 2980c292b8cb2248e3f29111bef9991ea2cf83b11f26635618b413f422af16b3
-DIST nss-3.12.6-gentoo.tar.bz2 4566061 RMD160 fe0ef92df87b60475f64621f7844dfe25e5bcf4d SHA1 7a80ce4dc8564c712dc79949605fe936a3359fa0 SHA256 cb27e5866a98e7ab09c85ace6e7d7d6a5c2fe739e502796b87df49c71c74b027
+DIST nss-3.12.6.tar.gz 5947630 RMD160 cb11e154730a12c72f684c6036fa6f27d10d2b60 SHA1 461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46 SHA256 8f9759be1ce928e82830923fde62a66e270c4645f10a4c176acfccb6021a9795
 EBUILD nss-3.11.9-r1.ebuild 4249 RMD160 b946376594976c29d73050af8bdb8887aa73b382 SHA1 17482607cc8b98e69ecff4735bbf276601f484ad SHA256 086b85d6e853f8cb058e3111a86f2de31525dad78df70a5e5143dd48cf786098
 EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SHA1 6167d30a4d42d690af15960438e318687ab95f8c SHA256 3362b29bcd69d539dd8a15b46d4681c43d63de07cb628679a002bd317a2cd849
 EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927
@@ -27,6 +27,6 @@ EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SH
 EBUILD nss-3.12.4-r2.ebuild 3797 RMD160 f9cc7d27298f953b5d70551c199432e48d933e5d SHA1 418b773d837571db4918cbbba8b5f43216b8db3f SHA256 cddf7ceebbd2077a5e1245d23db28a92c8ff3e7cb17eb0e3f148e0ad03e2df12
 EBUILD nss-3.12.5-r1.ebuild 3622 RMD160 07f36f9905c2114bf5a4c243131d7ded05b8f463 SHA1 a74cd74556ba145b0f596c52225eb8c47b2ab822 SHA256 289a533844552f8e3fc86fd8da60c20cef6b53cfc1bcf8c0ecc701c20a7e5a0e
 EBUILD nss-3.12.5.ebuild 3904 RMD160 4a482069bf56b343cbf3d56d6189d7f8e25f3fff SHA1 c7f5cbdf09b52ce188e9a90bb39de6eee33b1fa5 SHA256 b395fde2231f7373e67c51c3cc87f2db4bac2ebf396b2c65dba42612233c4f9d
-EBUILD nss-3.12.6.ebuild 3708 RMD160 76eb8d5a9ac11c2845046809dee0910327fd841d SHA1 7b5dcb1f8678800de25cd454dc74e51e06199266 SHA256 61e779dfb01b945a46cec7a2b862ec4717bef40322a10808f75ee7edd4cae41a
-MISC ChangeLog 21618 RMD160 0406cb9edafceabcdb8dd8c08bd752e839afe3c5 SHA1 9aa44732325a9fddd7a8961dfd348563ef596a2f SHA256 3f9e774481cfef9de8edb42ca3044788b850d0ad330ed9c57a1ea2c402ce7a29
+EBUILD nss-3.12.6-r1.ebuild 3614 RMD160 a44d382138338d087e5c34afbb10cd5aa6a52a40 SHA1 6bf0ce6a62d491b09634f8d08679527605187d87 SHA256 b196605c3e75301b2b7795c70fdccedeab98de50d9f9a8e7795ec046dbee9230
+MISC ChangeLog 21792 RMD160 beeb3fe827f16ec79d20813a14ad7bab3c57d32d SHA1 171fdca638390b16b3c43984b8546ff4512ae56e SHA256 18869d9bd74d7540ba2410bae0320020ddc8372682675233bb4d81e618d2b7dd
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
diff --git a/dev-libs/nss/nss-3.12.6.ebuild b/dev-libs/nss/nss-3.12.6-r1.ebuild
similarity index 90%
rename from dev-libs/nss/nss-3.12.6.ebuild
rename to dev-libs/nss/nss-3.12.6-r1.ebuild
index fbb526cac4a3..f7c4a6772545 100644
--- a/dev-libs/nss/nss-3.12.6.ebuild
+++ b/dev-libs/nss/nss-3.12.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.6.ebuild,v 1.1 2010/03/24 22:31:07 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.6-r1.ebuild,v 1.1 2010/03/28 14:49:55 anarchy Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -8,9 +8,7 @@ NSPR_VER="4.8.3-r2"
 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="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-SRC_URI="mirror://gentoo/${P}-gentoo.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"
@@ -47,7 +45,7 @@ src_compile() {
 	strip-flags
 
 	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
 	case $(file "${T}"/test.o) in
 	*64-bit*) export USE_64=1;;
 	*32-bit*) ;;