diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2013-05-05 11:13:14 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2013-05-05 11:13:14 +0000 |
| commit | 140881675201ff214e5f58621bb3e89e13e1ef7d (patch) | |
| tree | 8812195c9ee1b2e19abd4744d96a914d8fad2168 /app-crypt/pinentry | |
| parent | Drop obsolete mask entries (diff) | |
| download | gentoo-2-140881675201ff214e5f58621bb3e89e13e1ef7d.tar.gz gentoo-2-140881675201ff214e5f58621bb3e89e13e1ef7d.tar.bz2 gentoo-2-140881675201ff214e5f58621bb3e89e13e1ef7d.zip | |
support sys-libs/ncurses[tinfo], per bug#468430
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'app-crypt/pinentry')
| -rw-r--r-- | app-crypt/pinentry/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch | 25 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-0.8.2.ebuild | 7 |
3 files changed, 35 insertions, 3 deletions
diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog index a378f1b92d1d..3f94a7e26fe3 100644 --- a/app-crypt/pinentry/ChangeLog +++ b/app-crypt/pinentry/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/pinentry # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.143 2013/03/02 19:15:26 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.144 2013/05/05 11:13:14 alonbl Exp $ + + 05 May 2013; Alon Bar-Lev <alonbl@gentoo.org> + +files/pinentry-0.8.2-ncurses.patch, pinentry-0.8.2.ebuild: + support sys-libs/ncurses[tinfo], per bug#468430 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> pinentry-0.8.1.ebuild, pinentry-0.8.2.ebuild: 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 000000000000..3bb92c63d00c --- /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/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.2.ebuild index a490e07afff2..75d75305161e 100644 --- a/app-crypt/pinentry/pinentry-0.8.2.ebuild +++ b/app-crypt/pinentry/pinentry-0.8.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.15 2013/03/02 19:15:26 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.16 2013/05/05 11:13:14 alonbl Exp $ EAPI=5 -inherit multilib eutils flag-o-matic +inherit autotools multilib eutils flag-o-matic DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" HOMEPAGE="http://gnupg.org/aegypten2/index.html" @@ -43,6 +43,9 @@ src_prepare() { "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die done fi + epatch "${FILESDIR}/${P}-ncurses.patch" + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + eautoreconf } src_configure() { |