BUG=none
TEST=emerge-x86-generic -1v ecryptfs-utils
use pkg-config instead of nss-config/nspr-config.
nss-config/nspr-config doesn't handle SYSROOT or PKG_CONFIG_SYSROOT_DIR correctly.
Change-Id: Ib0fba4356bba9aaf669071e658e6ce0caf53baef
Review URL: http://codereview.chromium.org/3152035
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index fa788f2..c429bcb 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,6 +1,7 @@
+AUX pkgconfig.diff 531 RMD160 0e07b45170e1206bb8ccbaee4b4333fc923d02d0 SHA1 f7fc9a8ce18f51ed530ba1272875738d6363cf1c SHA256 b53da6b1ff6f39544abb1bcfce882617db023d13a20d48b6d5107c39d5714b45
DIST ecryptfs-utils_79.orig.tar.gz 519934 RMD160 4f61b0fc4febaa1d00fcc7dcf3b608a583207664 SHA1 e76756f29784637813c2f468d64501a1306dc968 SHA256 adf4f2fb128fe4e1b2fd7707dcbec08d7852d29be749fe3d96f8065e7f555e53
DIST ecryptfs-utils_82.orig.tar.gz 513756 RMD160 7368f6ca51c1bc351156522d5d908d246a2ecbea SHA1 ad22e25eeddbedcad27191efd893a150037224fc SHA256 4625130b308e219b93611b53ba4b55db722efcc2d014887ebee1dc7775e47af0
EBUILD ecryptfs-utils-79.ebuild 1748 RMD160 49bb8e1bb55a8f2a5d793749de1daccbb6ade027 SHA1 f62add8af053131646f6f0abb5b14add99e16e96 SHA256 4a9e6bf119f71e1903627d37c0fb2470d64a3be919bdc5f41308539db1a5246d
-EBUILD ecryptfs-utils-82.ebuild 3152 RMD160 ac23805414b62ac9ce819a0cde1406c104011b0e SHA1 e8421bf36b0485bb43a06e141c432148a3df1f6b SHA256 f14047682f41d795af5dde92470b2930f9b1ba9b5f0df55c419bc17602501e2e
+EBUILD ecryptfs-utils-82.ebuild 3195 RMD160 a662294be5d80484d318f4f5cab946d988268dff SHA1 1bba0fd208121a1bfa239f5650cbe70a6e74c0d9 SHA256 702620f6ae56bae2e5947162cb7ae69e9be634ce1f4f86f7a65441756ed00c1a
MISC ChangeLog 5224 RMD160 f3f5850d401ac75c701eb212bc5cfa6c4f9e1ff6 SHA1 77901e4b4dc20ee5713da8a3b3bdf20525b51bc8 SHA256 32d07c68963a2f3cb2af3c42ee3b50d81bfc8f857932d9690a14d237bba943ab
MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild
index a6be321..f106bf8 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild
@@ -5,7 +5,7 @@
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
-inherit flag-o-matic pam python
+inherit flag-o-matic pam python eutils
DESCRIPTION="eCryptfs userspace utilities"
HOMEPAGE="http://launchpad.net/ecryptfs"
@@ -41,6 +41,8 @@
src_prepare() {
# Python bindings are built/installed manually.
sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.{am,in} || die "sed failed"
+
+ epatch ${FILESDIR}/pkgconfig.diff
}
src_configure() {
diff --git a/sys-fs/ecryptfs-utils/files/pkgconfig.diff b/sys-fs/ecryptfs-utils/files/pkgconfig.diff
new file mode 100644
index 0000000..e346fd6
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/pkgconfig.diff
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 2de562f..f9d716d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,10 +228,10 @@ else
+ fi
+
+ #Verify nss
+-NSS_LIBS=`nss-config --libs`
++NSS_LIBS=`pkg-config --libs nss`
+ if test "x${NSS_LIBS}" != "x" ; then
+- NSS_CFLAGS=`nss-config --cflags`
+- NSPR_CFLAGS=`nspr-config --cflags`
++ NSS_CFLAGS=`pkg-config --cflags nss`
++ NSPR_CFLAGS=`pkg-config --cflags nspr`
+ NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS ${NSPR_CFLAGS}"
+ have_nss="yes"
+ else
