summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2020-05-24 19:23:00 +0200
committerCédric Krier <cedk@gentoo.org>2020-05-24 19:23:54 +0200
commit4005f7db3a9be036144792e24e1ab8446b52f3a2 (patch)
tree5fc9f10d36ab6b4ce44e01014a1848a065e4dc65 /app-misc/abook
parentsys-devel/crossdev: stable for ALLARCHES (diff)
downloadgentoo-4005f7db3a9be036144792e24e1ab8446b52f3a2.tar.gz
gentoo-4005f7db3a9be036144792e24e1ab8446b52f3a2.tar.bz2
gentoo-4005f7db3a9be036144792e24e1ab8446b52f3a2.zip
app-misc/abook: Fix link to tinfo and vformat
Closes: https://bugs.gentoo.org/679322 Bug: https://bugs.gentoo.org/699968 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Cédric Krier <cedk@gentoo.org>
Diffstat (limited to 'app-misc/abook')
-rw-r--r--app-misc/abook/abook-0.6.1-r2.ebuild (renamed from app-misc/abook/abook-0.6.1-r1.ebuild)3
-rw-r--r--app-misc/abook/files/abook-0.6.1-tinfo.patch4
-rw-r--r--app-misc/abook/files/abook-0.6.1-vformat.patch11
-rw-r--r--app-misc/abook/metadata.xml4
4 files changed, 18 insertions, 4 deletions
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
index 37e0289c6c32..787ecf2af568 100644
--- a/app-misc/abook/abook-0.6.1-r1.ebuild
+++ b/app-misc/abook/abook-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}"
DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
PATCHES=(
"${FILESDIR}"/${PN}-0.6.1-tinfo.patch
+ "${FILESDIR}"/${PN}-0.6.1-vformat.patch
)
src_prepare() {
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
index e8c4585dbcb4..3c12032932f1 100644
--- a/app-misc/abook/files/abook-0.6.1-tinfo.patch
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch
@@ -4,7 +4,7 @@
AC_CHECK_LIB(ncursesw, initscr,
[LIBS="$LIBS -lncursesw"
-+ AC_SEARCH_LIBS(cbreak, tinfo)
++ AC_SEARCH_LIBS(cbreak, tinfow, LIBS="$LIBS -ltinfow")
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
fi
@@ -12,7 +12,7 @@
ac_widec_possible=no
AC_CHECK_LIB(ncurses, initscr,
[LIBS="$LIBS -lncurses"
-+ AC_SEARCH_LIBS(cbreak, tinfo)
++ AC_SEARCH_LIBS(cbreak, tinfo, LIBS="$LIBS -ltinfo")
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
fi
diff --git a/app-misc/abook/files/abook-0.6.1-vformat.patch b/app-misc/abook/files/abook-0.6.1-vformat.patch
new file mode 100644
index 000000000000..0808852e6b20
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-vformat.patch
@@ -0,0 +1,11 @@
+diff -ru abook-0.6.1.orig/configure.ac abook-0.6.1/configure.ac
+--- abook-0.6.1.orig/configure.ac 2020-05-24 19:10:09.826143646 +0200
++++ abook-0.6.1/configure.ac 2020-05-24 19:10:52.088381318 +0200
+@@ -140,6 +140,7 @@
+ if test x$vformat = xtrue; then
+ AC_CHECK_HEADER([vf_iface.h], [
+ AC_CHECK_LIB([vformat], [vf_read_file], [
++ LIBS="$LIBS -lvformat"
+ MODULES="$MODULES m_vcf"
+ AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available])
+ have_vformat=yes
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index d55809e38444..164d4e3717bc 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>cedk@gentoo.org</email>
+ </maintainer>
<longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription>
<upstream>
<remote-id type="sourceforge">abook</remote-id>