use nspr-config to determine includes/libdir

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 4e2c402708341c86fa91aca41a239270aa2b5d5f..23059dba42bc00a60f06c04563cef84849fcd08d 100644 (file)
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,9 @@
 # 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.174 2010/03/28 14:49:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.175 2010/04/08 15:28:38 anarchy Exp $
+
+  08 Apr 2010; <anarchy@gentoo.org> nss-3.12.6-r1.ebuild:
+  use nspr-config to determine includes/libdir
 
 *nss-3.12.6-r1 (28 Mar 2010)
 

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 892f86efcc91de82a5129d79314e26378d839f9a..229e073ee6078207f245157147d9fdaf55be58f4 100644 (file)
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -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-r1.ebuild 3614 RMD160 a44d382138338d087e5c34afbb10cd5aa6a52a40 SHA1 6bf0ce6a62d491b09634f8d08679527605187d87 SHA256 b196605c3e75301b2b7795c70fdccedeab98de50d9f9a8e7795ec046dbee9230
-MISC ChangeLog 21792 RMD160 beeb3fe827f16ec79d20813a14ad7bab3c57d32d SHA1 171fdca638390b16b3c43984b8546ff4512ae56e SHA256 18869d9bd74d7540ba2410bae0320020ddc8372682675233bb4d81e618d2b7dd
+EBUILD nss-3.12.6-r1.ebuild 3489 RMD160 da8286ae4f780b6d3dfaa9081caddd255fe3e7d5 SHA1 19bf86d8c1a1b67ffcd9ff33442bfd784df6649b SHA256 c62d0ea49fa879ea223f1e7aa5df4e0aae05acae39a4f4214028a1786640a7bd
+MISC ChangeLog 21898 RMD160 5e419e70c3e5a84d357df7815dd6c434008fbb12 SHA1 88083ea9b666cfca7268d4291112bec6e3c3fd52 SHA256 c3ef6bc4c4d59337b5cd860a81c05be6bb21da521b873dfc830779bf19299aeb
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4

diff --git a/dev-libs/nss/nss-3.12.6-r1.ebuild b/dev-libs/nss/nss-3.12.6-r1.ebuild
index f7c4a67725452190c9dd407bbbafcec334e1c49a..73951f5f71e93e3a74c66e54d000b75dab3280e8 100644 (file)
--- a/dev-libs/nss/nss-3.12.6-r1.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-r1.ebuild,v 1.1 2010/03/28 14:49:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.6-r1.ebuild,v 1.2 2010/04/08 15:28:38 anarchy Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -52,10 +52,8 @@ src_compile() {
        *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
        esac
 
-       export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-       export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-       export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-       export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
+       export NSPR_INCLUDE_DIR=`nspr-config --includedir`
+       export NSPR_LIB_DIR=`nspr-config --libdir'`
        export BUILD_OPT=1
        export NSS_USE_SYSTEM_SQLITE=1
        export NSDISTMODE=copy