[app-crypt/pinentry] Sync with portage and add missing patches (bug 528060).

Package-Manager: portage-2.2.14

3 files changed, 48 insertions, 5 deletions

diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
new file mode 100644
index 00000000..3bb92c63
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
@@ -0,0 +1,25 @@
+From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 5 May 2013 02:23:08 +0300
+Subject: [PATCH] ncurses: link with optional tinfo
+
+---
+ m4/curses.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/curses.m4 b/m4/curses.m4
+index 3a01881..ffb6bd1 100644
+--- a/m4/curses.m4
++++ b/m4/curses.m4
+@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
+       have_ncursesw=no
+     fi
+     if test "$LIBNCURSES"; then
++      AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
++        AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
+       # Use ncurses header files instead of the ordinary ones, if possible;
+       # is there a better way of doing this, that avoids looking in specific
+       # directories?
+-- 
+1.8.1.5
+
diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch b/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch
new file mode 100644
index 00000000..f036fa93
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch
@@ -0,0 +1,20 @@
+--- doc/gpl.texi	2013-06-09 10:50:53.990704797 +1200
++++ doc/gpl.texi	2013-06-09 10:51:25.310432565 +1200
+@@ -12,7 +12,7 @@
+ of this license document, but changing it is not allowed.
+ @end display
+ 
+-@appendixsubsec Preamble
++@appendixsec Preamble
+ 
+   The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+@@ -63,7 +63,7 @@
+ modification follow.
+ 
+ @iftex
+-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++@appendixsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ @end iftex
+ @ifinfo
+ @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
diff --git a/app-crypt/pinentry/pinentry-9999.ebuild b/app-crypt/pinentry/pinentry-9999.ebuild
index 3399b9be..0b7f995c 100644
--- a/app-crypt/pinentry/pinentry-9999.ebuild
+++ b/app-crypt/pinentry/pinentry-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.3.ebuild,v 1.5 2014/04/03 19:40:59 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.4.ebuild,v 1.1 2014/10/08 06:39:06 alonbl Exp $
 
 EAPI=5
 
@@ -47,7 +47,6 @@ src_prepare() {
 	fi
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
 	epatch "${FILESDIR}/${PN}-0.8.2-texi.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
 }
 
@@ -64,11 +63,10 @@ src_configure() {
 	export QTLIB="${QTDIR}/$(get_libdir)"
 
 	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
-		$(use_enable gtk pinentry-gtk2) \
 		--disable-pinentry-qt \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable qt4 pinentry-qt4) \