Use pkg-config to look up NSS. This allows a clean cross-compilation of the package.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 45 insertions, 13 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 43753efa20d0..d72813e3bf72 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.33 2011/08/24 18:01:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.34 2011/08/31 00:01:08 flameeyes Exp $
+
+  31 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  ecryptfs-utils-90.ebuild, +files/ecryptfs-utils-90-nss-pkgconfig.patch:
+  Use pkg-config to look up NSS. This allows a clean cross-compilation of the
+  package.
 
 *ecryptfs-utils-90 (24 Aug 2011)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 44dbf1d1ea29..9085d1562ee6 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX ecryptfs-utils-90-nss-pkgconfig.patch 749 RMD160 4ee1813a7be3136797b30136ae1d563ad71aa5d5 SHA1 2424dd9593fc235197f147b9253c3d1363c46199 SHA256 3b53374add6a03e70f1d42f886f05aff26a10e56d6abf5f11fa943f329bcdfc6
 DIST ecryptfs-utils_83.orig.tar.gz 548235 RMD160 898d755a5218283f444be0e296d33fcccaa0974b SHA1 ab82032679c60bfc702dc339b2c9d506ace0dc34 SHA256 ede721fa2dba9cb3dadf89e5a21c555be35fa031abd841073fcc6f92e3b29dee
 DIST ecryptfs-utils_85.orig.tar.gz 542835 RMD160 6d425b853f001c9a30b8c27b7999373e91ba08fe SHA1 d5ec70bbfccdf42ac0a44eda25bb0953391a4ff3 SHA256 4ca6c0a186d7bd5a37124cefb4aa15e321f11972a697db958fae76e8effa0afa
 DIST ecryptfs-utils_90.orig.tar.gz 569148 RMD160 210aa21c2fb43491c76fced9a8c684c0f393f9ef SHA1 6fbc83fa3d17e4e5d141040bac92b2139c134b78 SHA256 1cdce5ab1f46b58926826dd2f733b98a5b0449d36d43d40147da96fb749cac7e
 EBUILD ecryptfs-utils-83.ebuild 3463 RMD160 bbf5e5f11293320556f2d5858b677a78cf7dcf3c SHA1 8d6240149aadfde22f477246a7b4192c29bd55e5 SHA256 08ee191f9c9abdd8500ebc1fe76fafe845bba64b972f1cefe12065936f766bfe
 EBUILD ecryptfs-utils-85.ebuild 3472 RMD160 b0972a9d3904762059b62c95032499aafa58fcce SHA1 0c57516ee5396961fc56a3289fe8eaed4d8aba13 SHA256 ad73ee843032a0f575d41d76d717591ec03b38b872c2acdf1766223ba1357726
-EBUILD ecryptfs-utils-90.ebuild 3581 RMD160 a6bd7b82d9e46802c69f1639c88aa13b47ff9eda SHA1 9e3833aa3dede3693702157dc73a3cf836e64f04 SHA256 29249bea80ea32425f8cd7a28ee308c0cdddf65b2fde1bdd74aaa239c69efcdd
-MISC ChangeLog 6118 RMD160 d8b2ec7d610abbaa843518f68d6a4f521056a1d3 SHA1 3b13590bcfd387194c64b19a0101f0ce611a3c49 SHA256 2f0491cc1ec2e638765662e0de022910df86985ba02fbd3123961d952ccf51c3
+EBUILD ecryptfs-utils-90.ebuild 3652 RMD160 1029b8d4720e250b8a39c2d13c4b71537e80e1a1 SHA1 fe85fdc04cbc503629323b3ed8b5caf0d4e5f52f SHA256 7c202ac31f2917668f5fd6c13becb3659c50f18cfda389685df1f1fc2f6265ea
+MISC ChangeLog 6338 RMD160 78792d1c0cbf8d391ed38b8885b8465fcc7120a1 SHA1 11f48872e8ed455c9b7481e89b12686e26d2d8b3 SHA256 0f3639cd772450fdf98a00006e9a9a677a6285260d0a8f55f6df60646ba5271f
 MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOVTyYAAoJEEqz6FtPBkyj5ZkH/2DtUlTwnea1xNWkn9ePPQIq
-rl7Tn9+tSd6vEBsN4MMu+f8B4OuUAwKCtdItgps5P9icDirtXAXwT+xbU5eDHNM6
-0CVtaH5u8J820y2TKSgzD6pgMbLY94Y9rLCNi+GCEMndpKN24/K200poivrFthPy
-fyTS2ygyVY7e7JMbB2SQRw1WTeCsiVAfoouk9hS38iC9PrcjHO2zVqtBOfCmYiQ6
-hk4AvUXB8/PxMyYdf+SD+9gGTHvz+8eA3MK3TZMb0C+0WtL+y/SKJNcLHT+F6rlQ
-mmju8AUqNwfZX1LeKfHq5uVg7VCgK5u7XnBpzUN6PIVEOdbu4cY0/jC+rMLUj0s=
-=HI+A
+iEYEARECAAYFAk5debgACgkQAiZjviIA2XiL+gCfSl+vfFKqhCdwsGwJSGYIrrZ4
+mmgAnAxf1sEUbensZWQFD19prSijsMgf
+=+HAk
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
index 30bc41de9109..8b8f692340d0 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild,v 1.1 2011/08/24 18:01:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-90.ebuild,v 1.2 2011/08/31 00:01:08 flameeyes Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
 
-inherit flag-o-matic pam python linux-info
+inherit flag-o-matic pam python linux-info autotools
 
 DESCRIPTION="eCryptfs userspace utilities"
 HOMEPAGE="http://launchpad.net/ecryptfs"
@@ -50,6 +50,9 @@ src_prepare() {
 
 	# Python bindings are built/installed manually.
 	sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.{am,in} || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-nss-pkgconfig.patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch
new file mode 100644
index 000000000000..b132729ff616
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch
@@ -0,0 +1,27 @@
+Index: ecryptfs-utils-90/configure.ac
+===================================================================
+--- ecryptfs-utils-90.orig/configure.ac
++++ ecryptfs-utils-90/configure.ac
+@@ -228,16 +228,12 @@ else
+ fi
+ 
+ #Verify nss
+-NSS_LIBS=`nss-config --libs`
+-if test "x${NSS_LIBS}" != "x" ; then
+-        NSS_CFLAGS=`nss-config --cflags`
+-        NSPR_CFLAGS=`nspr-config --cflags`
+-        NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS ${NSPR_CFLAGS}"
+-        have_nss="yes"
+-else
+-        NSS_CFLAGS=""
+-        have_nss="no"
+-fi
++PKG_CHECK_MODULES(
++	[NSS],
++	[nss],
++        [have_nss="yes"
++	 NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS"],
++        [have_nss="no"])
+ 
+ if test "${enable_nss}" = "detect" ; then
+         if test "$have_nss" == "yes" ; then