1 |
commit: 4005f7db3a9be036144792e24e1ab8446b52f3a2 |
2 |
Author: Cédric Krier <cedk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 24 17:23:00 2020 +0000 |
4 |
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 24 17:23:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4005f7db |
7 |
|
8 |
app-misc/abook: Fix link to tinfo and vformat |
9 |
|
10 |
Closes: https://bugs.gentoo.org/679322 |
11 |
Bug: https://bugs.gentoo.org/699968 |
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> |
14 |
|
15 |
.../abook/{abook-0.6.1-r1.ebuild => abook-0.6.1-r2.ebuild} | 3 ++- |
16 |
app-misc/abook/files/abook-0.6.1-tinfo.patch | 4 ++-- |
17 |
app-misc/abook/files/abook-0.6.1-vformat.patch | 11 +++++++++++ |
18 |
app-misc/abook/metadata.xml | 4 +++- |
19 |
4 files changed, 18 insertions(+), 4 deletions(-) |
20 |
|
21 |
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild |
22 |
similarity index 92% |
23 |
rename from app-misc/abook/abook-0.6.1-r1.ebuild |
24 |
rename to app-misc/abook/abook-0.6.1-r2.ebuild |
25 |
index 37e0289c6c3..787ecf2af56 100644 |
26 |
--- a/app-misc/abook/abook-0.6.1-r1.ebuild |
27 |
+++ b/app-misc/abook/abook-0.6.1-r2.ebuild |
28 |
@@ -1,4 +1,4 @@ |
29 |
-# Copyright 1999-2018 Gentoo Foundation |
30 |
+# Copyright 1999-2020 Gentoo Authors |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI=6 |
34 |
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}" |
35 |
DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc ) |
36 |
PATCHES=( |
37 |
"${FILESDIR}"/${PN}-0.6.1-tinfo.patch |
38 |
+ "${FILESDIR}"/${PN}-0.6.1-vformat.patch |
39 |
) |
40 |
|
41 |
src_prepare() { |
42 |
|
43 |
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch |
44 |
index e8c4585dbcb..3c12032932f 100644 |
45 |
--- a/app-misc/abook/files/abook-0.6.1-tinfo.patch |
46 |
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch |
47 |
@@ -4,7 +4,7 @@ |
48 |
|
49 |
AC_CHECK_LIB(ncursesw, initscr, |
50 |
[LIBS="$LIBS -lncursesw" |
51 |
-+ AC_SEARCH_LIBS(cbreak, tinfo) |
52 |
++ AC_SEARCH_LIBS(cbreak, tinfow, LIBS="$LIBS -ltinfow") |
53 |
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then |
54 |
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
55 |
fi |
56 |
@@ -12,7 +12,7 @@ |
57 |
ac_widec_possible=no |
58 |
AC_CHECK_LIB(ncurses, initscr, |
59 |
[LIBS="$LIBS -lncurses" |
60 |
-+ AC_SEARCH_LIBS(cbreak, tinfo) |
61 |
++ AC_SEARCH_LIBS(cbreak, tinfo, LIBS="$LIBS -ltinfo") |
62 |
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then |
63 |
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" |
64 |
fi |
65 |
|
66 |
diff --git a/app-misc/abook/files/abook-0.6.1-vformat.patch b/app-misc/abook/files/abook-0.6.1-vformat.patch |
67 |
new file mode 100644 |
68 |
index 00000000000..0808852e6b2 |
69 |
--- /dev/null |
70 |
+++ b/app-misc/abook/files/abook-0.6.1-vformat.patch |
71 |
@@ -0,0 +1,11 @@ |
72 |
+diff -ru abook-0.6.1.orig/configure.ac abook-0.6.1/configure.ac |
73 |
+--- abook-0.6.1.orig/configure.ac 2020-05-24 19:10:09.826143646 +0200 |
74 |
++++ abook-0.6.1/configure.ac 2020-05-24 19:10:52.088381318 +0200 |
75 |
+@@ -140,6 +140,7 @@ |
76 |
+ if test x$vformat = xtrue; then |
77 |
+ AC_CHECK_HEADER([vf_iface.h], [ |
78 |
+ AC_CHECK_LIB([vformat], [vf_read_file], [ |
79 |
++ LIBS="$LIBS -lvformat" |
80 |
+ MODULES="$MODULES m_vcf" |
81 |
+ AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available]) |
82 |
+ have_vformat=yes |
83 |
|
84 |
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml |
85 |
index d55809e3844..164d4e3717b 100644 |
86 |
--- a/app-misc/abook/metadata.xml |
87 |
+++ b/app-misc/abook/metadata.xml |
88 |
@@ -1,7 +1,9 @@ |
89 |
<?xml version="1.0" encoding="UTF-8"?> |
90 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
91 |
<pkgmetadata> |
92 |
- <!-- maintainer-needed --> |
93 |
+ <maintainer type="person"> |
94 |
+ <email>cedk@g.o</email> |
95 |
+ </maintainer> |
96 |
<longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription> |
97 |
<upstream> |
98 |
<remote-id type="sourceforge">abook</remote-id> |