Fix locate gpgme issue, bug#199779

Package-Manager: portage-2.1.3.19

4 files changed, 69 insertions, 10 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 3cacec4893d8..3c83ba213cbe 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.10 2007/11/10 17:12:44 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.11 2007/11/20 18:17:32 alonbl Exp $
+
+  20 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/ecryptfs-utils-30-gpgme.patch, ecryptfs-utils-30.ebuild:
+  Fix locate gpgme issue, bug#199779
 
   10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
   Add crypto as maintainer
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index df34203ff84e..5fee7f0e2c5d 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,12 +1,16 @@
+AUX ecryptfs-utils-30-gpgme.patch 1545 RMD160 04490c451e735e39871e3f18d47aabf7d8aa0aca SHA1 962fee3565823593e855b7fc65af4e661f2bbc58 SHA256 68768f43401fe5d3925bdebb2ff397111c3159bfb6b42e8e92b480251e335738
+MD5 d6b584867e67d9d7b8fd7922ebbe30a6 files/ecryptfs-utils-30-gpgme.patch 1545
+RMD160 04490c451e735e39871e3f18d47aabf7d8aa0aca files/ecryptfs-utils-30-gpgme.patch 1545
+SHA256 68768f43401fe5d3925bdebb2ff397111c3159bfb6b42e8e92b480251e335738 files/ecryptfs-utils-30-gpgme.patch 1545
 DIST ecryptfs-utils-30.tar.bz2 956890 RMD160 7d25d59692f883eb6e2bd730c901423370117a38 SHA1 685c7ab17fddbd1a4d96317fe91ea0f6d6483014 SHA256 a2bd95ae5b3887ef6114e51f2d073d47335194fd3afee0da5c33b57473073314
-EBUILD ecryptfs-utils-30.ebuild 1202 RMD160 ab0661b6f47b476cd3639fcb05d0b8cf8b45c82e SHA1 da9d98baae30aaaf71add47efde6ff00f2ad1dde SHA256 99410e09f00ebbbcd5059d65b6eb9baf12fea4cd073419d8e73cc1f7f12050b6
-MD5 06508aeadb9849abed10a2f1a831ed6b ecryptfs-utils-30.ebuild 1202
-RMD160 ab0661b6f47b476cd3639fcb05d0b8cf8b45c82e ecryptfs-utils-30.ebuild 1202
-SHA256 99410e09f00ebbbcd5059d65b6eb9baf12fea4cd073419d8e73cc1f7f12050b6 ecryptfs-utils-30.ebuild 1202
-MISC ChangeLog 1854 RMD160 8e18196105c073a2d809311ee740265ddeed2be6 SHA1 5d12a09c1612a9aa6ebacdea7aee5b1a1a0e3570 SHA256 67704a9a09a9d36caa24ef3a4da0dc8900e61b90383f8273469fc2b7441b5587
-MD5 6cd8e639704a85e00edee862ceea17cf ChangeLog 1854
-RMD160 8e18196105c073a2d809311ee740265ddeed2be6 ChangeLog 1854
-SHA256 67704a9a09a9d36caa24ef3a4da0dc8900e61b90383f8273469fc2b7441b5587 ChangeLog 1854
+EBUILD ecryptfs-utils-30.ebuild 1238 RMD160 afa873441a8c09a1541b949729e7dad58b81c609 SHA1 15d145ed182f1fe15aa1cde5158cef13ed780eeb SHA256 5609a756729c6e1e7ccd746c6a4073e5ef329d9daafadcaf6429d15a9309d347
+MD5 9f280605bc860dd3c4f26cc7ae2fc3ed ecryptfs-utils-30.ebuild 1238
+RMD160 afa873441a8c09a1541b949729e7dad58b81c609 ecryptfs-utils-30.ebuild 1238
+SHA256 5609a756729c6e1e7ccd746c6a4073e5ef329d9daafadcaf6429d15a9309d347 ecryptfs-utils-30.ebuild 1238
+MISC ChangeLog 2006 RMD160 6c7ad91a81ada3b4e53809019af379cd0f1fbd27 SHA1 6c690177beeddd307ac80134c62abe8f9fc44326 SHA256 d8e059c39d38109016f820eaa7f8c786641f983eff5712d70130799a5461903a
+MD5 30b5ae89866f47050bb9f780e8f37e80 ChangeLog 2006
+RMD160 6c7ad91a81ada3b4e53809019af379cd0f1fbd27 ChangeLog 2006
+SHA256 d8e059c39d38109016f820eaa7f8c786641f983eff5712d70130799a5461903a ChangeLog 2006
 MISC metadata.xml 355 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf SHA1 ffba9e7b0465df8b8ca111de7ee3b3f763c1b45e SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee
 MD5 1c8677910988959bdc24fbca34b9f94a metadata.xml 355
 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf metadata.xml 355
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
index 19b8803548eb..224614bf8859 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.2 2007/11/11 06:29:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.3 2007/11/20 18:17:32 alonbl Exp $
 
 inherit autotools
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-gpgme.patch"
 	# Until upstream move to autoconf-2.60
 	eautoreconf
 }
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch
new file mode 100644
index 000000000000..3b351a124dab
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index 6778105..ba6484d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,6 +93,13 @@ AC_ARG_ENABLE(
+ )
+ 
+ AC_ARG_WITH(
++	[gpgme-prefix],
++	[AC_HELP_STRING([--with-gpgme-prefix=PATH], [Specify the directory where gpgme install, default /usr])],
++	,
++	[with_gpgme_prefix="/usr"]
++)
++
++AC_ARG_WITH(
+ 	[pamdir],
+ 	[AC_HELP_STRING([--with-pamdir=PATH], [Specify the directory where PAM modules are stored])],
+ 	[pamdir="${withval}"],
+@@ -233,15 +240,13 @@ if test "${enable_tspi}" = "yes" ; then
+ fi
+ 
+ if test "${enable_gpg}" = "yes" ; then
+-	if test -z "${GPGME_LIBS}"; then
+-		AC_ARG_VAR([GPGME_CFLAGS], [C compiler flags for gpg])
+-		AC_ARG_VAR([GPGME_LIBS], [linker flags for gpg])
+-		AC_CHECK_LIB(
+-			[gpgme],
+-			[gpgme_new],
+-			[GPGME_LIBS="-lgpgme"],
+-			[AC_MSG_ERROR([Cannot find gpgme])]
+-		)
++	AC_MSG_CHECKING([for gpgme])
++	if ! test -x "${with_gpgme_prefix}/bin/gpgme-config"; then
++		AC_MSG_ERROR([Cannot locate gpgme])
++	else
++		AC_MSG_RESULT([found])
++		GPGME_CFLAGS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --cflags`"
++		GPGME_LIBS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --libs`"
+ 	fi
+ fi
+ 
+@@ -280,6 +285,8 @@ AC_SUBST([pamlibdir])
+ AC_SUBST([pkgconfigdir])
+ AC_SUBST([rootsbindir])
+ AC_SUBST([ecryptfskeymoddir])
++AC_SUBST([GPGME_CFLAGS])
++AC_SUBST([GPGME_LIBS])
+ AM_CONDITIONAL([BUILD_OPENSSL], [test "${enable_openssl}" = "yes"])
+ AM_CONDITIONAL([BUILD_PKCS11_HELPER], [test "${enable_pkcs11_helper}" = "yes"])
+ AM_CONDITIONAL([BUILD_TSPI], [test "${enable_tspi}" = "yes"])