From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 20 Jun 2021 14:45:01 +0100
Subject: gentoo resync : 20.06.2021
---
app-misc/abook/Manifest | 7 +--
app-misc/abook/abook-0.6.1-r2.ebuild | 54 --------------------
app-misc/abook/abook-0.6.1-r3.ebuild | 58 ++++++++++++++++++++++
app-misc/abook/files/abook-0.6.1-tinfo.patch | 18 -------
...k-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch | 44 ++++++++++++++++
.../abook-0.6.1-use-newer-macro-for-readline.patch | 31 ++++++++++++
app-misc/abook/files/abook-0.6.1-vformat.patch | 5 +-
7 files changed, 139 insertions(+), 78 deletions(-)
delete mode 100644 app-misc/abook/abook-0.6.1-r2.ebuild
create mode 100644 app-misc/abook/abook-0.6.1-r3.ebuild
delete mode 100644 app-misc/abook/files/abook-0.6.1-tinfo.patch
create mode 100644 app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
create mode 100644 app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
(limited to 'app-misc/abook')
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index 2d4e90e19268..bc15ba97a718 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,5 +1,6 @@
-AUX abook-0.6.1-tinfo.patch 577 BLAKE2B fb012f1baf2ae0915e797c9f6d506d3c636370e5d112031ea163b076cfdbdd5d5eba080c210b552af426fdbc60c1841c9fefb2aa8779e1d829c3382f9231ba2d SHA512 0c7e657f67749e05aa2710e65ceadd8960a842f4029231298458446c9286945d0c6d89e837020a90e1f1ddc20ebee205469eb1355416d3d98e13fe9341007a99
-AUX abook-0.6.1-vformat.patch 497 BLAKE2B 7f3c57b05048be59f4037416a3df8c0e3a5ac3661e59c1f1f9afb86756de7852208b565aa40f5342f9bb4e4fb10efe4aaeca90ec4b6e5c1b38b487c8493053e6 SHA512 7073146a80bedcb7bc447d741028dcffd47ce60007b4b276438fb6437e19243f3a088b99ba9da96d2ac1b64b3d0f265613aa9d0426b5c03f57fd4c834544c247
+AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1281 BLAKE2B d7de2b1609eaaae6ac9c993265d69faa41754b440b95da001622ea9a0033dbf93bc1d052561efc8ac580b6853b2314c061ad8331a83e1d08f6ae9d962cd5d384 SHA512 96be977b0c4bb22e580d8b2e4ecb2741dc0e45dbcd701d0aea3c65dc67d5725630ee322516837b522f43a85cf839bfaa67b8d50f1d82a38c6b13102621b299ad
+AUX abook-0.6.1-use-newer-macro-for-readline.patch 986 BLAKE2B bec102b0110e699df64758e0092d1e1bfb26b5e963f073e51f03e002d5cc31d34162ec5daf466866f032c64744bcc8ea4a1b6a930e3bc8a843303adf241391b6 SHA512 559551548a10a82ad529ab1181d42ed43f45c182530d88dd9c0cbb6423679109b5556cb9c1a27e7ea328db63e54b4196005850a1f8fe2a1dc95f3302c7efede1
+AUX abook-0.6.1-vformat.patch 336 BLAKE2B 9a45733e1ea3ddf996b6e75582771922c9189117580202e3f1270d6394b92ec0943207f803870709b2288755ac8e3ba150ceb3835ad178313eadea3bede347fb SHA512 e1da5d70edc8eecf0f860b0423a260bfb9b1f706a38872d8c793c76af3b899c86b9700df8816f952fb1430999acb00ac365dad58752c78c7535cae5d8b2814b6
DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
-EBUILD abook-0.6.1-r2.ebuild 976 BLAKE2B 125703fe65276f7c87e10eb5cc998b6a97f884271d87e30281bdaad2aa7083610facbfc77bae81c2aead15c25a7ca6a89d4bd84f408d6d6f1c8d0f52ff8ca9a8 SHA512 766506ce7fe43a5bab40f6778f64cf0920789344598ff784b394e49f8525041c606f60f53e9e9e32accdea1cdb3640b5acb9ae8c3d4bf95f13c550c76184feab
+EBUILD abook-0.6.1-r3.ebuild 1083 BLAKE2B 74c1023058e261847f0fed2b6cc04e67c4b288e5a8eb3ef54cac79e92106c2e166d35b30d2c917209281d948b854fd2c67945b3f5213605868bc7adc4f451f62 SHA512 90443a2c98e0e3519573fdf04b612502c3f140fb20bf5feeb8a7014b434d4b1124e9da246e37d5406e6776ab1c7c840c1d65f7d4c8d77fcd3224adc163850178
MISC metadata.xml 290 BLAKE2B 0ad2ca84b0fa7d2fc2744789323d271079956e468a6d8e17d7c21e1d17ca57fb78ce17b48f7bdb97fd24e1a456d8dcf5d403b499fa1827ba70789617413b3feb SHA512 797a9fb6890d0692924901c9f1a2ab118f628fd00a293c84c466737ac69f22e592510b825b935a9183cc4e6c52529d82aff1da1b841b5dfea64bc278104daeba
diff --git a/app-misc/abook/abook-0.6.1-r2.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
deleted file mode 100644
index deec4303f985..000000000000
--- a/app-misc/abook/abook-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${P/_/}"
-DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
-HOMEPAGE="http://abook.sourceforge.net/"
-SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="
- sys-libs/ncurses
- sys-libs/readline
- dev-libs/libvformat
- nls? ( virtual/libintl )"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-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() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-curses \
- --with-readline \
- --enable-vformat \
- $(use_enable nls)
-}
-
-src_compile() {
- # bug 570428
- emake CFLAGS="${CFLAGS} -std=gnu89"
-}
-
-src_install() {
- default
-}
diff --git a/app-misc/abook/abook-0.6.1-r3.ebuild b/app-misc/abook/abook-0.6.1-r3.ebuild
new file mode 100644
index 000000000000..0d55af71738f
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libvformat
+ nls? ( virtual/libintl )"
+
+DEPEND="
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
+ "${FILESDIR}"/${PN}-0.6.1-use-newer-macro-for-readline.patch
+ "${FILESDIR}"/${PN}-0.6.1-vformat.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-vformat \
+ $(use_enable nls)
+}
+
+src_compile() {
+ # bug 570428
+ emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
deleted file mode 100644
index 3c12032932f1..000000000000
--- a/app-misc/abook/files/abook-0.6.1-tinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,7 @@
-
- AC_CHECK_LIB(ncursesw, initscr,
- [LIBS="$LIBS -lncursesw"
-+ 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
-@@ -93,6 +94,7 @@
- ac_widec_possible=no
- AC_CHECK_LIB(ncurses, initscr,
- [LIBS="$LIBS -lncurses"
-+ 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-use-PKG_CHECK_MODULES-for-ncurses.patch b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
new file mode 100644
index 000000000000..e6f98906af3e
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
@@ -0,0 +1,44 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 21 Apr 2021 06:06:13 +0100
+Subject: Use PKG_CHECK_MODULES for ncurses
+
+We don't _always_ have split tinfo, e.g. Prefix.
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,31 +74,9 @@ dnl -------------------
+ dnl (n)curses detection
+ dnl -------------------
+
+-abook_cv_curses=/usr
+-AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
+- [if test $withval != yes; then
+- abook_cv_curses=$withval
+- fi
+- if test x$abook_cv_curses != x/usr; then
+- LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
+- fi])
+-
+-AC_CHECK_LIB(ncursesw, initscr,
+- [LIBS="$LIBS -lncursesw"
+- if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+- fi
+- AC_CHECK_HEADERS(ncurses.h)],[
+- ac_widec_possible=no
+- AC_CHECK_LIB(ncurses, initscr,
+- [LIBS="$LIBS -lncurses"
+- if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+- fi
+- AC_CHECK_HEADERS(ncurses.h)],
+- [CF_CURSES_LIBS])
+- ])
++PKG_CHECK_MODULES(ncurses, ncurses)
++LDFLAGS="${ncurses_LIBS} $LDFLAGS"
++CPPFLAGS="${ncurses_CFLAGS} $CPPFLAGS"
+
+ dnl --------------------------
+ dnl end of (n)curses detection
+--
+
diff --git a/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch b/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
new file mode 100644
index 000000000000..1a35e636964d
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
@@ -0,0 +1,31 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 21 Apr 2021 06:20:13 +0100
+Subject: Use more modern autoconf archive macro for readline
+
+The previous macro used was pretty obsolete and certainly didn't work
+on Gentoo Prefix on Darwin anyway.
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,19 +86,9 @@ dnl ------------------
+ dnl readline detection
+ dnl ------------------
+
+-abook_cv_readline=/usr
+-AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
+- [if test $withval != yes; then
+- abook_cv_readline=$withval
+- fi
+- if test x$abook_cv_readline != x/usr; then
+- LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
+- fi])
+-
+-AC_LIB_READLINE
+-
+-if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
++AX_LIB_READLINE
++
++if test x$ax_cv_lib_readline = xno -o x$ax_cv_lib_readline_history = xno; then
+ AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
+ 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
index 0808852e6b20..07a68a8ecb11 100644
--- a/app-misc/abook/files/abook-0.6.1-vformat.patch
+++ b/app-misc/abook/files/abook-0.6.1-vformat.patch
@@ -1,6 +1,5 @@
-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
+--- a/configure.ac
++++ b/configure.ac
@@ -140,6 +140,7 @@
if test x$vformat = xtrue; then
AC_CHECK_HEADER([vf_iface.h], [
--
cgit v1.2.3