From 70d43e940c342803c7c6af45e8ea64050bdd705b Mon Sep 17 00:00:00 2001 From: Bláithín Nic Aoidh Date: Sat, 4 Feb 2017 01:52:25 +0000 Subject: 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(-) delete mode 100644 app-shells/hstr/files/hstr-1.17-tinfo.patch delete mode 100644 app-shells/hstr/files/hstr-1.18-tinfo.patch 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 0ffbd0cff257..000000000000 --- 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 0ffbd0cff257..000000000000 --- 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) -- cgit v1.2.3-65-gdbad