Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-libs/ncurses/, sys-libs/ncurses/files/
Date: Wed, 23 Dec 2020 09:36:47
Message-Id: 1608714909.486383c464bb9d6a3b40448a0a05b67ff1640004.grobian@gentoo
1 commit: 486383c464bb9d6a3b40448a0a05b67ff1640004
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 09:15:09 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 09:15:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=486383c4
7
8 sys-libs/ncurses: drop ~ppc-aix
9
10 Bug: https://bugs.gentoo.org/760057
11 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 sys-libs/ncurses/Manifest | 1 -
15 .../ncurses/files/ncurses-5.5-aix-shared.patch | 12 --
16 sys-libs/ncurses/files/ncurses-5.6-build.patch | 11 --
17 sys-libs/ncurses/files/ncurses-5.6-darwin.patch | 11 --
18 sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch | 24 ---
19 sys-libs/ncurses/files/ncurses-5.6-interix.patch | 21 ---
20 sys-libs/ncurses/files/ncurses-5.6-libtool.patch | 38 -----
21 sys-libs/ncurses/files/ncurses-5.6-mint.patch | 11 --
22 sys-libs/ncurses/files/ncurses-5.6-netbsd.patch | 24 ---
23 sys-libs/ncurses/files/ncurses-5.6-solaris2.patch | 84 ---------
24 sys-libs/ncurses/files/ncurses-5.7-emacs.patch | 44 -----
25 .../ncurses/files/ncurses-5.7-hashdb-open.patch | 88 ----------
26 sys-libs/ncurses/files/ncurses-5.7-irix.patch | 40 -----
27 .../files/ncurses-5.7-ldflags-with-libtool.patch | 22 ---
28 .../ncurses/files/ncurses-5.7-mint-terminfo.patch | 175 -------------------
29 sys-libs/ncurses/files/ncurses-5.7-mint.patch | 13 --
30 .../files/ncurses-5.7-rxvt-unicode-9.09.patch | 189 ---------------------
31 .../ncurses/files/ncurses-5.7-rxvt-unicode.patch | 174 -------------------
32 .../files/ncurses-5.7-tic-cross-detection.patch | 58 -------
33 .../ncurses/files/ncurses-5.7-x64-freebsd.patch | 27 ---
34 .../ncurses/files/ncurses-5.8-rxvt-unicode.patch | 189 ---------------------
35 sys-libs/ncurses/ncurses-5.9-r101.ebuild | 40 +----
36 sys-libs/ncurses/ncurses-6.1-r2.ebuild | 5 +-
37 sys-libs/ncurses/ncurses-6.1-r3.ebuild | 5 +-
38 sys-libs/ncurses/ncurses-6.2-r1.ebuild | 3 +-
39 25 files changed, 8 insertions(+), 1301 deletions(-)
40
41 diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
42 index 05d911281e..872019d041 100644
43 --- a/sys-libs/ncurses/Manifest
44 +++ b/sys-libs/ncurses/Manifest
45 @@ -1,4 +1,3 @@
46 -DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
47 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
48 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
49 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
50
51 diff --git a/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch b/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch
52 deleted file mode 100644
53 index 05b67c6b49..0000000000
54 --- a/sys-libs/ncurses/files/ncurses-5.5-aix-shared.patch
55 +++ /dev/null
56 @@ -1,12 +0,0 @@
57 ---- ncurses-5.6/configure.orig 2007-01-27 09:02:39.521587000 +0100
58 -+++ ncurses-5.6/configure 2007-01-27 09:17:49.261587000 +0100
59 -@@ -5147,6 +5147,9 @@
60 - fi
61 - MK_SHARED_LIB='${LD} -d y -G -o $@'
62 - ;;
63 -+ aix4.[3-9]*|aix5*)
64 -+ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${libdir}:/usr/lib -o $@'
65 -+ ;;
66 - *)
67 - CC_SHARED_OPTS='unknown'
68 - MK_SHARED_LIB='echo unknown'
69
70 diff --git a/sys-libs/ncurses/files/ncurses-5.6-build.patch b/sys-libs/ncurses/files/ncurses-5.6-build.patch
71 deleted file mode 100644
72 index db17458154..0000000000
73 --- a/sys-libs/ncurses/files/ncurses-5.6-build.patch
74 +++ /dev/null
75 @@ -1,11 +0,0 @@
76 ---- configure
77 -+++ configure
78 -@@ -9122,7 +9122,7 @@
79 - echo "$as_me:9122: result: $with_warnings" >&5
80 - echo "${ECHO_T}$with_warnings" >&6
81 -
82 --if test -n "$with_warnings"; then
83 -+if test "x$with_warnings" = "xyes"; then
84 - ADAFLAGS="$ADAFLAGS -gnatg"
85 -
86 - INTEL_COMPILER=no
87
88 diff --git a/sys-libs/ncurses/files/ncurses-5.6-darwin.patch b/sys-libs/ncurses/files/ncurses-5.6-darwin.patch
89 deleted file mode 100644
90 index c18f9182b8..0000000000
91 --- a/sys-libs/ncurses/files/ncurses-5.6-darwin.patch
92 +++ /dev/null
93 @@ -1,11 +0,0 @@
94 ---- configure~ 2006-12-17 19:33:38.000000000 +0300
95 -+++ configure 2007-02-14 07:44:48.000000000 +0300
96 -@@ -4922,7 +4922,7 @@
97 - darwin*)
98 - EXTRA_CFLAGS="-no-cpp-precomp"
99 - CC_SHARED_OPTS="-dynamic"
100 -- MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
101 -+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
102 - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
103 - cf_cv_shlib_version_infix=yes
104 - echo "$as_me:4928: checking if ld -search_paths_first works" >&5
105
106 diff --git a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch
107 deleted file mode 100644
108 index 4dc51d35a4..0000000000
109 --- a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch
110 +++ /dev/null
111 @@ -1,24 +0,0 @@
112 -we'll hijack the freebsd* case that comes later
113 -
114 ---- ncurses-5.6/aclocal.m4
115 -+++ ncurses-5.6/aclocal.m4
116 -@@ -3806,7 +3806,7 @@
117 - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
118 - cf_cv_rm_so_locs=yes
119 - ;;
120 -- linux*|gnu*|k*bsd*-gnu)
121 -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
122 - if test "$DFT_LWR_MODEL" = "shared" ; then
123 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
124 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
125 ---- ncurses-5.6/configure
126 -+++ ncurses-5.6/configure
127 -@@ -3806,7 +3806,7 @@
128 - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
129 - cf_cv_rm_so_locs=yes
130 - ;;
131 -- linux*|gnu*|k*bsd*-gnu)
132 -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
133 - if test "$DFT_LWR_MODEL" = "shared" ; then
134 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
135 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
136
137 diff --git a/sys-libs/ncurses/files/ncurses-5.6-interix.patch b/sys-libs/ncurses/files/ncurses-5.6-interix.patch
138 deleted file mode 100644
139 index f9b34e4031..0000000000
140 --- a/sys-libs/ncurses/files/ncurses-5.6-interix.patch
141 +++ /dev/null
142 @@ -1,21 +0,0 @@
143 -reported and accepted upstream: http://lists.gnu.org/archive/html/bug-ncurses/2011-05/msg00008.html
144 -
145 ---- configure.orig Tue Dec 18 16:49:58 2007
146 -+++ configure Tue Dec 18 17:03:14 2007
147 -@@ -5165,6 +5165,16 @@
148 - aix4.[3-9]*|aix5*)
149 - MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${libdir}:/usr/lib -o $@'
150 - ;;
151 -+ interix*)
152 -+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
153 -+ if test "$cf_cv_shlib_version" = rel; then
154 -+ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
155 -+ else
156 -+ cf_shared_soname='`basename $@`'
157 -+ fi
158 -+ CC_SHARED_OPTS=
159 -+ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${libdir} -Wl,-h,'$cf_shared_soname' -o $@'
160 -+ ;;
161 - *)
162 - CC_SHARED_OPTS='unknown'
163 - MK_SHARED_LIB='echo unknown'
164
165 diff --git a/sys-libs/ncurses/files/ncurses-5.6-libtool.patch b/sys-libs/ncurses/files/ncurses-5.6-libtool.patch
166 deleted file mode 100644
167 index ffc2af9655..0000000000
168 --- a/sys-libs/ncurses/files/ncurses-5.6-libtool.patch
169 +++ /dev/null
170 @@ -1,38 +0,0 @@
171 ---- configure.in.orig 2008-02-24 22:05:58 +0100
172 -+++ configure.in 2008-02-24 22:06:06 +0100
173 -@@ -198,6 +198,7 @@
174 - if test "$with_libtool" != "no" ; then
175 -
176 - cf_list_models="$cf_list_models libtool"
177 -+OBJEXT=lo
178 -
179 - else
180 -
181 ---- aclocal.m4.orig 2008-02-25 22:06:37 +0100
182 -+++ aclocal.m4 2008-02-25 22:05:54 +0100
183 -@@ -4758,6 +4758,7 @@
184 - case $cf_cv_libtool_version in
185 - 1.[[5-9]]*|[[2-9]]*)
186 - LIBTOOL_CXX="$LIBTOOL --tag=CXX"
187 -+ LIBTOOL="$LIBTOOL --tag=CC"
188 - ;;
189 - *)
190 - LIBTOOL_CXX="$LIBTOOL"
191 ---- configure.orig 2008-02-24 22:06:21 +0100
192 -+++ configure 2008-02-24 21:56:29 +0100
193 -@@ -4149,6 +4149,7 @@
194 - case $cf_cv_libtool_version in
195 - 1.[5-9]*|[2-9]*)
196 - LIBTOOL_CXX="$LIBTOOL --tag=CXX"
197 -+ LIBTOOL="$LIBTOOL --tag=CC"
198 - ;;
199 - *)
200 - LIBTOOL_CXX="$LIBTOOL"
201 -@@ -4164,6 +4164,7 @@
202 - if test "$with_libtool" != "no" ; then
203 -
204 - cf_list_models="$cf_list_models libtool"
205 -+OBJEXT=lo
206 -
207 - else
208 -
209
210 diff --git a/sys-libs/ncurses/files/ncurses-5.6-mint.patch b/sys-libs/ncurses/files/ncurses-5.6-mint.patch
211 deleted file mode 100644
212 index 7f12ea0216..0000000000
213 --- a/sys-libs/ncurses/files/ncurses-5.6-mint.patch
214 +++ /dev/null
215 @@ -1,11 +0,0 @@
216 ---- configure.old 2008-02-21 12:14:27.167615327 +0000
217 -+++ configure 2008-02-21 12:14:04.497615002 +0000
218 -@@ -6065,7 +6065,7 @@
219 - irix[56].*) #(vi
220 - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
221 - ;;
222 --linux*|gnu*) #(vi
223 -+linux*|mint*|gnu*) #(vi
224 -
225 - echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5
226 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
227
228 diff --git a/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch
229 deleted file mode 100644
230 index 68f71f80cc..0000000000
231 --- a/sys-libs/ncurses/files/ncurses-5.6-netbsd.patch
232 +++ /dev/null
233 @@ -1,24 +0,0 @@
234 -for netbsd we do the same as for freebsd
235 -
236 ---- ncurses-5.6/aclocal.m4
237 -+++ ncurses-5.6/aclocal.m4
238 -@@ -3806,7 +3806,7 @@
239 - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
240 - cf_cv_rm_so_locs=yes
241 - ;;
242 -- linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
243 -+ linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*)
244 - if test "$DFT_LWR_MODEL" = "shared" ; then
245 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
246 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
247 ---- ncurses-5.6/configure
248 -+++ ncurses-5.6/configure
249 -@@ -3806,7 +3806,7 @@
250 - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
251 - cf_cv_rm_so_locs=yes
252 - ;;
253 -- linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
254 -+ linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*)
255 - if test "$DFT_LWR_MODEL" = "shared" ; then
256 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
257 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
258
259 diff --git a/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch b/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch
260 deleted file mode 100644
261 index 5b4ca56340..0000000000
262 --- a/sys-libs/ncurses/files/ncurses-5.6-solaris2.patch
263 +++ /dev/null
264 @@ -1,84 +0,0 @@
265 ---- aclocal.m4.orig 2007-12-07 16:46:29.404007000 +0100
266 -+++ aclocal.m4 2007-12-07 16:48:41.180069000 +0100
267 -@@ -3903,19 +3903,33 @@
268 - ;;
269 - solaris2*)
270 - # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
271 -- if test "$GCC" != yes; then
272 -+ if test "$GCC" = yes; then
273 -+ CC_SHARED_OPTS='-fPIC'
274 -+ else
275 - CC_SHARED_OPTS='-KPIC'
276 - fi
277 - if test "$DFT_LWR_MODEL" = "shared" ; then
278 -- LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
279 -+ if test "$GCC" = yes; then
280 -+ LOCAL_LDFLAGS="-Wl,-R,\$(LOCAL_LIBDIR):\${libdir}"
281 -+ else
282 -+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
283 -+ fi
284 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
285 - fi
286 - if test "$cf_cv_ld_rpath" = yes ; then
287 -- cf_ld_rpath_opt="-R"
288 -+ if test "$GCC" = yes; then
289 -+ cf_ld_rpath_opt="-Wl,-R"
290 -+ else
291 -+ cf_ld_rpath_opt="-R"
292 -+ fi
293 - EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
294 - fi
295 - CF_SHARED_SONAME
296 -- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
297 -+ if test "$GCC" = yes; then
298 -+ MK_SHARED_LIB='${CC} -shared -Wl,-h,'$cf_shared_soname' -o $[@]'
299 -+ else
300 -+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
301 -+ fi
302 - ;;
303 - sysv5uw7*|unix_sv*)
304 - # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
305 ---- configure.orig 2007-12-07 13:58:59.599022000 +0100
306 -+++ configure 2007-12-07 14:00:36.836157000 +0100
307 -@@ -5120,15 +5120,25 @@
308 - ;;
309 - solaris2*)
310 - # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
311 -- if test "$GCC" != yes; then
312 -+ if test "$GCC" = yes; then
313 -+ CC_SHARED_OPTS='-fPIC'
314 -+ else
315 - CC_SHARED_OPTS='-KPIC'
316 - fi
317 - if test "$DFT_LWR_MODEL" = "shared" ; then
318 -- LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
319 -+ if test "$GCC" = yes; then
320 -+ LOCAL_LDFLAGS="-Wl,-R,\$(LOCAL_LIBDIR):\${libdir}"
321 -+ else
322 -+ LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
323 -+ fi
324 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
325 - fi
326 - if test "$cf_cv_ld_rpath" = yes ; then
327 -- cf_ld_rpath_opt="-R"
328 -+ if test "$GCC" = yes; then
329 -+ cf_ld_rpath_opt="-Wl,-R"
330 -+ else
331 -+ cf_ld_rpath_opt="-R"
332 -+ fi
333 - EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
334 - fi
335 -
336 -@@ -5139,7 +5149,11 @@
337 - cf_shared_soname='`basename $@`'
338 - fi
339 -
340 -- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@'
341 -+ if test "$GCC" = yes; then
342 -+ MK_SHARED_LIB='${CC} -shared -Wl,-h,'$cf_shared_soname' -o $@'
343 -+ else
344 -+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@'
345 -+ fi
346 - ;;
347 - sysv5uw7*|unix_sv*)
348 - # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
349
350 diff --git a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch
351 deleted file mode 100644
352 index 615a73b291..0000000000
353 --- a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch
354 +++ /dev/null
355 @@ -1,44 +0,0 @@
356 -http://bugs.gentoo.org/270527
357 -Add entry for eterm-color to terminfo file
358 -Part of upstream patch, available at:
359 -ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20081129.patch
360 -
361 ---- ncurses-5.7-20081122+/misc/terminfo.src 2008-11-15 21:54:35.000000000 +0000
362 -+++ ncurses-5.7-20081129/misc/terminfo.src 2008-11-29 15:27:35.000000000 +0000
363 -@@ -4357,6 +4357,26 @@
364 - sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
365 - smul=\E[4m,
366 -
367 -+# The codes supported by the term.el terminal emulation in GNU Emacs 22.2
368 -+eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
369 -+ am, mir, msgr, xenl,
370 -+ colors#8, cols#80, lines#24, pairs#64,
371 -+ bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
372 -+ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
373 -+ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
374 -+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
375 -+ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
376 -+ el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@,
377 -+ il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177,
378 -+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
379 -+ kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
380 -+ knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
381 -+ ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
382 -+ sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
383 -+ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
384 -+ sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
385 -+ u6=\E[%i%d;%dR, u7=\E[6n,
386 -+
387 - # Entries for use by the `screen' program by Juergen Weigert,
388 - # Michael Schroeder, Oliver Laumann. The screen and
389 - # screen-w entries came with version 3.7.1. The screen2 and screen3 entries
390 -@@ -21795,6 +21815,9 @@
391 - # * change several \E[2g (clear tab at current column) to \E[3g
392 - # (clear all tabs) to match definition for tbc capability -TD
393 - #
394 -+# 2008-11-29
395 -+# * add eterm-color -TD
396 -+#
397 - # The following sets edit modes for GNU EMACS.
398 - # Local Variables:
399 - # fill-prefix:"\t"
400
401 diff --git a/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch b/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch
402 deleted file mode 100644
403 index d2575fd45c..0000000000
404 --- a/sys-libs/ncurses/files/ncurses-5.7-hashdb-open.patch
405 +++ /dev/null
406 @@ -1,88 +0,0 @@
407 -http://bugs.gentoo.org/245370
408 -
409 -ripped from ncurses-5.7-20081213.patch
410 -
411 -20081213
412 - + add check for failure to open hashed-database needed for db4.6
413 - (GenToo #245370).
414 -
415 ---- ncurses-5.7-20081206+/ncurses/tinfo/hashed_db.c 2006-08-19 19:48:38.000000000 +0000
416 -+++ ncurses-5.7-20081213/ncurses/tinfo/hashed_db.c 2008-12-13 20:59:02.000000000 +0000
417 -@@ -49,27 +49,30 @@
418 - _nc_db_open(const char *path, bool modify)
419 - {
420 - DB *result = 0;
421 -+ int code;
422 -
423 - #if HASHED_DB_API >= 4
424 - db_create(&result, NULL, 0);
425 -- result->open(result,
426 -- NULL,
427 -- path,
428 -- NULL,
429 -- DB_HASH,
430 -- modify ? DB_CREATE : DB_RDONLY,
431 -- 0644);
432 -+ if ((code = result->open(result,
433 -+ NULL,
434 -+ path,
435 -+ NULL,
436 -+ DB_HASH,
437 -+ modify ? DB_CREATE : DB_RDONLY,
438 -+ 0644)) != 0) {
439 -+ result = 0;
440 -+ }
441 - #elif HASHED_DB_API >= 3
442 - db_create(&result, NULL, 0);
443 -- result->open(result,
444 -- path,
445 -- NULL,
446 -- DB_HASH,
447 -- modify ? DB_CREATE : DB_RDONLY,
448 -- 0644);
449 -+ if ((code = result->open(result,
450 -+ path,
451 -+ NULL,
452 -+ DB_HASH,
453 -+ modify ? DB_CREATE : DB_RDONLY,
454 -+ 0644)) != 0) {
455 -+ result = 0;
456 -+ }
457 - #elif HASHED_DB_API >= 2
458 -- int code;
459 --
460 - if ((code = db_open(path,
461 - DB_HASH,
462 - modify ? DB_CREATE : DB_RDONLY,
463 -@@ -77,21 +80,22 @@
464 - (DB_ENV *) 0,
465 - (DB_INFO *) 0,
466 - &result)) != 0) {
467 -- T(("cannot open %s: %s", path, strerror(code)));
468 - result = 0;
469 -- } else {
470 -- T(("opened %s", path));
471 - }
472 - #else
473 -- result = dbopen(path,
474 -- modify ? (O_CREAT | O_RDWR) : O_RDONLY,
475 -- 0644,
476 -- DB_HASH,
477 -- NULL);
478 -+ if ((result = dbopen(path,
479 -+ modify ? (O_CREAT | O_RDWR) : O_RDONLY,
480 -+ 0644,
481 -+ DB_HASH,
482 -+ NULL)) == 0) {
483 -+ code = errno;
484 -+ }
485 -+#endif
486 - if (result != 0) {
487 - T(("opened %s", path));
488 -+ } else {
489 -+ T(("cannot open %s: %s", path, strerror(code)));
490 - }
491 --#endif
492 - return result;
493 - }
494 -
495
496 diff --git a/sys-libs/ncurses/files/ncurses-5.7-irix.patch b/sys-libs/ncurses/files/ncurses-5.7-irix.patch
497 deleted file mode 100644
498 index 1cc09e9669..0000000000
499 --- a/sys-libs/ncurses/files/ncurses-5.7-irix.patch
500 +++ /dev/null
501 @@ -1,40 +0,0 @@
502 -http://bugs.gentoo.org/show_bug.cgi?id=262118
503 -
504 ---- test/Makefile.dist 2009-02-25 15:26:35.226306680 +0000
505 -+++ test/Makefile 2009-02-25 16:33:38.145363000 +0000
506 -@@ -241,7 +241,7 @@ $(destdir)demo_termcap$x: $(MODEL)/demo_
507 - $(LINK) -o $@ $(MODEL)/demo_termcap$o $(LDFLAGS_TINFO)
508 -
509 - $(destdir)ditto$x: $(MODEL)/ditto$o $(LOCAL_LIBS)
510 -- $(LINK) -o $@ $(MODEL)/ditto$o $(LDFLAGS_THREADS)
511 -+ $(LINK) -o $@ $(MODEL)/ditto$o $(MODEL)/use_screen$o $(LDFLAGS_THREADS)
512 -
513 - $(destdir)dots$x: $(MODEL)/dots$o $(LOCAL_LIBS)
514 - $(LINK) -o $@ $(MODEL)/dots$o $(LDFLAGS_TINFO)
515 -@@ -310,7 +310,7 @@ $(destdir)railroad$x: $(MODEL)/railroad$
516 - $(LINK) -o $@ $(MODEL)/railroad$o $(LDFLAGS_TINFO)
517 -
518 - $(destdir)rain$x: $(MODEL)/rain$o $(LOCAL_LIBS)
519 -- $(LINK) -o $@ $(MODEL)/rain$o $(LDFLAGS_THREADS)
520 -+ $(LINK) -o $@ $(MODEL)/rain$o $(MODEL)/use_window$o $(LDFLAGS_THREADS)
521 -
522 - $(destdir)redraw$x: $(MODEL)/redraw$o $(LOCAL_LIBS)
523 - $(LINK) -o $@ $(MODEL)/redraw$o $(LDFLAGS_CURSES)
524 -@@ -337,7 +337,7 @@ $(destdir)test_inwstr$x: $(MODEL)/test_i
525 - $(LINK) -o $@ $(MODEL)/test_inwstr$o $(LDFLAGS_CURSES)
526 -
527 - $(destdir)test_opaque$x: $(MODEL)/test_opaque$o $(LOCAL_LIBS)
528 -- $(LINK) -o $@ $(MODEL)/test_opaque$o $(LDFLAGS_CURSES)
529 -+ $(LINK) -o $@ $(MODEL)/test_opaque$o $(TEST_ARGS) $(LDFLAGS_CURSES)
530 -
531 - $(destdir)testaddch$x: $(MODEL)/testaddch$o $(LOCAL_LIBS)
532 - $(LINK) -o $@ $(MODEL)/testaddch$o $(LDFLAGS_CURSES)
533 -@@ -352,7 +352,7 @@ $(destdir)view$x: $(MODEL)/view$o $(LOCA
534 - $(LINK) -o $@ $(MODEL)/view$o $(LDFLAGS_CURSES)
535 -
536 - $(destdir)worm$x: $(MODEL)/worm$o $(LOCAL_LIBS)
537 -- $(LINK) -o $@ $(MODEL)/worm$o $(LDFLAGS_THREADS)
538 -+ $(LINK) -o $@ $(MODEL)/worm$o $(MODEL)/use_window$o $(LDFLAGS_THREADS)
539 -
540 - $(destdir)xmas$x: $(MODEL)/xmas$o $(LOCAL_LIBS)
541 - $(LINK) -o $@ $(MODEL)/xmas$o $(LDFLAGS_CURSES)
542
543 diff --git a/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch b/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch
544 deleted file mode 100644
545 index f48d9bc084..0000000000
546 --- a/sys-libs/ncurses/files/ncurses-5.7-ldflags-with-libtool.patch
547 +++ /dev/null
548 @@ -1,22 +0,0 @@
549 ---- mk-1st.awk.orig 2009-07-07 12:01:15.000000000 +0200
550 -+++ mk-1st.awk 2009-07-07 12:02:40.000000000 +0200
551 -@@ -386,7 +386,7 @@
552 - }
553 - end_name = lib_name;
554 - printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
555 -- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
556 -+ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST) $(LDFLAGS)\n", compile, lib_name, OBJS
557 - print ""
558 - print "install \\"
559 - print "install.libs \\"
560 ---- c++/Makefile.in.orig 2007-04-28 17:29:12.000000000 +0200
561 -+++ c++/Makefile.in 2009-07-07 16:56:15.000000000 +0200
562 -@@ -160,7 +160,7 @@
563 - cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
564 - -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
565 - -rpath $(INSTALL_PREFIX)$(libdir) \
566 -- -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
567 -+ -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST)
568 -
569 - OBJS_DEMO = $(MODEL)/demo$o
570 -
571
572 diff --git a/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch b/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch
573 deleted file mode 100644
574 index c8489c5bf6..0000000000
575 --- a/sys-libs/ncurses/files/ncurses-5.7-mint-terminfo.patch
576 +++ /dev/null
577 @@ -1,175 +0,0 @@
578 -https://savannah.gnu.org/bugs/index.php?29268
579 -http://bugs.gentoo.org/show_bug.cgi?id=310267
580 -
581 -applied upstream, hence should be able to go next release
582 -
583 -
584 ---- ncurses-5.7/misc/terminfo.src 2010-03-19 17:24:49.000000000 +0000
585 -+++ ncurses-5.7-mint/misc/terminfo.src 2010-03-19 17:45:18.000000000 +0000
586 -@@ -657,6 +657,123 @@
587 - #### ANSI console types
588 - #
589 -
590 -+#############################################################################
591 -+#
592 -+# Atari ST terminals.
593 -+# From Guido Flohr <gufl0000@×××××××××××.de>.
594 -+#
595 -+tw52|tw52-color|Toswin window manager with color,
596 -+ colors#16, pairs#256,
597 -+ setaf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
598 -+ setab=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
599 -+ setf=\Eb%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
600 -+ setb=\Ec%?%p1%{0}%=%t?%e%p1%{7}%=%t0%e%p1%{15}%=%t7%e%p1%{48}%+%c,
601 -+ bce,
602 -+ oc=\Eb?\Ec0, op=\Eb?\Ec0,
603 -+ use=tw52-m,
604 -+tw52-m|Toswin window manager monochrome,
605 -+ ma#999,
606 -+ dch1=\Ea,
607 -+ smso=\EyQ, rmso=\EzQ, smul=\EyH, rmul=\EzH,
608 -+ bold=\Eya, dim=\EyB, rev=\EyP, sgr0=\Ez_,
609 -+ ul,
610 -+ is2=\Ev\Eq\Ez_\Ee\Ei\Eb?\Ec0, rs2=\Ev\Eq\Ez_\Ee\Ei\Eb?\Ec0,
611 -+ use=at-m,
612 -+tt52|Atari TT medium and high resolution,
613 -+ lines#30,
614 -+ use=at-color,
615 -+st52-color|at-color|atari-color|atari_st-color|Atari ST with color,
616 -+ colors#16, pairs#256,
617 -+ setaf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?,
618 -+ setab=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?,
619 -+ setf=\Eb%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?,
620 -+ setb=\Ec%?%p1%{0}%=%t1%e%p1%{1}%=%t2%e%p1%{2}%=%t3%e%p1%{3}%=%t>%e%p1%{4}%=%t4%e%p1%{5}%=%t7%e%p1%{6}%=%t5%e%p1%{7}%=%t0%e%p1%{8}%=%t8%e%p1%{9}%=%t9%e%p1%{10}%=%t\072%e%p1%{11}%=%t\073%e%p1%{12}%=%t<%e%p1%{13}%=%t\075%e%p1%{14}%=%t6%e?,
621 -+ is2=\Ev\Eq\Ee\Eb1\Ec0, rs2=\Ev\Eq\Ee\Eb1\Ec0,
622 -+ bce,
623 -+ use=st52,
624 -+st52|st52-m|at|at-m|atari|atari-m|atari_st|atarist-m|Atari ST,
625 -+ am, clear=\EE,
626 -+ el1=\Eo, il1=\EL, dl1=\EM, mir,
627 -+ smso=\Ep, rmso=\Eq,
628 -+ rev=\Ep, sgr0=\Eq,
629 -+ civis=\Ef, cnorm=\Ee, eo,
630 -+ kcub1=\ED, kcuf1=\EC, kcuu1=\EA, kcud1=\EB, khome=\EE,
631 -+ kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\ES, kf5=\ET,
632 -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, kf10=\EY,
633 -+ kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et,
634 -+ kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf20=\Ey,
635 -+ kbs=^H, kdch1=\177, kich1=\EI, knp=\Eb, kpp=\Ea,
636 -+ khlp=\EH, kLFT=\Ed, kRIT=\Ec, kund=\EK,
637 -+ is2=\Ev\Eq\Ee, rs2=\Ev\Eq\Ee, sc=\Ej, rc=\Ek,
638 -+ npc,
639 -+ cols#80, it#8, lines#24,
640 -+ bel=^G, cr=^M, el=\EK, ed=\EJ,
641 -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cud1=\EB, home=\EH,
642 -+ cub1=\ED, cuf1=\EC, cuu1=\EA, kbs=^H,
643 -+ nel=^M^J, ind=^J,
644 -+ ri=\EI, ht=^I,
645 -+tw100|toswin vt100 window mgr,
646 -+ eo, mir, msgr, xon,
647 -+ colors#8, cols#80, it#8, lines#24, pairs#64, vt#3,
648 -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\,\,hhII00,
649 -+ bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
650 -+ clear=\E[2J\E[H, cnorm=\Ee, cr=^M, csr=\E[%i%p1%d;%p2%dr,
651 -+ cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\EB,
652 -+ cuf=\E[%p1%dC, cuf1=\EC, cup=\E[%i%p1%d;%p2%dH,
653 -+ cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea, dim=\E[2m, dl=\E[%p1%dM,
654 -+ dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
655 -+ hts=\EH, ich=\E[%p1%d@, il1=\EL, ind=^J, is2=\E<\E)0,
656 -+ kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
657 -+ kdch1=\177, kf1=\EOP, kf10=\EOY, kf11=\Ep, kf12=\Eq,
658 -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
659 -+ kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS, kf5=\EOT,
660 -+ kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
661 -+ khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK,
662 -+ ll=\E[24H, nel=\EE, op=\E[30;47m, oc=\E[30;47m, rc=\E8, rev=\E[7m, ri=\EM,
663 -+ rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
664 -+ rmso=\E[m, rmul=\E[m,
665 -+ rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>,
666 -+ sc=\E7,
667 -+ setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m,
668 -+ setf=\E[3%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=%t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'%=%t3%e7%;m,
669 -+ sgr0=\E[m,
670 -+ smacs=^N, smcup=\E[?7l, smir=\Eh, smkx=\E[?1h\E=,
671 -+ smso=\E[7m, smul=\E[4m, tbc=\E[3g,
672 -+# The entries for stv52 and stv52pc probably need a revision.
673 -+stv52|MiNT virtual console,
674 -+ am, msgr,
675 -+ cols#80, it#8, lines#30,
676 -+ bel=^G, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee,
677 -+ cr=^M, cub1=^H, cud1=\EB, cuf1=\EC,
678 -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.",
679 -+ dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL,
680 -+ ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
681 -+ kcuu1=\EA, kdch1=\177, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq,
682 -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
683 -+ kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET,
684 -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE,
685 -+ kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>,
686 -+ rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq,
687 -+ rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_,
688 -+ smso=\Ep, smul=\EyH, dim=\Em, blink=\Er, op=\Eb@\EcO,
689 -+stv52pc|MiNT virtual console with PC charset,
690 -+ am, msgr,
691 -+ cols#80, it#8, lines#30,
692 -+ acsc=`\177a\260f\370g\361j\331k\277l\332m\300n\305o\377p-q\304r-s_t+u+v+w+x\263y\363z\362{\343|\366}\234~\371.v-\^+\257\,\256h\261I\3740\333,
693 -+ bel=^G, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee,
694 -+ cr=^M, cub1=^H, cud1=\EB, cuf1=\EC,
695 -+ cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.",
696 -+ dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL,
697 -+ ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
698 -+ kcuu1=\EA, kdch1=\177, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq,
699 -+ kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
700 -+ kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET,
701 -+ kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE,
702 -+ kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>,
703 -+ rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq,
704 -+ rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_,
705 -+ smso=\Ep, smul=\EyH, dim=\Em, blink=\Er,
706 -+
707 - #### BeOS
708 - #
709 - # BeOS entry for Terminal program Seems to be almost ANSI
710 -@@ -17249,42 +17366,6 @@
711 - lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg, rmso=\ER@, sgr0=\ER@,
712 - smacs=\ERG, smso=\ERD,
713 -
714 --#### Atari ST
715 --#
716 --
717 --# From: Simson L. Garfinkel <simsong@×××××××××××××.edu>
718 --atari|atari st,
719 -- OTbs, am,
720 -- cols#80, it#8, lines#25,
721 -- clear=\EH\EJ, cub1=\ED, cud1=\EB, cuf1=\EC,
722 -- cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM,
723 -- ed=\EJ, el=\EK, ht=^I, il1=\EL, kcub1=\ED, kcud1=\EB,
724 -- kcuf1=\EC, kcuu1=\EA, ri=\EI, rmso=\Eq, sgr0=\Eq, smso=\Ep,
725 --# UniTerm terminal program for the Atari ST: 49-line VT220 emulation mode
726 --# From: Paul M. Aoki <aoki@×××××××××××××××.edu>
727 --uniterm|uniterm49|UniTerm VT220 emulator with 49 lines,
728 -- lines#49,
729 -- is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H,
730 -- use=vt220,
731 --# MiNT VT52 emulation. 80 columns, 25 rows.
732 --# MiNT is Now TOS, the operating system which comes with all Ataris now
733 --# (mainly Atari Falcon). This termcap is for the VT52 emulation you get
734 --# under tcsh/zsh/bash/sh/ksh/ash/csh when you run MiNT in `console' mode
735 --# From: Per Persson <pp@××××××××××.edu>, 27 Feb 1996
736 --st52|Atari ST with VT52 emulation,
737 -- am, km,
738 -- cols#80, lines#25,
739 -- bel=^G, civis=\Ef, clear=\EH\EJ, cnorm=\Ee, cr=^M, cub1=\ED,
740 -- cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
741 -- cuu1=\EA, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL,
742 -- ind=^J, ka1=\E#7, ka3=\E#5, kb2=\E#9, kbs=^H, kc1=\E#1,
743 -- kc3=\E#3, kclr=\E#7, kcub1=\E#K, kcud1=\E#P, kcuf1=\E#M,
744 -- kcuu1=\E#H, kf0=\E#D, kf1=\E#;, kf2=\E#<, kf3=\E#=, kf4=\E#>,
745 -- kf5=\E#?, kf6=\E#@, kf7=\E#A, kf8=\E#B, kf9=\E#C, khome=\E#G,
746 -- kil1=\E#R, kind=\E#2, kri=\E#8, lf0=f10, nel=^M^J, rc=\Ek,
747 -- ri=\EI, rmcup=, rmso=\Eq, rs1=\Ez_\Eb@\EcA, sc=\Ej, sgr0=\Eq,
748 -- smcup=\Ee, smso=\Ep,
749 --
750 - #### Commodore Business Machines
751 - #
752 - # Formerly located in West Chester, PA; went spectacularly bust in 1994
753
754 diff --git a/sys-libs/ncurses/files/ncurses-5.7-mint.patch b/sys-libs/ncurses/files/ncurses-5.7-mint.patch
755 deleted file mode 100644
756 index e76899b2d8..0000000000
757 --- a/sys-libs/ncurses/files/ncurses-5.7-mint.patch
758 +++ /dev/null
759 @@ -1,13 +0,0 @@
760 -https://savannah.gnu.org/support/index.php?106655
761 -
762 ---- configure.old 2009-04-07 17:36:12.000000000 +0000
763 -+++ configure 2009-04-07 17:36:32.000000000 +0000
764 -@@ -6233,7 +6233,7 @@
765 - irix[56].*) #(vi
766 - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
767 - ;;
768 --linux*|gnu*|k*bsd*-gnu) #(vi
769 -+linux*|gnu*|k*bsd*-gnu|mint*) #(vi
770 -
771 - echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
772 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
773
774 diff --git a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch
775 deleted file mode 100644
776 index 1d45083588..0000000000
777 --- a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode-9.09.patch
778 +++ /dev/null
779 @@ -1,189 +0,0 @@
780 -Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
781 -
782 -Providing this in ncurses makes it widely available, much better than having to
783 -install rxvt-unicode everywhere.
784 -
785 -http://bugs.gentoo.org/show_bug.cgi?id=192083
786 -
787 -This patch uses the updated rxvt-unicode-9.09 terminfo
788 -which adds support for 256 colors.
789 -
790 ---- misc/terminfo.src
791 -+++ misc/terminfo.src
792 -@@ -3965,6 +3965,176 @@
793 - rxvt-16color|xterm with 16 colors like aixterm,
794 - ncv#32, use=ibm+16color, use=rxvt,
795 -
796 -+# From: Thomas Dickey <dickey@×××××.net> 04 Oct 1997
797 -+# Updated: Özgür Kesim <kesim@××××××××××××××.de> 02 Nov 1997
798 -+# Updated: Marc Lehmann <pcg@××××.com>, 17 Feb 2005
799 -+# Updated: Marc Lehmann <schmorp@×××××××.de>, 04 Nov 2008: change init/reset sequences
800 -+rxvt-unicode|rxvt-unicode terminal (X Window System),
801 -+ am,
802 -+ bce,
803 -+ eo,
804 -+ km,
805 -+ msgr,
806 -+ xenl,
807 -+ hs,
808 -+ cols#80,
809 -+ it#8,
810 -+ lines#24,
811 -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
812 -+ bel=^G,
813 -+ blink=\E[5m,
814 -+ bold=\E[1m,
815 -+ civis=\E[?25l,
816 -+ clear=\E[H\E[2J,
817 -+ cnorm=\E[?25h,
818 -+ cr=^M,
819 -+ csr=\E[%i%p1%d;%p2%dr,
820 -+ cub=\E[%p1%dD,
821 -+ cub1=^H,
822 -+ cud=\E[%p1%dB,
823 -+ cud1=^J,
824 -+ cuf=\E[%p1%dC,
825 -+ cuf1=\E[C,
826 -+ cup=\E[%i%p1%d;%p2%dH,
827 -+ cuu=\E[%p1%dA,
828 -+ cuu1=\E[A,
829 -+ cvvis=\E[?25h,
830 -+ dch=\E[%p1%dP,
831 -+ dch1=\E[P,
832 -+ dl=\E[%p1%dM,
833 -+ dl1=\E[M,
834 -+ ed=\E[J,
835 -+ el=\E[K,
836 -+ el1=\E[1K,
837 -+ flash=\E[?5h$<20/>\E[?5l,
838 -+ home=\E[H,
839 -+ hpa=\E[%i%p1%dG,
840 -+ ht=^I,
841 -+ hts=\EH,
842 -+ ich=\E[%p1%d@,
843 -+ ich1=\E[@,
844 -+ il=\E[%p1%dL,
845 -+ il1=\E[L,
846 -+ ind=^J,
847 -+ is1=\E[\041p,
848 -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
849 -+ kDC=\E[3$,
850 -+ kIC=\E2$,
851 -+ kEND=\E[8$,
852 -+ kHOM=\E[7$,
853 -+ kLFT=\E[d,
854 -+ kNXT=\E[6$,
855 -+ kPRV=\E[5$,
856 -+ kRIT=\E[c,
857 -+ kbs=\177,
858 -+ ka1=\EOw,
859 -+ ka3=\EOy,
860 -+ kb2=\EOu,
861 -+ kc1=\EOq,
862 -+ kc3=\EOs,
863 -+ kcbt=\E[Z,
864 -+ kcub1=\E[D,
865 -+ kcud1=\E[B,
866 -+ kcuf1=\E[C,
867 -+ kcuu1=\E[A,
868 -+ kdch1=\E[3~,
869 -+ kel=\E[8\^,
870 -+ kend=\E[8~,
871 -+ kent=\EOM,
872 -+ kf1=\E[11~,
873 -+ kf10=\E[21~,
874 -+ kf11=\E[23~,
875 -+ kf12=\E[24~,
876 -+ kf13=\E[25~,
877 -+ kf14=\E[26~,
878 -+ kf15=\E[28~,
879 -+ kf16=\E[29~,
880 -+ kf17=\E[31~,
881 -+ kf18=\E[32~,
882 -+ kf19=\E[33~,
883 -+ kf2=\E[12~,
884 -+ kf20=\E[34~,
885 -+ kf3=\E[13~,
886 -+ kf4=\E[14~,
887 -+ kf5=\E[15~,
888 -+ kf6=\E[17~,
889 -+ kf7=\E[18~,
890 -+ kf8=\E[19~,
891 -+ kf9=\E[20~,
892 -+ kfnd=\E[1~,
893 -+ khome=\E[7~,
894 -+ kich1=\E[2~,
895 -+ kmous=\E[M,
896 -+ knp=\E[6~,
897 -+ kpp=\E[5~,
898 -+ kslt=\E[4~,
899 -+ rc=\E8,
900 -+ rev=\E[7m,
901 -+ ri=\EM,
902 -+ rmso=\E[27m,
903 -+ rmul=\E[24m,
904 -+ rs1=\Ec,
905 -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
906 -+ sgr0=\E[m\E(B,
907 -+ enacs=,
908 -+ smacs=\E(0,
909 -+ rmacs=\E(B,
910 -+ smso=\E[7m,
911 -+ smul=\E[4m,
912 -+ tbc=\E[3g,
913 -+ vpa=\E[%i%p1%dd,
914 -+ colors#88,
915 -+ pairs#7744,
916 -+ btns#5,
917 -+ lm#0,
918 -+ ccc,
919 -+ npc,
920 -+ mc5i,
921 -+ ncv#0,
922 -+ mir,
923 -+ xon,
924 -+ bw,
925 -+ ech=\E[%p1%dX,
926 -+ mc0=\E[i,
927 -+ mc4=\E[4i,
928 -+ mc5=\E[5i,
929 -+ sitm=\E[3m,
930 -+ ritm=\E[23m,
931 -+ smam=\E[?7h,
932 -+ rmam=\E[?7l,
933 -+ smir=\E[4h,
934 -+ rmir=\E[4l,
935 -+ smcup=\E[?1049h,
936 -+ rmcup=\E[r\E[?1049l,
937 -+ smkx=\E=,
938 -+ rmkx=\E>,
939 -+ indn=\E[%p1%dS,
940 -+ rin=\E[%p1%dT,
941 -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
942 -+ op=\E[39;49m,
943 -+ setaf=\E[38;5;%p1%dm,
944 -+ setab=\E[48;5;%p1%dm,
945 -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
946 -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
947 -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
948 -+ sc=\E7,
949 -+ s0ds=\E(B,
950 -+ s1ds=\E(0,
951 -+ s2ds=\E*B,
952 -+ s3ds=\E+B,
953 -+ u6=\E[%i%d;%dR,
954 -+ u7=\E[6n,
955 -+ u8=\E[?1;2c,
956 -+ u9=\E[c,
957 -+ tsl=\E]2;,
958 -+ fsl=\007,
959 -+ dsl=\E]2;\007,
960 -+
961 -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
962 -+ colors#256,
963 -+ pairs#32767,
964 -+ use=rxvt-unicode,
965 -+
966 - # mrxvt 0.5.3
967 - #
968 - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
969
970 diff --git a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch
971 deleted file mode 100644
972 index ee9b135ef9..0000000000
973 --- a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch
974 +++ /dev/null
975 @@ -1,174 +0,0 @@
976 ---- misc/terminfo.src.old 2009-10-27 21:02:05.413714694 +0200
977 -+++ misc/terminfo.src 2009-10-27 21:02:07.637734809 +0200
978 -@@ -3965,6 +3965,171 @@
979 - rxvt-16color|xterm with 16 colors like aixterm,
980 - ncv#32, use=ibm+16color, use=rxvt,
981 -
982 -+# From: Thomas Dickey <dickey@×××××.net> 04 Oct 1997
983 -+# Updated: Özgür Kesim <kesim@××××××××××××××.de> 02 Nov 1997
984 -+# Updated: Marc Lehmann <pcg@××××.com>, 17 Feb 2005
985 -+# Updated: Marc Lehmann <schmorp@×××××××.de>, 04 Nov 2008: change init/reset sequences
986 -+rxvt-unicode|rxvt-unicode terminal (X Window System),
987 -+ am,
988 -+ bce,
989 -+ eo,
990 -+ km,
991 -+ msgr,
992 -+ xenl,
993 -+ hs,
994 -+ cols#80,
995 -+ it#8,
996 -+ lines#24,
997 -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
998 -+ bel=^G,
999 -+ blink=\E[5m,
1000 -+ bold=\E[1m,
1001 -+ civis=\E[?25l,
1002 -+ clear=\E[H\E[2J,
1003 -+ cnorm=\E[?25h,
1004 -+ cr=^M,
1005 -+ csr=\E[%i%p1%d;%p2%dr,
1006 -+ cub=\E[%p1%dD,
1007 -+ cub1=^H,
1008 -+ cud=\E[%p1%dB,
1009 -+ cud1=^J,
1010 -+ cuf=\E[%p1%dC,
1011 -+ cuf1=\E[C,
1012 -+ cup=\E[%i%p1%d;%p2%dH,
1013 -+ cuu=\E[%p1%dA,
1014 -+ cuu1=\E[A,
1015 -+ cvvis=\E[?25h,
1016 -+ dch=\E[%p1%dP,
1017 -+ dch1=\E[P,
1018 -+ dl=\E[%p1%dM,
1019 -+ dl1=\E[M,
1020 -+ ed=\E[J,
1021 -+ el=\E[K,
1022 -+ el1=\E[1K,
1023 -+ flash=\E[?5h$<20/>\E[?5l,
1024 -+ home=\E[H,
1025 -+ hpa=\E[%i%p1%dG,
1026 -+ ht=^I,
1027 -+ hts=\EH,
1028 -+ ich=\E[%p1%d@,
1029 -+ ich1=\E[@,
1030 -+ il=\E[%p1%dL,
1031 -+ il1=\E[L,
1032 -+ ind=^J,
1033 -+ is1=\E[\041p,
1034 -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
1035 -+ kDC=\E[3$,
1036 -+ kIC=\E2$,
1037 -+ kEND=\E[8$,
1038 -+ kHOM=\E[7$,
1039 -+ kLFT=\E[d,
1040 -+ kNXT=\E[6$,
1041 -+ kPRV=\E[5$,
1042 -+ kRIT=\E[c,
1043 -+ kbs=\177,
1044 -+ ka1=\EOw,
1045 -+ ka3=\EOy,
1046 -+ kb2=\EOu,
1047 -+ kc1=\EOq,
1048 -+ kc3=\EOs,
1049 -+ kcbt=\E[Z,
1050 -+ kcub1=\E[D,
1051 -+ kcud1=\E[B,
1052 -+ kcuf1=\E[C,
1053 -+ kcuu1=\E[A,
1054 -+ kdch1=\E[3~,
1055 -+ kel=\E[8\^,
1056 -+ kend=\E[8~,
1057 -+ kent=\EOM,
1058 -+ kf1=\E[11~,
1059 -+ kf10=\E[21~,
1060 -+ kf11=\E[23~,
1061 -+ kf12=\E[24~,
1062 -+ kf13=\E[25~,
1063 -+ kf14=\E[26~,
1064 -+ kf15=\E[28~,
1065 -+ kf16=\E[29~,
1066 -+ kf17=\E[31~,
1067 -+ kf18=\E[32~,
1068 -+ kf19=\E[33~,
1069 -+ kf2=\E[12~,
1070 -+ kf20=\E[34~,
1071 -+ kf3=\E[13~,
1072 -+ kf4=\E[14~,
1073 -+ kf5=\E[15~,
1074 -+ kf6=\E[17~,
1075 -+ kf7=\E[18~,
1076 -+ kf8=\E[19~,
1077 -+ kf9=\E[20~,
1078 -+ kfnd=\E[1~,
1079 -+ khome=\E[7~,
1080 -+ kich1=\E[2~,
1081 -+ kmous=\E[M,
1082 -+ knp=\E[6~,
1083 -+ kpp=\E[5~,
1084 -+ kslt=\E[4~,
1085 -+ rc=\E8,
1086 -+ rev=\E[7m,
1087 -+ ri=\EM,
1088 -+ rmso=\E[27m,
1089 -+ rmul=\E[24m,
1090 -+ rs1=\Ec,
1091 -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
1092 -+ sgr0=\E[m\017,
1093 -+ enacs=,
1094 -+ smacs=\E(0,
1095 -+ rmacs=\E(B,
1096 -+ smso=\E[7m,
1097 -+ smul=\E[4m,
1098 -+ tbc=\E[3g,
1099 -+ vpa=\E[%i%p1%dd,
1100 -+ colors#88,
1101 -+ pairs#256,
1102 -+ btns#5,
1103 -+ lm#0,
1104 -+ ccc,
1105 -+ npc,
1106 -+ mc5i,
1107 -+ ncv#0,
1108 -+ mir,
1109 -+ xon,
1110 -+ bw,
1111 -+ ech=\E[%p1%dX,
1112 -+ mc0=\E[i,
1113 -+ mc4=\E[4i,
1114 -+ mc5=\E[5i,
1115 -+ sitm=\E[3m,
1116 -+ ritm=\E[23m,
1117 -+ smam=\E[?7h,
1118 -+ rmam=\E[?7l,
1119 -+ smir=\E[4h,
1120 -+ rmir=\E[4l,
1121 -+ smcup=\E[?1049h,
1122 -+ rmcup=\E[r\E[?1049l,
1123 -+ smkx=\E=,
1124 -+ rmkx=\E>,
1125 -+ indn=\E[%p1%dS,
1126 -+ rin=\E[%p1%dT,
1127 -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
1128 -+ op=\E[39;49m,
1129 -+ setaf=\E[38;5;%p1%dm,
1130 -+ setab=\E[48;5;%p1%dm,
1131 -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
1132 -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
1133 -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
1134 -+ sc=\E7,
1135 -+ s0ds=\E(B,
1136 -+ s1ds=\E(0,
1137 -+ s2ds=\E*B,
1138 -+ s3ds=\E+B,
1139 -+ u6=\E[%i%d;%dR,
1140 -+ u7=\E[6n,
1141 -+ u8=\E[?1;2c,
1142 -+ u9=\E[c,
1143 -+ tsl=\E]2;,
1144 -+ fsl=\007,
1145 -+ dsl=\E]2;\007,
1146 -+
1147 - # mrxvt 0.5.3
1148 - #
1149 - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
1150
1151 diff --git a/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch b/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch
1152 deleted file mode 100644
1153 index a57cd78c77..0000000000
1154 --- a/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch
1155 +++ /dev/null
1156 @@ -1,58 +0,0 @@
1157 -use $cross_compiling that autotools already set up rather than trying to
1158 -do a custom & fragile job with compiler names
1159 -
1160 -configure.in also needs AC_SUBST(cross_compiling) ...
1161 -
1162 -http://bugs.gentoo.org/288881
1163 -
1164 ---- a/configure
1165 -+++ b/configure
1166 -@@ -17300,6 +17300,7 @@
1167 - s,@build_alias@,$build_alias,;t t
1168 - s,@host_alias@,$host_alias,;t t
1169 - s,@target_alias@,$target_alias,;t t
1170 -+s,@cross_compiling@,$cross_compiling,;t t
1171 - s,@ECHO_C@,$ECHO_C,;t t
1172 - s,@ECHO_N@,$ECHO_N,;t t
1173 - s,@ECHO_T@,$ECHO_T,;t t
1174 ---- a/misc/run_tic.in
1175 -+++ b/misc/run_tic.in
1176 -@@ -52,8 +52,7 @@
1177 - : ${ticdir=@TERMINFO@}
1178 - : ${source=@TERMINFO_SRC@}
1179 - : ${LN_S="@LN_S@"}
1180 --: ${THAT_CC=cc}
1181 --: ${THIS_CC=cc}
1182 -+: ${cross_compiling=@cross_compiling@}
1183 - : ${ext_funcs=@NCURSES_EXT_FUNCS@}
1184 -
1185 - test -z "${DESTDIR}" && DESTDIR=
1186 -@@ -61,7 +60,7 @@
1187 - # Allow tic to run either from the install-path, or from the build-directory.
1188 - # Do not do this if we appear to be cross-compiling. In that case, we rely
1189 - # on the host's copy of tic to compile the terminfo database.
1190 --if test "$THAT_CC" = "$THIS_CC" ; then
1191 -+if test "$cross_compiling" != "yes" ; then
1192 - case "$PATH" in
1193 - :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
1194 - *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
1195 ---- a/misc/Makefile.in
1196 -+++ b/misc/Makefile.in
1197 -@@ -59,6 +59,7 @@
1198 -
1199 - CC = @CC@
1200 - HOSTCC = @BUILD_CC@
1201 -+cross_compiling = @cross_compiling@
1202 -
1203 - tabsetdir = $(datadir)/tabset
1204 - ticdir = @TERMINFO@
1205 -@@ -91,8 +92,7 @@
1206 - datadir=${datadir} \
1207 - ticdir=${ticdir} \
1208 - source=terminfo.tmp \
1209 -- THIS_CC="$(CC)" \
1210 -- THAT_CC="$(HOSTCC)" \
1211 -+ cross_compiling="${cross_compiling}" \
1212 - $(SHELL) ./run_tic.sh
1213 - @cd $(srcdir)/tabset && \
1214 - $(SHELL) -c 'for i in * ; do \
1215
1216 diff --git a/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch b/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch
1217 deleted file mode 100644
1218 index 5c86d27c58..0000000000
1219 --- a/sys-libs/ncurses/files/ncurses-5.7-x64-freebsd.patch
1220 +++ /dev/null
1221 @@ -1,27 +0,0 @@
1222 -* add back -DPIC for vanilla FreeBSD (64-bits) that got destroyed by the
1223 - gfbsd patch
1224 -
1225 ---- ncurses-5.7/aclocal.m4
1226 -+++ ncurses-5.7/aclocal.m4
1227 -@@ -4289,6 +4289,9 @@
1228 - cf_cv_rm_so_locs=yes
1229 - ;;
1230 - linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*)
1231 -+ case $cf_cv_system_name in
1232 -+ *bsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" ;;
1233 -+ esac
1234 - if test "$DFT_LWR_MODEL" = "shared" ; then
1235 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
1236 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
1237 ---- ncurses-5.7/configure
1238 -+++ ncurses-5.7/configure
1239 -@@ -5107,6 +5107,9 @@
1240 - cf_cv_rm_so_locs=yes
1241 - ;;
1242 - linux*|gnu*|k*bsd*-gnu|netbsd*|freebsd*|dragonfly*)
1243 -+ case $cf_cv_system_name in
1244 -+ *bsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" ;;
1245 -+ esac
1246 - if test "$DFT_LWR_MODEL" = "shared" ; then
1247 - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
1248 - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
1249
1250 diff --git a/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch
1251 deleted file mode 100644
1252 index 33a3b0d848..0000000000
1253 --- a/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch
1254 +++ /dev/null
1255 @@ -1,189 +0,0 @@
1256 -Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
1257 -
1258 -Providing this in ncurses makes it widely available, much better than having to
1259 -install rxvt-unicode everywhere.
1260 -
1261 -http://bugs.gentoo.org/show_bug.cgi?id=192083
1262 -
1263 -This patch uses the updated rxvt-unicode-9.09 terminfo
1264 -which adds support for 256 colors.
1265 -
1266 ---- misc/terminfo.src
1267 -+++ misc/terminfo.src
1268 -@@ -3965,6 +3965,176 @@
1269 - rxvt-16color|xterm with 16 colors like aixterm,
1270 - ncv#32, use=ibm+16color, use=rxvt,
1271 -
1272 -+# From: Thomas Dickey <dickey@×××××.net> 04 Oct 1997
1273 -+# Updated: Özgür Kesim <kesim@××××××××××××××.de> 02 Nov 1997
1274 -+# Updated: Marc Lehmann <pcg@××××.com>, 17 Feb 2005
1275 -+# Updated: Marc Lehmann <schmorp@×××××××.de>, 04 Nov 2008: change init/reset sequences
1276 -+rxvt-unicode|rxvt-unicode terminal (X Window System),
1277 -+ am,
1278 -+ bce,
1279 -+ eo,
1280 -+ km,
1281 -+ msgr,
1282 -+ xenl,
1283 -+ hs,
1284 -+ cols#80,
1285 -+ it#8,
1286 -+ lines#24,
1287 -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
1288 -+ bel=^G,
1289 -+ blink=\E[5m,
1290 -+ bold=\E[1m,
1291 -+ civis=\E[?25l,
1292 -+ clear=\E[H\E[2J,
1293 -+ cnorm=\E[?25h,
1294 -+ cr=^M,
1295 -+ csr=\E[%i%p1%d;%p2%dr,
1296 -+ cub=\E[%p1%dD,
1297 -+ cub1=^H,
1298 -+ cud=\E[%p1%dB,
1299 -+ cud1=^J,
1300 -+ cuf=\E[%p1%dC,
1301 -+ cuf1=\E[C,
1302 -+ cup=\E[%i%p1%d;%p2%dH,
1303 -+ cuu=\E[%p1%dA,
1304 -+ cuu1=\E[A,
1305 -+ cvvis=\E[?25h,
1306 -+ dch=\E[%p1%dP,
1307 -+ dch1=\E[P,
1308 -+ dl=\E[%p1%dM,
1309 -+ dl1=\E[M,
1310 -+ ed=\E[J,
1311 -+ el=\E[K,
1312 -+ el1=\E[1K,
1313 -+ flash=\E[?5h$<20/>\E[?5l,
1314 -+ home=\E[H,
1315 -+ hpa=\E[%i%p1%dG,
1316 -+ ht=^I,
1317 -+ hts=\EH,
1318 -+ ich=\E[%p1%d@,
1319 -+ ich1=\E[@,
1320 -+ il=\E[%p1%dL,
1321 -+ il1=\E[L,
1322 -+ ind=^J,
1323 -+ is1=\E[\041p,
1324 -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
1325 -+ kDC=\E[3$,
1326 -+ kIC=\E2$,
1327 -+ kEND=\E[8$,
1328 -+ kHOM=\E[7$,
1329 -+ kLFT=\E[d,
1330 -+ kNXT=\E[6$,
1331 -+ kPRV=\E[5$,
1332 -+ kRIT=\E[c,
1333 -+ kbs=\177,
1334 -+ ka1=\EOw,
1335 -+ ka3=\EOy,
1336 -+ kb2=\EOu,
1337 -+ kc1=\EOq,
1338 -+ kc3=\EOs,
1339 -+ kcbt=\E[Z,
1340 -+ kcub1=\E[D,
1341 -+ kcud1=\E[B,
1342 -+ kcuf1=\E[C,
1343 -+ kcuu1=\E[A,
1344 -+ kdch1=\E[3~,
1345 -+ kel=\E[8\^,
1346 -+ kend=\E[8~,
1347 -+ kent=\EOM,
1348 -+ kf1=\E[11~,
1349 -+ kf10=\E[21~,
1350 -+ kf11=\E[23~,
1351 -+ kf12=\E[24~,
1352 -+ kf13=\E[25~,
1353 -+ kf14=\E[26~,
1354 -+ kf15=\E[28~,
1355 -+ kf16=\E[29~,
1356 -+ kf17=\E[31~,
1357 -+ kf18=\E[32~,
1358 -+ kf19=\E[33~,
1359 -+ kf2=\E[12~,
1360 -+ kf20=\E[34~,
1361 -+ kf3=\E[13~,
1362 -+ kf4=\E[14~,
1363 -+ kf5=\E[15~,
1364 -+ kf6=\E[17~,
1365 -+ kf7=\E[18~,
1366 -+ kf8=\E[19~,
1367 -+ kf9=\E[20~,
1368 -+ kfnd=\E[1~,
1369 -+ khome=\E[7~,
1370 -+ kich1=\E[2~,
1371 -+ kmous=\E[M,
1372 -+ knp=\E[6~,
1373 -+ kpp=\E[5~,
1374 -+ kslt=\E[4~,
1375 -+ rc=\E8,
1376 -+ rev=\E[7m,
1377 -+ ri=\EM,
1378 -+ rmso=\E[27m,
1379 -+ rmul=\E[24m,
1380 -+ rs1=\Ec,
1381 -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
1382 -+ sgr0=\E[m\E(B,
1383 -+ enacs=,
1384 -+ smacs=\E(0,
1385 -+ rmacs=\E(B,
1386 -+ smso=\E[7m,
1387 -+ smul=\E[4m,
1388 -+ tbc=\E[3g,
1389 -+ vpa=\E[%i%p1%dd,
1390 -+ colors#88,
1391 -+ pairs#7744,
1392 -+ btns#5,
1393 -+ lm#0,
1394 -+ ccc,
1395 -+ npc,
1396 -+ mc5i,
1397 -+ ncv#0,
1398 -+ mir,
1399 -+ xon,
1400 -+ bw,
1401 -+ ech=\E[%p1%dX,
1402 -+ mc0=\E[i,
1403 -+ mc4=\E[4i,
1404 -+ mc5=\E[5i,
1405 -+ sitm=\E[3m,
1406 -+ ritm=\E[23m,
1407 -+ smam=\E[?7h,
1408 -+ rmam=\E[?7l,
1409 -+ smir=\E[4h,
1410 -+ rmir=\E[4l,
1411 -+ smcup=\E[?1049h,
1412 -+ rmcup=\E[r\E[?1049l,
1413 -+ smkx=\E=,
1414 -+ rmkx=\E>,
1415 -+ indn=\E[%p1%dS,
1416 -+ rin=\E[%p1%dT,
1417 -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
1418 -+ op=\E[39;49m,
1419 -+ setaf=\E[38;5;%p1%dm,
1420 -+ setab=\E[48;5;%p1%dm,
1421 -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
1422 -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
1423 -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
1424 -+ sc=\E7,
1425 -+ s0ds=\E(B,
1426 -+ s1ds=\E(0,
1427 -+ s2ds=\E*B,
1428 -+ s3ds=\E+B,
1429 -+ u6=\E[%i%d;%dR,
1430 -+ u7=\E[6n,
1431 -+ u8=\E[?1;2c,
1432 -+ u9=\E[c,
1433 -+ tsl=\E]2;,
1434 -+ fsl=\007,
1435 -+ dsl=\E]2;\007,
1436 -+
1437 -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
1438 -+ colors#256,
1439 -+ pairs#32767,
1440 -+ use=rxvt-unicode,
1441 -+
1442 - # mrxvt 0.5.4
1443 - #
1444 - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
1445
1446 diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
1447 index f2cf2869c5..3b19896661 100644
1448 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
1449 +++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
1450 @@ -1,4 +1,4 @@
1451 -# Copyright 1999-2018 Gentoo Foundation
1452 +# Copyright 1999-2020 Gentoo Authors
1453 # Distributed under the terms of the GNU General Public License v2
1454
1455 # This version is just for the ABI .5 library
1456 @@ -13,18 +13,10 @@ DESCRIPTION="console display library"
1457 HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
1458 SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
1459
1460 -HOSTLTV="0.1.0"
1461 -HOSTLT="host-libtool-${HOSTLTV}"
1462 -HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"
1463 -SRC_URI="${SRC_URI}
1464 - kernel_AIX? ( ${HOSTLT_URI} )
1465 - kernel_HPUX? ( ${HOSTLT_URI} )
1466 -"
1467 -
1468 LICENSE="MIT"
1469 # The subslot reflects the SONAME.
1470 SLOT="5/5"
1471 -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1472 +KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1473 IUSE="gpm tinfo unicode"
1474
1475 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
1476 @@ -44,29 +36,12 @@ PATCHES=(
1477 "${FILESDIR}"/${P}-gcc-5.patch #545114
1478 )
1479
1480 -need-libtool() {
1481 - # need libtool to build aix-style shared objects inside archive libs, but
1482 - # cannot depend on libtool, as this would create circular dependencies...
1483 - # And libtool-1.5.26 needs (a similar) patch for AIX (DESTDIR) as found in
1484 - # http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
1485 - # Use libtool on hpux too to get some soname.
1486 - [[ ${CHOST} == *'-aix'* || ${CHOST} == *'-hpux'* ]]
1487 -}
1488 -
1489 src_prepare() {
1490 epatch "${PATCHES[@]}"
1491
1492 # /bin/sh is not always good enough
1493 find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh'
1494
1495 - if need-libtool; then
1496 - S="${WORKDIR}"/${HOSTLT} elibtoolize
1497 -
1498 - # Don't need local libraries (-L../lib) for libncurses,
1499 - # ends up as insecure runpath in libncurses.so[shr.o] on AIX
1500 - sed -i -e '/^SHLIB_LIST[ \t]*=/s/\$(SHLIB_DIRS)//' ncurses/Makefile.in || die
1501 - fi
1502 -
1503 # Don't mess with _XOPEN_SOURCE for C++ on (Open)Solaris. The compiler
1504 # defines a value for it, and depending on version, a different definition
1505 # is used. Defining this variable on these systems is dangerous any time,
1506 @@ -86,13 +61,6 @@ src_prepare() {
1507 }
1508
1509 src_configure() {
1510 - if need-libtool; then
1511 - cd "${WORKDIR}"/${HOSTLT} || die
1512 - econf
1513 - export PATH="${WORKDIR}"/${HOSTLT}:${PATH}
1514 - cd "${S}" || die
1515 - fi
1516 -
1517 unset TERMINFO #115036
1518 tc-export_build_env BUILD_{CC,CPP}
1519 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
1520 @@ -159,9 +127,7 @@ do_configure() {
1521 --without-hashed-db
1522 --disable-pc-files
1523 --$(
1524 - if need-libtool ; then
1525 - echo with-libtool
1526 - elif tc-is-static-only ; then
1527 + if tc-is-static-only ; then
1528 echo without-shared
1529 else
1530 echo with-shared
1531
1532 diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
1533 index e53fc18de4..c07a83ebf1 100644
1534 --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild
1535 +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
1536 @@ -1,4 +1,4 @@
1537 -# Copyright 1999-2018 Gentoo Foundation
1538 +# Copyright 1999-2020 Gentoo Authors
1539 # Distributed under the terms of the GNU General Public License v2
1540
1541 EAPI=6
1542 @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
1543 LICENSE="MIT"
1544 # The subslot reflects the SONAME.
1545 SLOT="0/6"
1546 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1547 +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1548 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
1549
1550 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
1551 @@ -74,7 +74,6 @@ src_configure() {
1552 local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
1553 case ${CHOST} in
1554 *-darwin*) dbuildflags= ;;
1555 - *-aix*) dbuildflags= ;;
1556 *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
1557 esac
1558 echo "int main() {}" | \
1559
1560 diff --git a/sys-libs/ncurses/ncurses-6.1-r3.ebuild b/sys-libs/ncurses/ncurses-6.1-r3.ebuild
1561 index 46e8fa420e..5b724f9169 100644
1562 --- a/sys-libs/ncurses/ncurses-6.1-r3.ebuild
1563 +++ b/sys-libs/ncurses/ncurses-6.1-r3.ebuild
1564 @@ -1,4 +1,4 @@
1565 -# Copyright 1999-2019 Gentoo Authors
1566 +# Copyright 1999-2020 Gentoo Authors
1567 # Distributed under the terms of the GNU General Public License v2
1568
1569 EAPI="6"
1570 @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
1571 LICENSE="MIT"
1572 # The subslot reflects the SONAME.
1573 SLOT="0/6"
1574 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1575 +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1576 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
1577
1578 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
1579 @@ -73,7 +73,6 @@ src_configure() {
1580 local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
1581 case ${CHOST} in
1582 *-darwin*) dbuildflags= ;;
1583 - *-aix*) dbuildflags= ;;
1584 *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
1585 esac
1586 echo "int main() {}" | \
1587
1588 diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
1589 index dc175394ec..8feae8ec77 100644
1590 --- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild
1591 +++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
1592 @@ -19,7 +19,7 @@ fi
1593 LICENSE="MIT"
1594 # The subslot reflects the SONAME.
1595 SLOT="0/6"
1596 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1597 +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1598 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
1599 RESTRICT="!test? ( test )"
1600
1601 @@ -79,7 +79,6 @@ src_configure() {
1602 local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
1603 case ${CHOST} in
1604 *-darwin*) dbuildflags= ;;
1605 - *-aix*) dbuildflags= ;;
1606 *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
1607 esac
1608 echo "int main() {}" | \