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 C3527139085 for ; Wed, 8 Feb 2017 23:33:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 701AFE0D13; Wed, 8 Feb 2017 23:33:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DD41E0D13 for ; Wed, 8 Feb 2017 23:33: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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D64F9341689 for ; Wed, 8 Feb 2017 23:33:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 526E57EA for ; Wed, 8 Feb 2017 23:33:45 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1486596157.70d43e940c342803c7c6af45e8ea64050bdd705b.monsieurp@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 app-shells/hstr/files/hstr-1.18-tinfo.patch X-VCS-Directories: app-shells/hstr/files/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 70d43e940c342803c7c6af45e8ea64050bdd705b X-VCS-Branch: master Date: Wed, 8 Feb 2017 23:33: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-Archives-Salt: 34a46560-7182-4189-acf3-5aae07d06ca9 X-Archives-Hash: acfe6052df5a481afca8259457b133b3 commit: 70d43e940c342803c7c6af45e8ea64050bdd705b Author: Bláithín Nic Aoidh gmail com> AuthorDate: Sat Feb 4 01:52:25 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Wed Feb 8 23:22:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d43e94 app-shells/hstr: remove unused patch files. Closes: https://github.com/gentoo/gentoo/pull/3796 app-shells/hstr/files/hstr-1.17-tinfo.patch | 47 ----------------------------- app-shells/hstr/files/hstr-1.18-tinfo.patch | 47 ----------------------------- 2 files changed, 94 deletions(-) diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch deleted file mode 100644 index 0ffbd0cff2..0000000000 --- a/app-shells/hstr/files/hstr-1.17-tinfo.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 9cf6a53..cbc649d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,17 +18,21 @@ AC_PROG_CC - - # Platform specific ncurses check. - AC_CANONICAL_HOST --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) -- ] --) -+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. - AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 5765613..ee411a9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,3 +15,5 @@ hh_SOURCES = \ - hstr_regexp.c include/hstr_regexp.h \ - radixsort.c include/radixsort.h \ - hstr.c -+ -+hh_LDADD = $(NCURSES_LIBS) diff --git a/app-shells/hstr/files/hstr-1.18-tinfo.patch b/app-shells/hstr/files/hstr-1.18-tinfo.patch deleted file mode 100644 index 0ffbd0cff2..0000000000 --- a/app-shells/hstr/files/hstr-1.18-tinfo.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 9cf6a53..cbc649d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,17 +18,21 @@ AC_PROG_CC - - # Platform specific ncurses check. - AC_CANONICAL_HOST --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) -- ] --) -+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. - AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 5765613..ee411a9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,3 +15,5 @@ hh_SOURCES = \ - hstr_regexp.c include/hstr_regexp.h \ - radixsort.c include/radixsort.h \ - hstr.c -+ -+hh_LDADD = $(NCURSES_LIBS)