Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/
Date: Wed, 08 Feb 2017 23:33:50
Message-Id: 1486596157.70d43e940c342803c7c6af45e8ea64050bdd705b.monsieurp@gentoo
1 commit: 70d43e940c342803c7c6af45e8ea64050bdd705b
2 Author: Bláithín Nic Aoidh <blawheen <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 4 01:52:25 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 8 23:22:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d43e94
7
8 app-shells/hstr: remove unused patch files.
9
10 Closes: https://github.com/gentoo/gentoo/pull/3796
11
12 app-shells/hstr/files/hstr-1.17-tinfo.patch | 47 -----------------------------
13 app-shells/hstr/files/hstr-1.18-tinfo.patch | 47 -----------------------------
14 2 files changed, 94 deletions(-)
15
16 diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch
17 deleted file mode 100644
18 index 0ffbd0cff2..0000000000
19 --- a/app-shells/hstr/files/hstr-1.17-tinfo.patch
20 +++ /dev/null
21 @@ -1,47 +0,0 @@
22 -diff --git a/configure.ac b/configure.ac
23 -index 9cf6a53..cbc649d 100644
24 ---- a/configure.ac
25 -+++ b/configure.ac
26 -@@ -18,17 +18,21 @@ AC_PROG_CC
27 -
28 - # Platform specific ncurses check.
29 - AC_CANONICAL_HOST
30 --AS_CASE([$host_os],
31 -- [darwin*],
32 -- [
33 -- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
34 -- AC_CHECK_HEADER(curses.h)
35 -- ],
36 -- [
37 -- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
38 -- AC_CHECK_HEADER(ncursesw/curses.h)
39 -- ]
40 --)
41 -+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
42 -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
43 -+ AS_CASE([$host_os],
44 -+ [darwin*],
45 -+ [
46 -+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
47 -+ AC_CHECK_HEADER(curses.h)
48 -+ ],
49 -+ [
50 -+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
51 -+ AC_CHECK_HEADER(ncursesw/curses.h)
52 -+ ]
53 -+ )
54 -+ ])
55 -+])
56 -
57 - # Checks for libraries.
58 - AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
59 -diff --git a/src/Makefile.am b/src/Makefile.am
60 -index 5765613..ee411a9 100644
61 ---- a/src/Makefile.am
62 -+++ b/src/Makefile.am
63 -@@ -15,3 +15,5 @@ hh_SOURCES = \
64 - hstr_regexp.c include/hstr_regexp.h \
65 - radixsort.c include/radixsort.h \
66 - hstr.c
67 -+
68 -+hh_LDADD = $(NCURSES_LIBS)
69
70 diff --git a/app-shells/hstr/files/hstr-1.18-tinfo.patch b/app-shells/hstr/files/hstr-1.18-tinfo.patch
71 deleted file mode 100644
72 index 0ffbd0cff2..0000000000
73 --- a/app-shells/hstr/files/hstr-1.18-tinfo.patch
74 +++ /dev/null
75 @@ -1,47 +0,0 @@
76 -diff --git a/configure.ac b/configure.ac
77 -index 9cf6a53..cbc649d 100644
78 ---- a/configure.ac
79 -+++ b/configure.ac
80 -@@ -18,17 +18,21 @@ AC_PROG_CC
81 -
82 - # Platform specific ncurses check.
83 - AC_CANONICAL_HOST
84 --AS_CASE([$host_os],
85 -- [darwin*],
86 -- [
87 -- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
88 -- AC_CHECK_HEADER(curses.h)
89 -- ],
90 -- [
91 -- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
92 -- AC_CHECK_HEADER(ncursesw/curses.h)
93 -- ]
94 --)
95 -+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
96 -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
97 -+ AS_CASE([$host_os],
98 -+ [darwin*],
99 -+ [
100 -+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
101 -+ AC_CHECK_HEADER(curses.h)
102 -+ ],
103 -+ [
104 -+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
105 -+ AC_CHECK_HEADER(ncursesw/curses.h)
106 -+ ]
107 -+ )
108 -+ ])
109 -+])
110 -
111 - # Checks for libraries.
112 - AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
113 -diff --git a/src/Makefile.am b/src/Makefile.am
114 -index 5765613..ee411a9 100644
115 ---- a/src/Makefile.am
116 -+++ b/src/Makefile.am
117 -@@ -15,3 +15,5 @@ hh_SOURCES = \
118 - hstr_regexp.c include/hstr_regexp.h \
119 - radixsort.c include/radixsort.h \
120 - hstr.c
121 -+
122 -+hh_LDADD = $(NCURSES_LIBS)