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>

diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
similarity index 92%
rename from app-misc/abook/abook-0.6.1-r1.ebuild
rename to app-misc/abook/abook-0.6.1-r2.ebuild
index 37e0289c6c32cd23c9813dba746ffb969e8186f7..787ecf2af568e617309fa949857464c9b0635b4b 100644 (file)
--- 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 e8c4585dbcb4e2f2b0eec9590bff49e2c1926a04..3c12032932f16f61b288eabada710f4f45d796dd 100644 (file)
--- 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 (file)
index 0000000..0808852
--- /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 d55809e38444e0a4e15498244a26c606b2f615f6..164d4e3717bce5f3bea34e691ccca1b011f859cd 100644 (file)
--- 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>