gentoo resync : 30.05.2020

5 files changed, 23 insertions, 8 deletions

diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index e8de14416f07..25b36c216b4e 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,5 +1,6 @@
-AUX abook-0.6.1-tinfo.patch 531 BLAKE2B 8acbb9fc21f2e78c508a1daa481d626501f12d22bf815b2663415d624a1a5e31e378cf6a741bd2a310898dbe6c18fa88137df238b760b0d5aebaa4f695cfc1a6 SHA512 1e0b7e3c2134e39b2fcece60a3c31927a6c4bd1049c9f14b1ed3426111efe035a433878dcd965bf1a3756daba75ebdf6983c0cd777bb4b1a92e62199a16f10a1
+AUX abook-0.6.1-tinfo.patch 577 BLAKE2B fb012f1baf2ae0915e797c9f6d506d3c636370e5d112031ea163b076cfdbdd5d5eba080c210b552af426fdbc60c1841c9fefb2aa8779e1d829c3382f9231ba2d SHA512 0c7e657f67749e05aa2710e65ceadd8960a842f4029231298458446c9286945d0c6d89e837020a90e1f1ddc20ebee205469eb1355416d3d98e13fe9341007a99
+AUX abook-0.6.1-vformat.patch 497 BLAKE2B 7f3c57b05048be59f4037416a3df8c0e3a5ac3661e59c1f1f9afb86756de7852208b565aa40f5342f9bb4e4fb10efe4aaeca90ec4b6e5c1b38b487c8493053e6 SHA512 7073146a80bedcb7bc447d741028dcffd47ce60007b4b276438fb6437e19243f3a088b99ba9da96d2ac1b64b3d0f265613aa9d0426b5c03f57fd4c834544c247
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
-EBUILD abook-0.6.1-r1.ebuild 943 BLAKE2B ac67f194aaff7772d4457da67f5068514fd8801e6e891e427e569659c36d716b5fdf708361f4178f2ea6794808c17ab6789982e4a04946c1d440664d26d165f6 SHA512 50aaabde17ba2d54718fe219fbe8b87d7feb9db3a84d2195be7dd847302dbf68b408df5affcd6c1e264fcefd0f904b0db666f514500c3ae7d5b5fbf4bad0af78
+EBUILD abook-0.6.1-r2.ebuild 977 BLAKE2B d7ecc8166dec84b1eb448a5040d8505b400638f7304c65d86d12b53cf08ec7ca77a5af63cbd002a0c06e3f0f1a7a9de154cb4a813b87db5ffe6a78ae08e1a02f SHA512 7499e0d1e1dc3027ce849e727a623fe30dc98d611020e02cf85f76934e9dc79b93659fafa5dc60c0d7cefb02c2dd6d3012427d0eb3b5aba40e0b3ca2bff40448
 EBUILD abook-0.6.1.ebuild 959 BLAKE2B 16201ee33578c18ac8b91ac2dbcae233421142d371fb3091a45c8975213081f9a51c8ae09fc3d03c3bbd58c33e4d8d894811acc2d877dcfaae0b0417297f7fe1 SHA512 be92ae79aa58b4ccee582460406255f4a89d4c1a7b68d7006a2f3c4986310779f897c837b2adc066538a954fe201302c54586ca0c91700c2fa98cc611c33c1b4
-MISC metadata.xml 346 BLAKE2B eeb4ab910846e474790ee173c5e0f614fb075e1caf8940eebf996e21da8475c717f26e083b78688f90cba3027196de8d54e2fac3693e01201fc5fd62afdb3f02 SHA512 2c3e1bc6f955a54ff62cec0b321b317441bddc8ce29ffc978bf1390118c84c7d250378f71d1fa7ef451ca3b2eb49d0dac2e9d171afdb84519a2a8cd2e3e83814
+MISC metadata.xml 394 BLAKE2B 7bf50f13c562023ff4695feb92a21827004491743cb073e3e25dc6ce24b69556e8027c21b5f6a4c039032c7222fae4d0a7275940b170a689257203b12266ff26 SHA512 c10bb50afc5cce1b6067662d498b43a37a6718905ef47c6e0b5452d819c704972194516868ac667a35a3266f7d408d9ebc9a92076c53d8236075135c9f034334
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
index 37e0289c6c32..77cc9716f4f2 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
@@ -12,7 +12,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86"
 IUSE="nls"
 
 RDEPEND="
@@ -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>