From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 05ED91384C0 for ; Fri, 28 Aug 2015 13:09:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6862114239; Fri, 28 Aug 2015 13:09:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBCC314239 for ; Fri, 28 Aug 2015 13:09:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17E24340AF9 for ; Fri, 28 Aug 2015 13:09:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB107161 for ; Fri, 28 Aug 2015 13:09:17 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1440767356.a9b630af663e3f3b932303b6853478d9b094d325.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/hstr/files/hstr-1.17-tinfo.patch X-VCS-Directories: app-shells/hstr/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: a9b630af663e3f3b932303b6853478d9b094d325 X-VCS-Branch: master Date: Fri, 28 Aug 2015 13:09:17 +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-Archives-Salt: cfda4291-ddd3-4f81-bf64-323962182080 X-Archives-Hash: 8a378109ff20886f33c4875a66d96ac5 commit: a9b630af663e3f3b932303b6853478d9b094d325 Author: Justin Lecher gentoo org> AuthorDate: Fri Aug 28 13:09:12 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Aug 28 13:09:16 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b630af app-shells/hstr: Update patch to first detect ncursesw Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher gentoo.org> app-shells/hstr/files/hstr-1.17-tinfo.patch | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch index 5c9ea9b..0ffbd0c 100644 --- a/app-shells/hstr/files/hstr-1.17-tinfo.patch +++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch @@ -1,25 +1,14 @@ - configure.ac | 22 ++++++++++++---------- - src/Makefile.am | 2 ++ - 2 files changed, 14 insertions(+), 10 deletions(-) - diff --git a/configure.ac b/configure.ac -index 9cf6a53..7367a32 100644 +index 9cf6a53..cbc649d 100644 --- a/configure.ac +++ b/configure.ac -@@ -18,17 +18,19 @@ AC_PROG_CC +@@ -18,17 +18,21 @@ AC_PROG_CC # Platform specific ncurses check. AC_CANONICAL_HOST -AS_CASE([$host_os], - [darwin*], -+PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ -+ AS_CASE([$host_os], -+ [darwin*], -+ [ -+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) -+ AC_CHECK_HEADER(curses.h) -+ ], - [ +- [ - AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) - AC_CHECK_HEADER(curses.h) - ], @@ -28,10 +17,20 @@ index 9cf6a53..7367a32 100644 - AC_CHECK_HEADER(ncursesw/curses.h) - ] -) -+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) -+ AC_CHECK_HEADER(ncursesw/curses.h) -+ ] -+ ) ++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [ ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ ++ AS_CASE([$host_os], ++ [darwin*], ++ [ ++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) ++ AC_CHECK_HEADER(curses.h) ++ ], ++ [ ++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) ++ AC_CHECK_HEADER(ncursesw/curses.h) ++ ] ++ ) ++ ]) +]) # Checks for libraries.