From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 12 Apr 2016 13:40:11 +0000 (+0200)
Subject: app-backup/dar: Fixed eautoreconf call w/o gpgme (bug #579698).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=445016ab8d665040b856306607092bad42a9b37f;p=gentoo.git

app-backup/dar: Fixed eautoreconf call w/o gpgme (bug #579698).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---

diff --git a/app-backup/dar/dar-2.5.3.ebuild b/app-backup/dar/dar-2.5.3.ebuild
index c07f10ec3077..bd88d9d31039 100644
--- a/app-backup/dar/dar-2.5.3.ebuild
+++ b/app-backup/dar/dar-2.5.3.ebuild
@@ -39,7 +39,10 @@ REQUIRED_USE="?? ( dar32 dar64 )
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
 
-PATCHES=( "${FILESDIR}/${PN}-2.5.3-asneeded.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.3-asneeded.patch"
+	"${FILESDIR}/${PN}-2.5.3-autoconf_missing_gpgme.patch" # 579698
+)
 
 src_prepare() {
 	default
diff --git a/app-backup/dar/files/dar-2.5.3-autoconf_missing_gpgme.patch b/app-backup/dar/files/dar-2.5.3-autoconf_missing_gpgme.patch
new file mode 100644
index 000000000000..9590b555e069
--- /dev/null
+++ b/app-backup/dar/files/dar-2.5.3-autoconf_missing_gpgme.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/579698
+
+--- dar-2.5.3/configure.ac
++++ dar-2.5.3/configure.ac
+@@ -1049,7 +1049,8 @@
+ 		  if test $local_crypto != no ; then
+   		    gpgme_min_version="1.2.0"
+ 		    AC_DEFINE_UNQUOTED(GPGME_MIN_VERSION, "$gpgme_min_version", [minimum version expected of GPGME])
+-		    AM_PATH_GPGME($gpgme_min_version,
++		    m4_ifdef([AM_PATH_GPGME], [
++			AM_PATH_GPGME($gpgme_min_version,
+ 		      		[
+ 				  CPPFLAGS___cache="$CPPFLAGS"
+ 				  CPPFLAGS="$GPGME_CFLAGS $CPPFLAGS"
+@@ -1084,7 +1085,8 @@
+ 				  unset LDFLAGS___cache
+ 				],
+ 				[]
+-			       )
++			)
++		    ])
+                  else
+ 		    AC_MSG_WARN([Public key support (GPGME linking) requires libgcrypt (strong encryption support)])
+                  fi