[gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/, app-antivirus/clamav/

[Lars Wendler]

commit:     ca05c21a3ab3e69ff60da41cb10cba2de84ed614
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 12:47:12 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 12:47:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca05c21a

app-antivirus/clamav: Fixed compilation with sys-libs/ncurses[tinfo]

Fixed without excplicit permission due to maintainer timeout.

Thanks-to: Jeroen Roovers <jer <AT> gentoo.org>
Bug: https://bugs.gentoo.org/670729
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-antivirus/clamav/clamav-0.101.2-r1.ebuild      |  3 ++-
 .../clamav/files/clamav-0.101.2-tinfo.patch        | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
index 986cc1711ae..372a1c6336b 100644
--- a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
@@ -41,7 +41,8 @@ DOCS=( docs/UserManual.md docs/UserManual )
 HTML_DOCS=( docs/html )
 
 PATCHES=(
-	"${FILESDIR}/clamav-0.101.2-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
 )
 
 pkg_setup() {

diff --git a/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch
new file mode 100644
index 00000000000..66130be4188
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/670729
+
+--- a/m4/reorganization/clamdtop.m4
++++ b/m4/reorganization/clamdtop.m4
+@@ -4,12 +4,26 @@
+ 
+ if test "$enable_clamdtop" != "no"; then
+ 
++PKG_CHECK_MODULES([CURSES], [ncursesw],
++		[CURSES_INCLUDE="<ncurses.h>";
++		 HAVE_LIBNCURSES=yes],
++		HAVE_LIBNCURSES=no])
++
++if test "X$HAVE_LIBNCURSES" != "Xyes"; then
++PKG_CHECK_MODULES([CURSES], [ncurses],
++	    [CURSES_INCLUDE="<ncurses.h>";
++	     HAVE_LIBNCURSES=yes],
++	    HAVE_LIBNCURSES=no])
++fi
++
++if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
+ 	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
+ 			    [initscr(); KEY_RESIZE;]),
+ 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ 	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
+ 	    [])
++fi
+ 
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+     HAVE_LIBNCURSES=