gentoo resync : 01.08.2021

3 files changed, 39 insertions, 16 deletions

diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index f844c1fc6af4..22574875f6e3 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,6 +1,6 @@
-AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1292 BLAKE2B fafc126e41c7dcd599d4101245b83e29814d5e5f1d9c1073b3bcc7385899909bb68f33e4d84a93a4cc3d4fedb2bcf19cfec4f1e7d9ac883c32f4962a7d9b5a45 SHA512 d0a779700e21b5a0c76e0ba3cafe9a85478e4f22b1d33e8486a2efdf37817e6ff9683d7e59ae6905578b48434e375f7f1956f86c65cd43abf6a231189cfa3474
+AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 2061 BLAKE2B 1b4dbdbaf2f73000c61d6e3472e8194c48ff0b3f75d3f2ec2f842823ae7eb4adb3b4dbb203be7a434cdb1ec42fb9896aafb5cd2a0a5e36721975dadd446d464a SHA512 9f26da7d0c6a5c5f3af3a4f19a0514aa500dca66f55b42f3c0a0ff396e3f609ea603a4a8b30065b15385ee6e3f07b77b0c7717e2065e807bc8278921c3306062
 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-r3.ebuild 1083 BLAKE2B 74c1023058e261847f0fed2b6cc04e67c4b288e5a8eb3ef54cac79e92106c2e166d35b30d2c917209281d948b854fd2c67945b3f5213605868bc7adc4f451f62 SHA512 90443a2c98e0e3519573fdf04b612502c3f140fb20bf5feeb8a7014b434d4b1124e9da246e37d5406e6776ab1c7c840c1d65f7d4c8d77fcd3224adc163850178
+EBUILD abook-0.6.1-r4.ebuild 1133 BLAKE2B 750adaed6728a5e8d811131403d713e601f92ed7af093e97ee3c06be111daaee1e7e8998d95e08039dbf119461db6f881b9b3b807018f3275d4f4b63c60c6260 SHA512 87a4e4e2d540bee9777e04b0801eff00c7adb2a068e46311e2d2faad3f0d15be491e0c758d6f2cf8d1a344858b664d10fd43d05fec84fcc94c493d267844ec76
 MISC metadata.xml 290 BLAKE2B 0ad2ca84b0fa7d2fc2744789323d271079956e468a6d8e17d7c21e1d17ca57fb78ce17b48f7bdb97fd24e1a456d8dcf5d403b499fa1827ba70789617413b3feb SHA512 797a9fb6890d0692924901c9f1a2ab118f628fd00a293c84c466737ac69f22e592510b825b935a9183cc4e6c52529d82aff1da1b841b5dfea64bc278104daeba
diff --git a/app-misc/abook/abook-0.6.1-r3.ebuild b/app-misc/abook/abook-0.6.1-r4.ebuild
index 0d55af71738f..f6e46075e42e 100644
--- a/app-misc/abook/abook-0.6.1-r3.ebuild
+++ b/app-misc/abook/abook-0.6.1-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
 MY_P="${P/_/}"
 DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
@@ -20,8 +20,9 @@ RDEPEND="
 	sys-libs/readline:=
 	dev-libs/libvformat
 	nls? ( virtual/libintl )"
-
-DEPEND="
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="
 	sys-devel/autoconf-archive
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -49,10 +50,8 @@ src_configure() {
 }
 
 src_compile() {
-	# bug 570428
-	emake CFLAGS="${CFLAGS} -std=gnu89"
-}
+	# bug #570428
+	append-cflags -std=gnu89
 
-src_install() {
-	default
+	emake CFLAGS="${CFLAGS}"
 }
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
index 00b8e4449048..8d7a6cddd7cb 100644
--- 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
@@ -1,11 +1,36 @@
+From 243d3c265289171f59de68f5da4de086afb58215 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
-Date: Wed, 21 Apr 2021 06:06:13 +0100
-Subject: Use PKG_CHECK_MODULES for ncurses
+Date: Sat, 31 Jul 2021 03:21:28 +0100
+Subject: [PATCH] Use PKG_CHECK_MODULES for ncurses
 
 We don't _always_ have split tinfo, e.g. Prefix.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Makefile.am  |  4 ++--
+ configure.ac | 26 +-------------------------
+ 2 files changed, 3 insertions(+), 27 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8faaa11..18c6892 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,8 +22,8 @@ abook_SOURCES = abook.c abook_rl.c database.c edit.c \
+ EXTRA_DIST = config.rpath  ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
+ 		abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
+ 
+-abook_LDADD = @LIBINTL@
+-
++abook_CFLAGS = $(ncurses_CFLAGS)
++abook_LDADD = @LIBINTL@ $(ncurses_LIBS)
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
+diff --git a/configure.ac b/configure.ac
+index 5a9ae3b..73a7af0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -74,31 +74,9 @@ dnl -------------------
+@@ -74,31 +74,7 @@ dnl -------------------
  dnl (n)curses detection
  dnl -------------------
  
@@ -35,10 +60,9 @@ We don't _always_ have split tinfo, e.g. Prefix.
 -		[CF_CURSES_LIBS])
 -	])
 +PKG_CHECK_MODULES(ncurses, [ncursesw ncurses])
-+LDFLAGS="${ncurses_LIBS} $LDFLAGS"
-+CPPFLAGS="${ncurses_CFLAGS} $CPPFLAGS"
  
  dnl --------------------------
  dnl end of (n)curses detection
 -- 
+2.32.0