From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DAB73138334 for ; Wed, 31 Jul 2019 12:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0175FE0819; Wed, 31 Jul 2019 12:47:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D38A7E0819 for ; Wed, 31 Jul 2019 12:47:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D393634906F for ; Wed, 31 Jul 2019 12:47:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBBE16FF for ; Wed, 31 Jul 2019 12:47:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1564577259.ca05c21a3ab3e69ff60da41cb10cba2de84ed614.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/, app-antivirus/clamav/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-antivirus/clamav/clamav-0.101.2-r1.ebuild app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch X-VCS-Directories: app-antivirus/clamav/ app-antivirus/clamav/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ca05c21a3ab3e69ff60da41cb10cba2de84ed614 X-VCS-Branch: master Date: Wed, 31 Jul 2019 12:47:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7bccebcf-80d2-4ce1-8e81-ce91d4086053 X-Archives-Hash: 6e173d3a131e9e1e207f8c83ba625750 commit: ca05c21a3ab3e69ff60da41cb10cba2de84ed614 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 31 12:47:12 2019 +0000 Commit: Lars Wendler gentoo 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 gentoo.org> Bug: https://bugs.gentoo.org/670729 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler 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=""; ++ HAVE_LIBNCURSES=yes], ++ HAVE_LIBNCURSES=no]) ++ ++if test "X$HAVE_LIBNCURSES" != "Xyes"; then ++PKG_CHECK_MODULES([CURSES], [ncurses], ++ [CURSES_INCLUDE=""; ++ 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 ], + [initscr(); KEY_RESIZE;]), + [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; + CURSES_INCLUDE=""], + []) ++fi + + if test "X$HAVE_LIBNCURSES" != "Xyes"; then + HAVE_LIBNCURSES=