1 |
commit: 6528e2e47e1f9955dba9a6108500a93fdd7af014 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 20:57:11 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 20:57:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6528e2e4 |
7 |
|
8 |
sys-libs/ncurses: moved to ::gentoo |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-libs/ncurses/Manifest | 3 - |
13 |
sys-libs/ncurses/files/ncurses-5.7-nongnu.patch | 11 - |
14 |
sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch | 24 -- |
15 |
.../files/ncurses-5.9-fix-clang-build.patch | 44 --- |
16 |
sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch | 46 --- |
17 |
.../files/ncurses-5.9-no-I-usr-include.patch | 45 --- |
18 |
.../ncurses/files/ncurses-5.9-pkg-config.patch | 26 -- |
19 |
.../files/ncurses-5.9-rxvt-unicode-9.15.patch | 191 ------------- |
20 |
.../ncurses/files/ncurses-6.0-cppflags-cross.patch | 35 --- |
21 |
sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch | 24 -- |
22 |
.../ncurses/files/ncurses-6.0-pkg-config.patch | 14 - |
23 |
.../files/ncurses-6.0-rxvt-unicode-9.15.patch | 191 ------------- |
24 |
sys-libs/ncurses/files/ncurses-6.0-ticlib.patch | 15 - |
25 |
.../files/ncurses-6.1-st07_terminfo_typo.patch | 14 - |
26 |
.../ncurses-6.2-no_user_ldflags_in_libs.patch | 40 --- |
27 |
sys-libs/ncurses/metadata.xml | 17 -- |
28 |
sys-libs/ncurses/ncurses-5.9-r101.ebuild | 235 --------------- |
29 |
sys-libs/ncurses/ncurses-6.1-r2.ebuild | 293 ------------------- |
30 |
sys-libs/ncurses/ncurses-6.1-r3.ebuild | 308 -------------------- |
31 |
sys-libs/ncurses/ncurses-6.2-r1.ebuild | 317 --------------------- |
32 |
20 files changed, 1893 deletions(-) |
33 |
|
34 |
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest |
35 |
deleted file mode 100644 |
36 |
index 872019d041..0000000000 |
37 |
--- a/sys-libs/ncurses/Manifest |
38 |
+++ /dev/null |
39 |
@@ -1,3 +0,0 @@ |
40 |
-DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 |
41 |
-DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee |
42 |
-DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d |
43 |
|
44 |
diff --git a/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch b/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch |
45 |
deleted file mode 100644 |
46 |
index 3f4a405200..0000000000 |
47 |
--- a/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch |
48 |
+++ /dev/null |
49 |
@@ -1,11 +0,0 @@ |
50 |
---- ncurses-5.7/ncurses/curses.priv.h |
51 |
-+++ ncurses-5.7/ncurses/curses.priv.h |
52 |
-@@ -1452,6 +1452,8 @@ extern NCURSES_EXPORT(void) _nc_expanded |
53 |
- |
54 |
- /* charable.c */ |
55 |
- #if USE_WIDEC_SUPPORT |
56 |
-+#include <wchar.h> |
57 |
-+ |
58 |
- extern NCURSES_EXPORT(bool) _nc_is_charable(wchar_t); |
59 |
- extern NCURSES_EXPORT(int) _nc_to_char(wint_t); |
60 |
- extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int); |
61 |
|
62 |
diff --git a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch |
63 |
deleted file mode 100644 |
64 |
index 0200a14462..0000000000 |
65 |
--- a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch |
66 |
+++ /dev/null |
67 |
@@ -1,24 +0,0 @@ |
68 |
-we'll hijack the freebsd* case that comes later |
69 |
- |
70 |
---- ncurses-5.6/aclocal.m4 |
71 |
-+++ ncurses-5.6/aclocal.m4 |
72 |
-@@ -3806,7 +3806,7 @@ |
73 |
- fi |
74 |
- cf_cv_rm_so_locs=yes |
75 |
- ;; |
76 |
-- linux*|gnu*|k*bsd*-gnu) #(vi |
77 |
-+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi |
78 |
- if test "$DFT_LWR_MODEL" = "shared" ; then |
79 |
- LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" |
80 |
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" |
81 |
---- ncurses-5.6/configure |
82 |
-+++ ncurses-5.6/configure |
83 |
-@@ -3806,7 +3806,7 @@ |
84 |
- fi |
85 |
- cf_cv_rm_so_locs=yes |
86 |
- ;; |
87 |
-- linux*|gnu*|k*bsd*-gnu) #(vi |
88 |
-+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi |
89 |
- if test "$DFT_LWR_MODEL" = "shared" ; then |
90 |
- LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" |
91 |
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" |
92 |
|
93 |
diff --git a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch |
94 |
deleted file mode 100644 |
95 |
index 0c6ca7acc4..0000000000 |
96 |
--- a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch |
97 |
+++ /dev/null |
98 |
@@ -1,44 +0,0 @@ |
99 |
-diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h |
100 |
-index 70a30c3..db38063 100644 |
101 |
---- a/ncurses-5.9/c++/cursesf.h |
102 |
-+++ b/ncurses-5.9/c++/cursesf.h |
103 |
-@@ -677,7 +677,7 @@ protected: |
104 |
- } |
105 |
- |
106 |
- public: |
107 |
-- NCursesUserForm (NCursesFormField Fields[], |
108 |
-+ NCursesUserForm (NCursesFormField* Fields[], |
109 |
- const T* p_UserData = STATIC_CAST(T*)(0), |
110 |
- bool with_frame=FALSE, |
111 |
- bool autoDelete_Fields=FALSE) |
112 |
-@@ -686,7 +686,7 @@ public: |
113 |
- set_user (const_cast<void *>(p_UserData)); |
114 |
- }; |
115 |
- |
116 |
-- NCursesUserForm (NCursesFormField Fields[], |
117 |
-+ NCursesUserForm (NCursesFormField* Fields[], |
118 |
- int nlines, |
119 |
- int ncols, |
120 |
- int begin_y = 0, |
121 |
-diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h |
122 |
-index d9c2273..2d5b79a 100644 |
123 |
---- a/ncurses-5.9/c++/cursesm.h |
124 |
-+++ b/ncurses-5.9/c++/cursesm.h |
125 |
-@@ -635,7 +635,7 @@ protected: |
126 |
- } |
127 |
- |
128 |
- public: |
129 |
-- NCursesUserMenu (NCursesMenuItem Items[], |
130 |
-+ NCursesUserMenu (NCursesMenuItem* Items[], |
131 |
- const T* p_UserData = STATIC_CAST(T*)(0), |
132 |
- bool with_frame=FALSE, |
133 |
- bool autoDelete_Items=FALSE) |
134 |
-@@ -644,7 +644,7 @@ public: |
135 |
- set_user (const_cast<void *>(p_UserData)); |
136 |
- }; |
137 |
- |
138 |
-- NCursesUserMenu (NCursesMenuItem Items[], |
139 |
-+ NCursesUserMenu (NCursesMenuItem* Items[], |
140 |
- int nlines, |
141 |
- int ncols, |
142 |
- int begin_y = 0, |
143 |
|
144 |
diff --git a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch |
145 |
deleted file mode 100644 |
146 |
index 2448229b88..0000000000 |
147 |
--- a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch |
148 |
+++ /dev/null |
149 |
@@ -1,46 +0,0 @@ |
150 |
-https://bugs.gentoo.org/545114 |
151 |
- |
152 |
-extracted from the upstream change (which had many unrelated commits in one) |
153 |
- |
154 |
-From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 |
155 |
-From: "Thomas E. Dickey" <dickey@××××××××××××××××.net> |
156 |
-Date: Sun, 7 Dec 2014 03:10:09 +0000 |
157 |
-Subject: [PATCH] ncurses 5.9 - patch 20141206 |
158 |
- |
159 |
-+ modify MKlib_gen.sh to work around change in development version of |
160 |
- gcc introduced here: |
161 |
- https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html |
162 |
- https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html |
163 |
- (reports by Marcus Shawcroft, Maohui Lei). |
164 |
- |
165 |
-diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh |
166 |
-index d8cc3c9..b91398c 100755 |
167 |
---- a/ncurses/base/MKlib_gen.sh |
168 |
-+++ b/ncurses/base/MKlib_gen.sh |
169 |
-@@ -474,11 +474,22 @@ sed -n -f $ED1 \ |
170 |
- -e 's/gen_$//' \ |
171 |
- -e 's/ / /g' >>$TMP |
172 |
- |
173 |
-+cat >$ED1 <<EOF |
174 |
-+s/ / /g |
175 |
-+s/^ // |
176 |
-+s/ $// |
177 |
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g |
178 |
-+EOF |
179 |
-+ |
180 |
-+# A patch discussed here: |
181 |
-+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html |
182 |
-+# introduces spurious #line markers. Work around that by ignoring the system's |
183 |
-+# attempt to define "bool" and using our own symbol here. |
184 |
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 |
185 |
-+cat $ED2 >$TMP |
186 |
-+ |
187 |
- $preprocessor $TMP 2>/dev/null \ |
188 |
--| sed \ |
189 |
-- -e 's/ / /g' \ |
190 |
-- -e 's/^ //' \ |
191 |
-- -e 's/_Bool/NCURSES_BOOL/g' \ |
192 |
-+| sed -f $ED1 \ |
193 |
- | $AWK -f $AW2 \ |
194 |
- | sed -f $ED3 \ |
195 |
- | sed \ |
196 |
|
197 |
diff --git a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch b/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch |
198 |
deleted file mode 100644 |
199 |
index 5c968e76c3..0000000000 |
200 |
--- a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch |
201 |
+++ /dev/null |
202 |
@@ -1,45 +0,0 @@ |
203 |
-https://bugs.gentoo.org/522586 |
204 |
- |
205 |
-delete the -I$includedir paths that get added to CPPFLAGS. these are never |
206 |
-needed when building natively or cross-compiling and really get in the way |
207 |
-in both cases (upgrades/cross-compiling/etc...). |
208 |
- |
209 |
-extracted from the upstream change: |
210 |
-http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5 |
211 |
- |
212 |
---- a/configure |
213 |
-+++ b/configure |
214 |
-@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include" |
215 |
- if test "$srcdir" != "."; then |
216 |
- CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" |
217 |
- fi |
218 |
--if test "$GCC" != yes; then |
219 |
-- CPPFLAGS="$CPPFLAGS -I\${includedir}" |
220 |
--elif test "$includedir" != "/usr/include"; then |
221 |
-- if test "$includedir" = '${prefix}/include' ; then |
222 |
-- if test $prefix != /usr ; then |
223 |
-- CPPFLAGS="$CPPFLAGS -I\${includedir}" |
224 |
-- fi |
225 |
-- else |
226 |
-- CPPFLAGS="$CPPFLAGS -I\${includedir}" |
227 |
-- fi |
228 |
--fi |
229 |
- |
230 |
- ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" |
231 |
- if test "$srcdir" != "."; then |
232 |
- ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" |
233 |
- fi |
234 |
--if test "$GCC" != yes; then |
235 |
-- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
236 |
--elif test "$includedir" != "/usr/include"; then |
237 |
-- if test "$includedir" = '${prefix}/include' ; then |
238 |
-- if test $prefix != /usr ; then |
239 |
-- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
240 |
-- fi |
241 |
-- else |
242 |
-- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
243 |
-- fi |
244 |
--fi |
245 |
- |
246 |
- ### Build up pieces for makefile rules |
247 |
- echo "$as_me:18628: checking default library suffix" >&5 |
248 |
|
249 |
diff --git a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch |
250 |
deleted file mode 100644 |
251 |
index 7c3c04a449..0000000000 |
252 |
--- a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch |
253 |
+++ /dev/null |
254 |
@@ -1,26 +0,0 @@ |
255 |
-disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just |
256 |
-gets in the way when setting to a value that might not yet exist. |
257 |
- |
258 |
-disable the existence test for the PKG_CONFIG_LIBDIR dir. it breaks when you |
259 |
-cross-compile for an ABI that doesn't exist in the root dir (--build). |
260 |
- |
261 |
---- a/configure |
262 |
-+++ b/configure |
263 |
-@@ -3582,7 +3582,7 @@ fi |
264 |
- esac |
265 |
- |
266 |
- test -z "$PKG_CONFIG" && PKG_CONFIG=none |
267 |
--if test "$PKG_CONFIG" != none ; then |
268 |
-+if false ; then |
269 |
- |
270 |
- if test "x$prefix" != xNONE; then |
271 |
- cf_path_syntax="$prefix" |
272 |
-@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C |
273 |
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig |
274 |
- fi |
275 |
- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` |
276 |
-- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then |
277 |
-+ if test -n "$PKG_CONFIG_LIBDIR" ; then |
278 |
- |
279 |
- # Check whether --enable-pc-files or --disable-pc-files was given. |
280 |
- if test "${enable_pc_files+set}" = set; then |
281 |
|
282 |
diff --git a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch |
283 |
deleted file mode 100644 |
284 |
index b6d1924cbe..0000000000 |
285 |
--- a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch |
286 |
+++ /dev/null |
287 |
@@ -1,191 +0,0 @@ |
288 |
-Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. |
289 |
- |
290 |
-Providing this in ncurses makes it widely available, much better than having to |
291 |
-install rxvt-unicode everywhere. |
292 |
- |
293 |
-http://bugs.gentoo.org/show_bug.cgi?id=192083 |
294 |
- |
295 |
-This patch uses the updated rxvt-unicode-9.15 terminfo |
296 |
-which includes 256 color support and fixes Gentoo bug 383871 |
297 |
- |
298 |
-http://bugs.gentoo.org/show_bug.cgi?id=383871 |
299 |
- |
300 |
---- misc/terminfo.src |
301 |
-+++ misc/terminfo.src |
302 |
-@@ -4208,6 +4208,176 @@ |
303 |
- rxvt-16color|xterm with 16 colors like aixterm, |
304 |
- ncv#32, use=ibm+16color, use=rxvt, |
305 |
- |
306 |
-+# From: Thomas Dickey <dickey@×××××.net> 04 Oct 1997 |
307 |
-+# Updated: Özgür Kesim <kesim@××××××××××××××.de> 02 Nov 1997 |
308 |
-+# Updated: Marc Lehmann <schmorp@×××××××.de>, 17 Feb 2005 |
309 |
-+# Updated: Marc Lehmann <schmorp@×××××××.de>, 04 Nov 2008: change init/reset sequences |
310 |
-+rxvt-unicode|rxvt-unicode terminal (X Window System), |
311 |
-+ am, |
312 |
-+ bce, |
313 |
-+ eo, |
314 |
-+ km, |
315 |
-+ msgr, |
316 |
-+ xenl, |
317 |
-+ hs, |
318 |
-+ cols#80, |
319 |
-+ it#8, |
320 |
-+ lines#24, |
321 |
-+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, |
322 |
-+ bel=^G, |
323 |
-+ blink=\E[5m, |
324 |
-+ bold=\E[1m, |
325 |
-+ civis=\E[?25l, |
326 |
-+ clear=\E[H\E[2J, |
327 |
-+ cnorm=\E[?25h, |
328 |
-+ cr=^M, |
329 |
-+ csr=\E[%i%p1%d;%p2%dr, |
330 |
-+ cub=\E[%p1%dD, |
331 |
-+ cub1=^H, |
332 |
-+ cud=\E[%p1%dB, |
333 |
-+ cud1=^J, |
334 |
-+ cuf=\E[%p1%dC, |
335 |
-+ cuf1=\E[C, |
336 |
-+ cup=\E[%i%p1%d;%p2%dH, |
337 |
-+ cuu=\E[%p1%dA, |
338 |
-+ cuu1=\E[A, |
339 |
-+ cvvis=\E[?25h, |
340 |
-+ dch=\E[%p1%dP, |
341 |
-+ dch1=\E[P, |
342 |
-+ dl=\E[%p1%dM, |
343 |
-+ dl1=\E[M, |
344 |
-+ ed=\E[J, |
345 |
-+ el=\E[K, |
346 |
-+ el1=\E[1K, |
347 |
-+ flash=\E[?5h$<20/>\E[?5l, |
348 |
-+ home=\E[H, |
349 |
-+ hpa=\E[%i%p1%dG, |
350 |
-+ ht=^I, |
351 |
-+ hts=\EH, |
352 |
-+ ich=\E[%p1%d@, |
353 |
-+ ich1=\E[@, |
354 |
-+ il=\E[%p1%dL, |
355 |
-+ il1=\E[L, |
356 |
-+ ind=^J, |
357 |
-+ is1=\E[\041p, |
358 |
-+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, |
359 |
-+ kDC=\E[3$, |
360 |
-+ kIC=\E[2$, |
361 |
-+ kEND=\E[8$, |
362 |
-+ kHOM=\E[7$, |
363 |
-+ kLFT=\E[d, |
364 |
-+ kNXT=\E[6$, |
365 |
-+ kPRV=\E[5$, |
366 |
-+ kRIT=\E[c, |
367 |
-+ kbs=\177, |
368 |
-+ ka1=\EOw, |
369 |
-+ ka3=\EOy, |
370 |
-+ kb2=\EOu, |
371 |
-+ kc1=\EOq, |
372 |
-+ kc3=\EOs, |
373 |
-+ kcbt=\E[Z, |
374 |
-+ kcub1=\E[D, |
375 |
-+ kcud1=\E[B, |
376 |
-+ kcuf1=\E[C, |
377 |
-+ kcuu1=\E[A, |
378 |
-+ kdch1=\E[3~, |
379 |
-+ kel=\E[8\^, |
380 |
-+ kend=\E[8~, |
381 |
-+ kent=\EOM, |
382 |
-+ kf1=\E[11~, |
383 |
-+ kf10=\E[21~, |
384 |
-+ kf11=\E[23~, |
385 |
-+ kf12=\E[24~, |
386 |
-+ kf13=\E[25~, |
387 |
-+ kf14=\E[26~, |
388 |
-+ kf15=\E[28~, |
389 |
-+ kf16=\E[29~, |
390 |
-+ kf17=\E[31~, |
391 |
-+ kf18=\E[32~, |
392 |
-+ kf19=\E[33~, |
393 |
-+ kf2=\E[12~, |
394 |
-+ kf20=\E[34~, |
395 |
-+ kf3=\E[13~, |
396 |
-+ kf4=\E[14~, |
397 |
-+ kf5=\E[15~, |
398 |
-+ kf6=\E[17~, |
399 |
-+ kf7=\E[18~, |
400 |
-+ kf8=\E[19~, |
401 |
-+ kf9=\E[20~, |
402 |
-+ kfnd=\E[1~, |
403 |
-+ khome=\E[7~, |
404 |
-+ kich1=\E[2~, |
405 |
-+ kmous=\E[M, |
406 |
-+ knp=\E[6~, |
407 |
-+ kpp=\E[5~, |
408 |
-+ kslt=\E[4~, |
409 |
-+ rc=\E8, |
410 |
-+ rev=\E[7m, |
411 |
-+ ri=\EM, |
412 |
-+ rmso=\E[27m, |
413 |
-+ rmul=\E[24m, |
414 |
-+ rs1=\Ec, |
415 |
-+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, |
416 |
-+ sgr0=\E[m\E(B, |
417 |
-+ enacs=, |
418 |
-+ smacs=\E(0, |
419 |
-+ rmacs=\E(B, |
420 |
-+ smso=\E[7m, |
421 |
-+ smul=\E[4m, |
422 |
-+ tbc=\E[3g, |
423 |
-+ vpa=\E[%i%p1%dd, |
424 |
-+ colors#88, |
425 |
-+ pairs#7744, |
426 |
-+ btns#5, |
427 |
-+ lm#0, |
428 |
-+ ccc, |
429 |
-+ npc, |
430 |
-+ mc5i, |
431 |
-+ ncv#0, |
432 |
-+ mir, |
433 |
-+ xon, |
434 |
-+ bw, |
435 |
-+ ech=\E[%p1%dX, |
436 |
-+ mc0=\E[i, |
437 |
-+ mc4=\E[4i, |
438 |
-+ mc5=\E[5i, |
439 |
-+ sitm=\E[3m, |
440 |
-+ ritm=\E[23m, |
441 |
-+ smam=\E[?7h, |
442 |
-+ rmam=\E[?7l, |
443 |
-+ smir=\E[4h, |
444 |
-+ rmir=\E[4l, |
445 |
-+ smcup=\E[?1049h, |
446 |
-+ rmcup=\E[r\E[?1049l, |
447 |
-+ smkx=\E=, |
448 |
-+ rmkx=\E>, |
449 |
-+ indn=\E[%p1%dS, |
450 |
-+ rin=\E[%p1%dT, |
451 |
-+ 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%;, |
452 |
-+ op=\E[39;49m, |
453 |
-+ setaf=\E[38;5;%p1%dm, |
454 |
-+ setab=\E[48;5;%p1%dm, |
455 |
-+ 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%;, |
456 |
-+ 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%;, |
457 |
-+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, |
458 |
-+ sc=\E7, |
459 |
-+ s0ds=\E(B, |
460 |
-+ s1ds=\E(0, |
461 |
-+ s2ds=\E*B, |
462 |
-+ s3ds=\E+B, |
463 |
-+ u6=\E[%i%d;%dR, |
464 |
-+ u7=\E[6n, |
465 |
-+ u8=\E[?1;2c, |
466 |
-+ u9=\E[c, |
467 |
-+ tsl=\E]2;, |
468 |
-+ fsl=\007, |
469 |
-+ dsl=\E]2;\007, |
470 |
-+ |
471 |
-+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), |
472 |
-+ colors#256, |
473 |
-+ pairs#32767, |
474 |
-+ use=rxvt-unicode, |
475 |
-+ |
476 |
- # mrxvt 0.5.4 |
477 |
- # |
478 |
- # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which |
479 |
|
480 |
diff --git a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch b/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch |
481 |
deleted file mode 100644 |
482 |
index decdc26779..0000000000 |
483 |
--- a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch |
484 |
+++ /dev/null |
485 |
@@ -1,35 +0,0 @@ |
486 |
-https://bugs.gentoo.org/601426 |
487 |
-https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html |
488 |
- |
489 |
-From: John Vogel |
490 |
-Subject: [PATCH] c++ binding missed when cross compiling |
491 |
-Date: Mon, 16 Feb 2015 01:01:48 -0500 |
492 |
- |
493 |
-The configure script hard codes the include dir to the prefix'ed include dir, |
494 |
-when checking if c++ compiler works. This breaks the compiler's built-in search |
495 |
-path. I've included two patches. The first works on the configure.in file, which |
496 |
-requires your autoconf stuff to test and I'm not ready to meddle with at the |
497 |
-moment. The other works directly on the configure file. I've tested the second |
498 |
-one; it should mirror what the first patch tries to achieve and works for me. |
499 |
- |
500 |
---- a/configure |
501 |
-+++ b/configure |
502 |
-@@ -2938,10 +2938,6 @@ |
503 |
- echo "$as_me:2938: checking if $CXX works" >&5 |
504 |
- echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 |
505 |
- |
506 |
-- save_CPPFLAGS="$CPPFLAGS" |
507 |
-- eval cf_includedir=${includedir} |
508 |
-- CPPFLAGS="$CPPFLAGS -I${cf_includedir}" |
509 |
-- |
510 |
- cat >conftest.$ac_ext <<_ACEOF |
511 |
- #line 2946 "configure" |
512 |
- #include "confdefs.h" |
513 |
-@@ -2978,7 +2974,6 @@ |
514 |
- cf_cxx_works=no |
515 |
- fi |
516 |
- rm -f conftest.$ac_objext conftest.$ac_ext |
517 |
-- CPPFLAGS="$save_CPPFLAGS" |
518 |
- |
519 |
- echo "$as_me:2983: result: $cf_cxx_works" >&5 |
520 |
- echo "${ECHO_T}$cf_cxx_works" >&6 |
521 |
|
522 |
diff --git a/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch b/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch |
523 |
deleted file mode 100644 |
524 |
index 1403a29c93..0000000000 |
525 |
--- a/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch |
526 |
+++ /dev/null |
527 |
@@ -1,24 +0,0 @@ |
528 |
-we'll hijack the freebsd* case that comes later |
529 |
- |
530 |
---- ncurses-6.0/aclocal.m4 |
531 |
-+++ ncurses-6.0/aclocal.m4 |
532 |
-@@ -5711,7 +5711,7 @@ |
533 |
- fi |
534 |
- cf_cv_rm_so_locs=yes |
535 |
- ;; |
536 |
-- (linux*|gnu*|k*bsd*-gnu) |
537 |
-+ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) |
538 |
- if test "$DFT_LWR_MODEL" = "shared" ; then |
539 |
- LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" |
540 |
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" |
541 |
---- ncurses-6.0/configure |
542 |
-+++ ncurses-6.0/configure |
543 |
-@@ -6188,7 +6188,7 @@ |
544 |
- fi |
545 |
- cf_cv_rm_so_locs=yes |
546 |
- ;; |
547 |
-- (linux*|gnu*|k*bsd*-gnu) |
548 |
-+ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) |
549 |
- if test "$DFT_LWR_MODEL" = "shared" ; then |
550 |
- LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" |
551 |
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" |
552 |
|
553 |
diff --git a/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch b/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch |
554 |
deleted file mode 100644 |
555 |
index 6808319b95..0000000000 |
556 |
--- a/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch |
557 |
+++ /dev/null |
558 |
@@ -1,14 +0,0 @@ |
559 |
-disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just |
560 |
-gets in the way when setting to a value that might not yet exist. |
561 |
- |
562 |
---- ncurses-6.0/configure |
563 |
-+++ ncurses-6.0/configure |
564 |
-@@ -3533,7 +3533,7 @@ |
565 |
- esac |
566 |
- |
567 |
- test -z "$PKG_CONFIG" && PKG_CONFIG=none |
568 |
--if test "$PKG_CONFIG" != none ; then |
569 |
-+if false ; then |
570 |
- |
571 |
- if test "x$prefix" != xNONE; then |
572 |
- cf_path_syntax="$prefix" |
573 |
|
574 |
diff --git a/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch |
575 |
deleted file mode 100644 |
576 |
index af3df941d6..0000000000 |
577 |
--- a/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch |
578 |
+++ /dev/null |
579 |
@@ -1,191 +0,0 @@ |
580 |
-Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. |
581 |
- |
582 |
-Providing this in ncurses makes it widely available, much better than having to |
583 |
-install rxvt-unicode everywhere. |
584 |
- |
585 |
-http://bugs.gentoo.org/show_bug.cgi?id=192083 |
586 |
- |
587 |
-This patch uses the updated rxvt-unicode-9.15 terminfo |
588 |
-which includes 256 color support and fixes Gentoo bug 383871 |
589 |
- |
590 |
-http://bugs.gentoo.org/show_bug.cgi?id=383871 |
591 |
- |
592 |
---- ncurses-6.0/misc/terminfo.src |
593 |
-+++ ncurses-6.0/misc/terminfo.src |
594 |
-@@ -5214,6 +5214,176 @@ |
595 |
- rxvt-16color|rxvt with 16 colors like aixterm, |
596 |
- ncv#32, use=ibm+16color, use=rxvt, |
597 |
- |
598 |
-+# From: Thomas Dickey <dickey@×××××.net> 04 Oct 1997 |
599 |
-+# Updated: Özgür Kesim <kesim@××××××××××××××.de> 02 Nov 1997 |
600 |
-+# Updated: Marc Lehmann <schmorp@×××××××.de>, 17 Feb 2005 |
601 |
-+# Updated: Marc Lehmann <schmorp@×××××××.de>, 04 Nov 2008: change init/reset sequences |
602 |
-+rxvt-unicode|rxvt-unicode terminal (X Window System), |
603 |
-+ am, |
604 |
-+ bce, |
605 |
-+ eo, |
606 |
-+ km, |
607 |
-+ msgr, |
608 |
-+ xenl, |
609 |
-+ hs, |
610 |
-+ cols#80, |
611 |
-+ it#8, |
612 |
-+ lines#24, |
613 |
-+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, |
614 |
-+ bel=^G, |
615 |
-+ blink=\E[5m, |
616 |
-+ bold=\E[1m, |
617 |
-+ civis=\E[?25l, |
618 |
-+ clear=\E[H\E[2J, |
619 |
-+ cnorm=\E[?25h, |
620 |
-+ cr=^M, |
621 |
-+ csr=\E[%i%p1%d;%p2%dr, |
622 |
-+ cub=\E[%p1%dD, |
623 |
-+ cub1=^H, |
624 |
-+ cud=\E[%p1%dB, |
625 |
-+ cud1=^J, |
626 |
-+ cuf=\E[%p1%dC, |
627 |
-+ cuf1=\E[C, |
628 |
-+ cup=\E[%i%p1%d;%p2%dH, |
629 |
-+ cuu=\E[%p1%dA, |
630 |
-+ cuu1=\E[A, |
631 |
-+ cvvis=\E[?25h, |
632 |
-+ dch=\E[%p1%dP, |
633 |
-+ dch1=\E[P, |
634 |
-+ dl=\E[%p1%dM, |
635 |
-+ dl1=\E[M, |
636 |
-+ ed=\E[J, |
637 |
-+ el=\E[K, |
638 |
-+ el1=\E[1K, |
639 |
-+ flash=\E[?5h$<20/>\E[?5l, |
640 |
-+ home=\E[H, |
641 |
-+ hpa=\E[%i%p1%dG, |
642 |
-+ ht=^I, |
643 |
-+ hts=\EH, |
644 |
-+ ich=\E[%p1%d@, |
645 |
-+ ich1=\E[@, |
646 |
-+ il=\E[%p1%dL, |
647 |
-+ il1=\E[L, |
648 |
-+ ind=^J, |
649 |
-+ is1=\E[\041p, |
650 |
-+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, |
651 |
-+ kDC=\E[3$, |
652 |
-+ kIC=\E[2$, |
653 |
-+ kEND=\E[8$, |
654 |
-+ kHOM=\E[7$, |
655 |
-+ kLFT=\E[d, |
656 |
-+ kNXT=\E[6$, |
657 |
-+ kPRV=\E[5$, |
658 |
-+ kRIT=\E[c, |
659 |
-+ kbs=\177, |
660 |
-+ ka1=\EOw, |
661 |
-+ ka3=\EOy, |
662 |
-+ kb2=\EOu, |
663 |
-+ kc1=\EOq, |
664 |
-+ kc3=\EOs, |
665 |
-+ kcbt=\E[Z, |
666 |
-+ kcub1=\E[D, |
667 |
-+ kcud1=\E[B, |
668 |
-+ kcuf1=\E[C, |
669 |
-+ kcuu1=\E[A, |
670 |
-+ kdch1=\E[3~, |
671 |
-+ kel=\E[8\^, |
672 |
-+ kend=\E[8~, |
673 |
-+ kent=\EOM, |
674 |
-+ kf1=\E[11~, |
675 |
-+ kf10=\E[21~, |
676 |
-+ kf11=\E[23~, |
677 |
-+ kf12=\E[24~, |
678 |
-+ kf13=\E[25~, |
679 |
-+ kf14=\E[26~, |
680 |
-+ kf15=\E[28~, |
681 |
-+ kf16=\E[29~, |
682 |
-+ kf17=\E[31~, |
683 |
-+ kf18=\E[32~, |
684 |
-+ kf19=\E[33~, |
685 |
-+ kf2=\E[12~, |
686 |
-+ kf20=\E[34~, |
687 |
-+ kf3=\E[13~, |
688 |
-+ kf4=\E[14~, |
689 |
-+ kf5=\E[15~, |
690 |
-+ kf6=\E[17~, |
691 |
-+ kf7=\E[18~, |
692 |
-+ kf8=\E[19~, |
693 |
-+ kf9=\E[20~, |
694 |
-+ kfnd=\E[1~, |
695 |
-+ khome=\E[7~, |
696 |
-+ kich1=\E[2~, |
697 |
-+ kmous=\E[M, |
698 |
-+ knp=\E[6~, |
699 |
-+ kpp=\E[5~, |
700 |
-+ kslt=\E[4~, |
701 |
-+ rc=\E8, |
702 |
-+ rev=\E[7m, |
703 |
-+ ri=\EM, |
704 |
-+ rmso=\E[27m, |
705 |
-+ rmul=\E[24m, |
706 |
-+ rs1=\Ec, |
707 |
-+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, |
708 |
-+ sgr0=\E[m\E(B, |
709 |
-+ enacs=, |
710 |
-+ smacs=\E(0, |
711 |
-+ rmacs=\E(B, |
712 |
-+ smso=\E[7m, |
713 |
-+ smul=\E[4m, |
714 |
-+ tbc=\E[3g, |
715 |
-+ vpa=\E[%i%p1%dd, |
716 |
-+ colors#88, |
717 |
-+ pairs#7744, |
718 |
-+ btns#5, |
719 |
-+ lm#0, |
720 |
-+ ccc, |
721 |
-+ npc, |
722 |
-+ mc5i, |
723 |
-+ ncv#0, |
724 |
-+ mir, |
725 |
-+ xon, |
726 |
-+ bw, |
727 |
-+ ech=\E[%p1%dX, |
728 |
-+ mc0=\E[i, |
729 |
-+ mc4=\E[4i, |
730 |
-+ mc5=\E[5i, |
731 |
-+ sitm=\E[3m, |
732 |
-+ ritm=\E[23m, |
733 |
-+ smam=\E[?7h, |
734 |
-+ rmam=\E[?7l, |
735 |
-+ smir=\E[4h, |
736 |
-+ rmir=\E[4l, |
737 |
-+ smcup=\E[?1049h, |
738 |
-+ rmcup=\E[r\E[?1049l, |
739 |
-+ smkx=\E=, |
740 |
-+ rmkx=\E>, |
741 |
-+ indn=\E[%p1%dS, |
742 |
-+ rin=\E[%p1%dT, |
743 |
-+ 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%;, |
744 |
-+ op=\E[39;49m, |
745 |
-+ setaf=\E[38;5;%p1%dm, |
746 |
-+ setab=\E[48;5;%p1%dm, |
747 |
-+ 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%;, |
748 |
-+ 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%;, |
749 |
-+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, |
750 |
-+ sc=\E7, |
751 |
-+ s0ds=\E(B, |
752 |
-+ s1ds=\E(0, |
753 |
-+ s2ds=\E*B, |
754 |
-+ s3ds=\E+B, |
755 |
-+ u6=\E[%i%d;%dR, |
756 |
-+ u7=\E[6n, |
757 |
-+ u8=\E[?1;2c, |
758 |
-+ u9=\E[c, |
759 |
-+ tsl=\E]2;, |
760 |
-+ fsl=\007, |
761 |
-+ dsl=\E]2;\007, |
762 |
-+ |
763 |
-+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), |
764 |
-+ colors#256, |
765 |
-+ pairs#32767, |
766 |
-+ use=rxvt-unicode, |
767 |
-+ |
768 |
- #### MRXVT |
769 |
- # mrxvt 0.5.4 |
770 |
- # |
771 |
|
772 |
diff --git a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch |
773 |
deleted file mode 100644 |
774 |
index 188e6adff8..0000000000 |
775 |
--- a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch |
776 |
+++ /dev/null |
777 |
@@ -1,15 +0,0 @@ |
778 |
-always include ticlib even when progs are disabled |
779 |
- |
780 |
-https://bugs.gentoo.org/557360 |
781 |
- |
782 |
---- a/configure |
783 |
-+++ b/configure |
784 |
-@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5 |
785 |
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 |
786 |
- LIB_SUBSETS= |
787 |
- |
788 |
--if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then |
789 |
-+if true; then |
790 |
- LIB_SUBSETS="${LIB_SUBSETS}ticlib" |
791 |
- if test "$with_ticlib" != no ; then |
792 |
- LIB_SUBSETS="${LIB_SUBSETS} " |
793 |
|
794 |
diff --git a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch |
795 |
deleted file mode 100644 |
796 |
index 4532d648a6..0000000000 |
797 |
--- a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch |
798 |
+++ /dev/null |
799 |
@@ -1,14 +0,0 @@ |
800 |
-https://github.com/tmux/tmux/issues/1264 |
801 |
-https://bugs.gentoo.org/651494 |
802 |
- |
803 |
---- ncurses-6.1/misc/terminfo.src |
804 |
-+++ ncurses-6.1/misc/terminfo.src |
805 |
-@@ -6260,7 +6260,7 @@ |
806 |
- %=%t3%e%p1%d%;m, |
807 |
- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| |
808 |
- %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, |
809 |
-- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, |
810 |
-+ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, |
811 |
- kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, |
812 |
- kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, |
813 |
- kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, |
814 |
|
815 |
diff --git a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch |
816 |
deleted file mode 100644 |
817 |
index 66345b51fe..0000000000 |
818 |
--- a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch |
819 |
+++ /dev/null |
820 |
@@ -1,40 +0,0 @@ |
821 |
-From be554be06475b36da2f69aabfd873ad55f7ef95c Mon Sep 17 00:00:00 2001 |
822 |
-From: Lars Wendler <polynomial-c@g.o> |
823 |
-Date: Thu, 13 Feb 2020 11:51:09 +0100 |
824 |
-Subject: [PATCH] Don't bleed user LDFLAGS into Libs |
825 |
- |
826 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
827 |
---- |
828 |
- misc/gen-pkgconfig.in | 2 +- |
829 |
- misc/ncurses-config.in | 2 +- |
830 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
831 |
- |
832 |
-diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in |
833 |
-index 8f00b824..009d2156 100644 |
834 |
---- a/misc/gen-pkgconfig.in |
835 |
-+++ b/misc/gen-pkgconfig.in |
836 |
-@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then |
837 |
- fi |
838 |
- |
839 |
- lib_flags= |
840 |
--for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
841 |
-+for opt in -L$libdir @LIBS@ |
842 |
- do |
843 |
- case $opt in |
844 |
- -l*) # LIBS is handled specially below |
845 |
-diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in |
846 |
-index 7f8ba697..2f1915cd 100644 |
847 |
---- a/misc/ncurses-config.in |
848 |
-+++ b/misc/ncurses-config.in |
849 |
-@@ -101,7 +101,7 @@ fi |
850 |
- # There is no portable way to find the list of standard library directories. |
851 |
- # Require a POSIX shell anyway, to keep this simple. |
852 |
- lib_flags= |
853 |
--for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS |
854 |
-+for opt in -L$libdir $LIBS |
855 |
- do |
856 |
- case $opt in |
857 |
- -specs*) # ignore linker specs-files which were used to build library |
858 |
--- |
859 |
-2.25.0 |
860 |
- |
861 |
|
862 |
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml |
863 |
deleted file mode 100644 |
864 |
index 888a6adf66..0000000000 |
865 |
--- a/sys-libs/ncurses/metadata.xml |
866 |
+++ /dev/null |
867 |
@@ -1,17 +0,0 @@ |
868 |
-<?xml version="1.0" encoding="UTF-8"?> |
869 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
870 |
-<pkgmetadata> |
871 |
-<maintainer type="project"> |
872 |
- <email>base-system@g.o</email> |
873 |
- <name>Gentoo Base System</name> |
874 |
-</maintainer> |
875 |
-<use> |
876 |
- <flag name="ada">Add bindings for the ADA programming language</flag> |
877 |
- <flag name="tinfo"> |
878 |
- Build curses library (libncurses) sep from the low-level terminfo |
879 |
- library (libtinfo) -- usually needed only for binary packages -- but |
880 |
- it is binary compatible in either mode |
881 |
- </flag> |
882 |
- <flag name="trace">Enable test trace() support in ncurses calls</flag> |
883 |
-</use> |
884 |
-</pkgmetadata> |
885 |
|
886 |
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild |
887 |
deleted file mode 100644 |
888 |
index 3b19896661..0000000000 |
889 |
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild |
890 |
+++ /dev/null |
891 |
@@ -1,235 +0,0 @@ |
892 |
-# Copyright 1999-2020 Gentoo Authors |
893 |
-# Distributed under the terms of the GNU General Public License v2 |
894 |
- |
895 |
-# This version is just for the ABI .5 library |
896 |
- |
897 |
-EAPI="5" |
898 |
- |
899 |
-inherit eutils toolchain-funcs multilib-minimal flag-o-matic libtool |
900 |
- |
901 |
-MY_PV=${PV:0:3} |
902 |
-MY_P=${PN}-${MY_PV} |
903 |
-DESCRIPTION="console display library" |
904 |
-HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" |
905 |
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" |
906 |
- |
907 |
-LICENSE="MIT" |
908 |
-# The subslot reflects the SONAME. |
909 |
-SLOT="5/5" |
910 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
911 |
-IUSE="gpm tinfo unicode" |
912 |
- |
913 |
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" |
914 |
-# Block the ncurses-5 that installs the same lib. #557472 |
915 |
-RDEPEND="${DEPEND} |
916 |
- !<sys-libs/ncurses-6:0" |
917 |
- |
918 |
-S=${WORKDIR}/${MY_P} |
919 |
- |
920 |
-PATCHES=( |
921 |
- "${FILESDIR}"/${PN}-5.8-gfbsd.patch |
922 |
- "${FILESDIR}"/${PN}-5.7-nongnu.patch |
923 |
- "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871 |
924 |
- "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763 |
925 |
- "${FILESDIR}"/${PN}-5.9-pkg-config.patch |
926 |
- "${FILESDIR}"/${P}-no-I-usr-include.patch #522586 |
927 |
- "${FILESDIR}"/${P}-gcc-5.patch #545114 |
928 |
-) |
929 |
- |
930 |
-src_prepare() { |
931 |
- epatch "${PATCHES[@]}" |
932 |
- |
933 |
- # /bin/sh is not always good enough |
934 |
- find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh' |
935 |
- |
936 |
- # Don't mess with _XOPEN_SOURCE for C++ on (Open)Solaris. The compiler |
937 |
- # defines a value for it, and depending on version, a different definition |
938 |
- # is used. Defining this variable on these systems is dangerous any time, |
939 |
- # since the system headers do strict checks on compatibility of flags and |
940 |
- # standards. |
941 |
- # Defining _XOPEN_SOURCE_EXTENDED together with _XOPEN_SOURCE leads to |
942 |
- # pre-_XOPEN_SOURCE=500 stuff, so only do it for non-C++ code. |
943 |
- # See also bug #431352 |
944 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
945 |
- sed -i \ |
946 |
- -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ |
947 |
- -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ |
948 |
- configure || die |
949 |
- # ONLY in C-mode, NOT C++ |
950 |
- append-cflags -D_XOPEN_SOURCE_EXTENDED |
951 |
- fi |
952 |
-} |
953 |
- |
954 |
-src_configure() { |
955 |
- unset TERMINFO #115036 |
956 |
- tc-export_build_env BUILD_{CC,CPP} |
957 |
- BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 |
958 |
- |
959 |
- # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
960 |
- # Order matters here -- we want unicode/thread versions to come last so that the |
961 |
- # binaries in /usr/bin support both wide and narrow. |
962 |
- # The naming is also important as we use these directly with filenames and when |
963 |
- # checking configure flags. |
964 |
- NCURSES_TARGETS=( |
965 |
- ncurses |
966 |
- $(usex unicode 'ncursesw' '') |
967 |
- ) |
968 |
- |
969 |
- # When installing ncurses, we have to use a compatible version of tic. |
970 |
- # This comes up when cross-compiling, doing multilib builds, upgrading, |
971 |
- # or installing for the first time. Build a local copy of tic whenever |
972 |
- # the host version isn't available. #249363 #557598 |
973 |
- if ! ROOT=/ has_version "~sys-libs/${P}" ; then |
974 |
- local lbuildflags="-static" |
975 |
- |
976 |
- # some toolchains don't quite support static linking |
977 |
- local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" |
978 |
- case ${CHOST} in |
979 |
- *-darwin*) dbuildflags= ;; |
980 |
- esac |
981 |
- echo "int main() {}" | \ |
982 |
- $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ |
983 |
- || lbuildflags="${dbuildflags}" |
984 |
- |
985 |
- # We can't re-use the multilib BUILD_DIR because we run outside of it. |
986 |
- BUILD_DIR="${WORKDIR}" \ |
987 |
- CHOST=${CBUILD} \ |
988 |
- CFLAGS=${BUILD_CFLAGS} \ |
989 |
- CXXFLAGS=${BUILD_CXXFLAGS} \ |
990 |
- CPPFLAGS=${BUILD_CPPFLAGS} \ |
991 |
- LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ |
992 |
- do_configure cross --without-shared --with-normal |
993 |
- fi |
994 |
- multilib-minimal_src_configure |
995 |
-} |
996 |
- |
997 |
-multilib_src_configure() { |
998 |
- local t |
999 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1000 |
- do_configure "${t}" |
1001 |
- done |
1002 |
-} |
1003 |
- |
1004 |
-do_configure() { |
1005 |
- local target=$1 |
1006 |
- shift |
1007 |
- |
1008 |
- mkdir "${BUILD_DIR}/${target}" |
1009 |
- cd "${BUILD_DIR}/${target}" || die |
1010 |
- |
1011 |
- local conf=( |
1012 |
- # We need the basic terminfo files in /etc, bug #37026. We will |
1013 |
- # add '--with-terminfo-dirs' and then populate /etc/terminfo in |
1014 |
- # src_install() ... |
1015 |
- --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" |
1016 |
- |
1017 |
- # Now the rest of the various standard flags. |
1018 |
- --without-hashed-db |
1019 |
- --disable-pc-files |
1020 |
- --$( |
1021 |
- if tc-is-static-only ; then |
1022 |
- echo without-shared |
1023 |
- else |
1024 |
- echo with-shared |
1025 |
- fi |
1026 |
- ) |
1027 |
- --without-hashed-db |
1028 |
- --without-ada |
1029 |
- --without-cxx |
1030 |
- --without-cxx-binding |
1031 |
- --without-debug |
1032 |
- --without-profile |
1033 |
- # The configure script uses ldd to parse the linked output which |
1034 |
- # is flaky for cross-compiling/multilib/ldd versions/etc... |
1035 |
- $(use_with gpm gpm libgpm.so.1) |
1036 |
- --disable-termcap |
1037 |
- --enable-symlinks |
1038 |
- --with-rcs-ids |
1039 |
- --with-manpage-format=normal |
1040 |
- --enable-const |
1041 |
- --enable-colorfgbg |
1042 |
- --enable-echo |
1043 |
- --disable-warnings |
1044 |
- --without-assertions |
1045 |
- --enable-leaks |
1046 |
- --without-expanded |
1047 |
- --with-macros |
1048 |
- --without-progs |
1049 |
- --without-tests |
1050 |
- --without-trace |
1051 |
- $(use_with tinfo termlib) |
1052 |
- |
1053 |
- # The chtype/mmask-t settings below are to retain ABI compat |
1054 |
- # with ncurses-5.4 so dont change em ! |
1055 |
- --with-chtype=long |
1056 |
- --with-mmask-t=long |
1057 |
- --disable-ext-colors |
1058 |
- --disable-ext-mouse |
1059 |
- --without-{pthread,reentrant} |
1060 |
- ) |
1061 |
- |
1062 |
- if [[ ${target} == ncurses*w ]] ; then |
1063 |
- conf+=( --enable-widec ) |
1064 |
- else |
1065 |
- conf+=( --disable-widec ) |
1066 |
- fi |
1067 |
- # Make sure each variant goes in a unique location. |
1068 |
- if [[ ${target} != "ncurses" ]] ; then |
1069 |
- conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) |
1070 |
- fi |
1071 |
- # See comments in src_configure. |
1072 |
- if [[ ${target} != "cross" ]] ; then |
1073 |
- local cross_path="${WORKDIR}/cross" |
1074 |
- [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
1075 |
- else |
1076 |
- conf+=( --with-progs ) |
1077 |
- fi |
1078 |
- |
1079 |
- # Force bash until upstream rebuilds the configure script with a newer |
1080 |
- # version of autotools. #545532 |
1081 |
- CONFIG_SHELL=${BASH} \ |
1082 |
- ECONF_SOURCE=${S} \ |
1083 |
- econf "${conf[@]}" "$@" |
1084 |
-} |
1085 |
- |
1086 |
-src_compile() { |
1087 |
- # See comments in src_configure. |
1088 |
- if ! ROOT=/ has_version "~sys-libs/${P}" ; then |
1089 |
- BUILD_DIR="${WORKDIR}" \ |
1090 |
- do_compile cross -C progs tic |
1091 |
- fi |
1092 |
- |
1093 |
- multilib-minimal_src_compile |
1094 |
-} |
1095 |
- |
1096 |
-multilib_src_compile() { |
1097 |
- local t |
1098 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1099 |
- do_compile "${t}" |
1100 |
- done |
1101 |
-} |
1102 |
- |
1103 |
-do_compile() { |
1104 |
- local target=$1 |
1105 |
- shift |
1106 |
- |
1107 |
- cd "${BUILD_DIR}/${target}" || die |
1108 |
- |
1109 |
- # A little hack to fix parallel builds ... they break when |
1110 |
- # generating sources so if we generate the sources first (in |
1111 |
- # non-parallel), we can then build the rest of the package |
1112 |
- # in parallel. This is not really a perf hit since the source |
1113 |
- # generation is quite small. |
1114 |
- emake -j1 sources |
1115 |
- emake "$@" |
1116 |
-} |
1117 |
- |
1118 |
-multilib_src_install() { |
1119 |
- local target lib |
1120 |
- for target in "${NCURSES_TARGETS[@]}" ; do |
1121 |
- cd "${BUILD_DIR}/${target}/lib" || die |
1122 |
- for lib in *$(get_libname 5.9) ; do |
1123 |
- newlib.so "${lib}" "${lib%%.9}" |
1124 |
- done |
1125 |
- done |
1126 |
-} |
1127 |
|
1128 |
diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild |
1129 |
deleted file mode 100644 |
1130 |
index c07a83ebf1..0000000000 |
1131 |
--- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild |
1132 |
+++ /dev/null |
1133 |
@@ -1,293 +0,0 @@ |
1134 |
-# Copyright 1999-2020 Gentoo Authors |
1135 |
-# Distributed under the terms of the GNU General Public License v2 |
1136 |
- |
1137 |
-EAPI=6 |
1138 |
- |
1139 |
-inherit flag-o-matic toolchain-funcs multilib-minimal multilib-build |
1140 |
- |
1141 |
-MY_PV=${PV:0:3} |
1142 |
-PV_SNAP=${PV:4} |
1143 |
-MY_P=${PN}-${MY_PV} |
1144 |
-DESCRIPTION="console display library" |
1145 |
-HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" |
1146 |
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" |
1147 |
- |
1148 |
-LICENSE="MIT" |
1149 |
-# The subslot reflects the SONAME. |
1150 |
-SLOT="0/6" |
1151 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1152 |
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" |
1153 |
- |
1154 |
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" |
1155 |
-# berkdb? ( sys-libs/db )" |
1156 |
-# Block the older ncurses that installed all files w/SLOT=5. #557472 |
1157 |
-RDEPEND="${DEPEND} |
1158 |
- !<=sys-libs/ncurses-5.9-r4:5 |
1159 |
- !<sys-libs/slang-2.3.2_pre23 |
1160 |
- !<x11-terms/rxvt-unicode-9.06-r3 |
1161 |
- !<x11-terms/st-0.6-r1 |
1162 |
- !app-emulation/emul-linux-x86-baselibs" |
1163 |
- |
1164 |
-S=${WORKDIR}/${MY_P} |
1165 |
- |
1166 |
-PATCHES=( |
1167 |
- "${FILESDIR}/${PN}-6.0-gfbsd.patch" |
1168 |
- "${FILESDIR}/${PN}-5.7-nongnu.patch" |
1169 |
- "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 |
1170 |
- "${FILESDIR}/${PN}-6.0-pkg-config.patch" |
1171 |
- "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 |
1172 |
- "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 |
1173 |
- "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 |
1174 |
- "${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494 |
1175 |
-) |
1176 |
- |
1177 |
-src_prepare() { |
1178 |
- [[ -n ${PV_SNAP} ]] && eapply "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh |
1179 |
- default |
1180 |
-} |
1181 |
- |
1182 |
-src_configure() { |
1183 |
- unset TERMINFO #115036 |
1184 |
- tc-export_build_env BUILD_{CC,CPP} |
1185 |
- BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 |
1186 |
- |
1187 |
- # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
1188 |
- # Order matters here -- we want unicode/thread versions to come last so that the |
1189 |
- # binaries in /usr/bin support both wide and narrow. |
1190 |
- # The naming is also important as we use these directly with filenames and when |
1191 |
- # checking configure flags. |
1192 |
- NCURSES_TARGETS=( |
1193 |
- ncurses |
1194 |
- $(usex unicode 'ncursesw' '') |
1195 |
- $(usex threads 'ncursest' '') |
1196 |
- $(use unicode && usex threads 'ncursestw' '') |
1197 |
- ) |
1198 |
- |
1199 |
- # When installing ncurses, we have to use a compatible version of tic. |
1200 |
- # This comes up when cross-compiling, doing multilib builds, upgrading, |
1201 |
- # or installing for the first time. Build a local copy of tic whenever |
1202 |
- # the host version isn't available. #249363 #557598 |
1203 |
- if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then |
1204 |
- local lbuildflags="-static" |
1205 |
- |
1206 |
- # some toolchains don't quite support static linking |
1207 |
- local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" |
1208 |
- case ${CHOST} in |
1209 |
- *-darwin*) dbuildflags= ;; |
1210 |
- *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; |
1211 |
- esac |
1212 |
- echo "int main() {}" | \ |
1213 |
- $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ |
1214 |
- || lbuildflags="${dbuildflags}" |
1215 |
- |
1216 |
- # We can't re-use the multilib BUILD_DIR because we run outside of it. |
1217 |
- BUILD_DIR="${WORKDIR}" \ |
1218 |
- CHOST=${CBUILD} \ |
1219 |
- CFLAGS=${BUILD_CFLAGS} \ |
1220 |
- CXXFLAGS=${BUILD_CXXFLAGS} \ |
1221 |
- CPPFLAGS=${BUILD_CPPFLAGS} \ |
1222 |
- LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ |
1223 |
- do_configure cross --without-shared --with-normal |
1224 |
- fi |
1225 |
- multilib-minimal_src_configure |
1226 |
-} |
1227 |
- |
1228 |
-multilib_src_configure() { |
1229 |
- local t |
1230 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1231 |
- do_configure "${t}" |
1232 |
- done |
1233 |
-} |
1234 |
- |
1235 |
-do_configure() { |
1236 |
- local target=$1 |
1237 |
- shift |
1238 |
- |
1239 |
- mkdir "${BUILD_DIR}/${target}" |
1240 |
- cd "${BUILD_DIR}/${target}" || die |
1241 |
- |
1242 |
- local conf=( |
1243 |
- # We need the basic terminfo files in /etc, bug #37026. We will |
1244 |
- # add '--with-terminfo-dirs' and then populate /etc/terminfo in |
1245 |
- # src_install() ... |
1246 |
- --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" |
1247 |
- # do not install in subdir (EPREFIX/usr/include/ncurses) |
1248 |
- --enable-overwrite |
1249 |
- |
1250 |
- # Disabled until #245417 is sorted out. |
1251 |
- #$(use_with berkdb hashed-db) |
1252 |
- |
1253 |
- # Enable installation of .pc files. |
1254 |
- --enable-pc-files |
1255 |
- # This path is used to control where the .pc files are installed. |
1256 |
- --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" |
1257 |
- |
1258 |
- # Now the rest of the various standard flags. |
1259 |
- --with-shared |
1260 |
- --without-hashed-db |
1261 |
- $(use_with ada) |
1262 |
- $(use_with cxx) |
1263 |
- $(use_with cxx cxx-binding) |
1264 |
- --with-cxx-shared |
1265 |
- $(use_with debug) |
1266 |
- $(use_with profile) |
1267 |
- # The configure script uses ldd to parse the linked output which |
1268 |
- # is flaky for cross-compiling/multilib/ldd versions/etc... |
1269 |
- $(use_with gpm gpm libgpm.so.1) |
1270 |
- --disable-termcap |
1271 |
- --enable-symlinks |
1272 |
- --with-rcs-ids |
1273 |
- --with-manpage-format=normal |
1274 |
- --enable-const |
1275 |
- --enable-colorfgbg |
1276 |
- --enable-hard-tabs |
1277 |
- --enable-echo |
1278 |
- $(use_enable !ada warnings) |
1279 |
- $(use_with debug assertions) |
1280 |
- $(use_enable !debug leaks) |
1281 |
- $(use_with debug expanded) |
1282 |
- $(use_with !debug macros) |
1283 |
- $(multilib_native_with progs) |
1284 |
- $(use_with test tests) |
1285 |
- $(use_with trace) |
1286 |
- $(use_with tinfo termlib) |
1287 |
- --disable-stripping |
1288 |
- ) |
1289 |
- |
1290 |
- if [[ ${target} == ncurses*w ]] ; then |
1291 |
- conf+=( --enable-widec ) |
1292 |
- else |
1293 |
- conf+=( --disable-widec ) |
1294 |
- fi |
1295 |
- if [[ ${target} == ncursest* ]] ; then |
1296 |
- conf+=( --with-{pthread,reentrant} ) |
1297 |
- else |
1298 |
- conf+=( --without-{pthread,reentrant} ) |
1299 |
- fi |
1300 |
- # Make sure each variant goes in a unique location. |
1301 |
- if [[ ${target} == "ncurses" ]] ; then |
1302 |
- # "ncurses" variant goes into "${EPREFIX}"/usr/include |
1303 |
- # It is needed on Prefix because the configure script appends |
1304 |
- # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. |
1305 |
- conf+=( --enable-overwrite ) |
1306 |
- else |
1307 |
- conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) |
1308 |
- fi |
1309 |
- # See comments in src_configure. |
1310 |
- if [[ ${target} != "cross" ]] ; then |
1311 |
- local cross_path="${WORKDIR}/cross" |
1312 |
- [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
1313 |
- fi |
1314 |
- |
1315 |
- # Force bash until upstream rebuilds the configure script with a newer |
1316 |
- # version of autotools. #545532 |
1317 |
- CONFIG_SHELL=${BASH} \ |
1318 |
- ECONF_SOURCE="${S}" \ |
1319 |
- econf "${conf[@]}" "$@" |
1320 |
-} |
1321 |
- |
1322 |
-src_compile() { |
1323 |
- # See comments in src_configure. |
1324 |
- if ! ROOT=/ has_version "~sys-libs/${P}:0" && !multilib_is_native_abi ; then |
1325 |
- # We make 'tic$(x)' here, for Cygwin having x=".exe". |
1326 |
- BUILD_DIR="${WORKDIR}" \ |
1327 |
- do_compile cross -C progs all PROGS='tic$(x)' |
1328 |
- fi |
1329 |
- |
1330 |
- multilib-minimal_src_compile |
1331 |
-} |
1332 |
- |
1333 |
-multilib_src_compile() { |
1334 |
- local t |
1335 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1336 |
- do_compile "${t}" |
1337 |
- done |
1338 |
-} |
1339 |
- |
1340 |
-do_compile() { |
1341 |
- local target=$1 |
1342 |
- shift |
1343 |
- |
1344 |
- cd "${BUILD_DIR}/${target}" || die |
1345 |
- |
1346 |
- # A little hack to fix parallel builds ... they break when |
1347 |
- # generating sources so if we generate the sources first (in |
1348 |
- # non-parallel), we can then build the rest of the package |
1349 |
- # in parallel. This is not really a perf hit since the source |
1350 |
- # generation is quite small. |
1351 |
- emake -j1 sources |
1352 |
- # For some reason, sources depends on pc-files which depends on |
1353 |
- # compiled libraries which depends on sources which ... |
1354 |
- # Manually delete the pc-files file so the install step will |
1355 |
- # create the .pc files we want. |
1356 |
- rm -f misc/pc-files |
1357 |
- emake "$@" |
1358 |
-} |
1359 |
- |
1360 |
-multilib_src_install() { |
1361 |
- local target |
1362 |
- for target in "${NCURSES_TARGETS[@]}" ; do |
1363 |
- emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install |
1364 |
- done |
1365 |
- |
1366 |
- # Move main libraries into /. |
1367 |
- if multilib_is_native_abi ; then |
1368 |
- gen_usr_ldscript -a \ |
1369 |
- "${NCURSES_TARGETS[@]}" \ |
1370 |
- $(use tinfo && usex unicode 'tinfow' '') \ |
1371 |
- $(usev tinfo) |
1372 |
- fi |
1373 |
- if ! tc-is-static-only ; then |
1374 |
- # Provide a link for -lcurses. |
1375 |
- ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die |
1376 |
- fi |
1377 |
- use static-libs || find "${ED}"/usr/ -name '*.a' -not -name "*$(get_libname)" -delete |
1378 |
- |
1379 |
- # Build fails to create this ... |
1380 |
- dosym ../share/terminfo /usr/$(get_libdir)/terminfo |
1381 |
-} |
1382 |
- |
1383 |
-multilib_src_install_all() { |
1384 |
-# if ! use berkdb ; then |
1385 |
- # We need the basic terminfo files in /etc, bug #37026 |
1386 |
- einfo "Installing basic terminfo files in /etc..." |
1387 |
- local x |
1388 |
- for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \ |
1389 |
- xterm xterm-{,256}color |
1390 |
- do |
1391 |
- local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) |
1392 |
- local basedir=$(basename $(dirname "${termfile}")) |
1393 |
- |
1394 |
- if [[ -n ${termfile} ]] ; then |
1395 |
- dodir /etc/terminfo/${basedir} |
1396 |
- mv ${termfile} "${ED}"/etc/terminfo/${basedir}/ |
1397 |
- dosym ../../../../etc/terminfo/${basedir}/${x} \ |
1398 |
- /usr/share/terminfo/${basedir}/${x} |
1399 |
- fi |
1400 |
- done |
1401 |
-# fi |
1402 |
- |
1403 |
- echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses |
1404 |
- doenvd "${T}"/50ncurses |
1405 |
- |
1406 |
- use minimal && rm -r "${ED}"/usr/share/terminfo* |
1407 |
- # Because ncurses5-config --terminfo returns the directory we keep it |
1408 |
- keepdir /usr/share/terminfo #245374 |
1409 |
- |
1410 |
- cd "${S}" |
1411 |
- dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc |
1412 |
- if use doc ; then |
1413 |
- docinto html |
1414 |
- dohtml -r doc/html/ |
1415 |
- fi |
1416 |
-} |
1417 |
- |
1418 |
-pkg_preinst() { |
1419 |
- preserve_old_lib /$(get_libdir)/libncurses.so.5 |
1420 |
- use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 |
1421 |
-} |
1422 |
- |
1423 |
-pkg_postinst() { |
1424 |
- preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 |
1425 |
- use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 |
1426 |
-} |
1427 |
|
1428 |
diff --git a/sys-libs/ncurses/ncurses-6.1-r3.ebuild b/sys-libs/ncurses/ncurses-6.1-r3.ebuild |
1429 |
deleted file mode 100644 |
1430 |
index 5b724f9169..0000000000 |
1431 |
--- a/sys-libs/ncurses/ncurses-6.1-r3.ebuild |
1432 |
+++ /dev/null |
1433 |
@@ -1,308 +0,0 @@ |
1434 |
-# Copyright 1999-2020 Gentoo Authors |
1435 |
-# Distributed under the terms of the GNU General Public License v2 |
1436 |
- |
1437 |
-EAPI="6" |
1438 |
- |
1439 |
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs |
1440 |
- |
1441 |
-MY_PV=${PV:0:3} |
1442 |
-PV_SNAP=${PV:4} |
1443 |
-MY_P=${PN}-${MY_PV} |
1444 |
-DESCRIPTION="console display library" |
1445 |
-HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" |
1446 |
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" |
1447 |
- |
1448 |
-LICENSE="MIT" |
1449 |
-# The subslot reflects the SONAME. |
1450 |
-SLOT="0/6" |
1451 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1452 |
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" |
1453 |
- |
1454 |
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" |
1455 |
-# berkdb? ( sys-libs/db )" |
1456 |
-# Block the older ncurses that installed all files w/SLOT=5. #557472 |
1457 |
-RDEPEND="${DEPEND} |
1458 |
- !<=sys-libs/ncurses-5.9-r4:5 |
1459 |
- !<sys-libs/slang-2.3.2_pre23 |
1460 |
- !<x11-terms/rxvt-unicode-9.06-r3 |
1461 |
- !<x11-terms/st-0.6-r1" |
1462 |
- |
1463 |
-S=${WORKDIR}/${MY_P} |
1464 |
- |
1465 |
-PATCHES=( |
1466 |
- "${FILESDIR}/${PN}-6.0-gfbsd.patch" |
1467 |
- "${FILESDIR}/${PN}-5.7-nongnu.patch" |
1468 |
- "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 |
1469 |
- "${FILESDIR}/${PN}-6.0-pkg-config.patch" |
1470 |
- "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 |
1471 |
- "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 |
1472 |
- "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 |
1473 |
- "${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494 |
1474 |
-) |
1475 |
- |
1476 |
-src_prepare() { |
1477 |
- [[ -n ${PV_SNAP} ]] && eapply "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh |
1478 |
- default |
1479 |
-} |
1480 |
- |
1481 |
-src_configure() { |
1482 |
- unset TERMINFO #115036 |
1483 |
- tc-export_build_env BUILD_{CC,CPP} |
1484 |
- BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 |
1485 |
- |
1486 |
- # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
1487 |
- # Order matters here -- we want unicode/thread versions to come last so that the |
1488 |
- # binaries in /usr/bin support both wide and narrow. |
1489 |
- # The naming is also important as we use these directly with filenames and when |
1490 |
- # checking configure flags. |
1491 |
- NCURSES_TARGETS=( |
1492 |
- ncurses |
1493 |
- $(usex unicode 'ncursesw' '') |
1494 |
- $(usex threads 'ncursest' '') |
1495 |
- $(use unicode && usex threads 'ncursestw' '') |
1496 |
- ) |
1497 |
- |
1498 |
- # When installing ncurses, we have to use a compatible version of tic. |
1499 |
- # This comes up when cross-compiling, doing multilib builds, upgrading, |
1500 |
- # or installing for the first time. Build a local copy of tic whenever |
1501 |
- # the host version isn't available. #249363 #557598 |
1502 |
- if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then |
1503 |
- local lbuildflags="-static" |
1504 |
- |
1505 |
- # some toolchains don't quite support static linking |
1506 |
- local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" |
1507 |
- case ${CHOST} in |
1508 |
- *-darwin*) dbuildflags= ;; |
1509 |
- *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; |
1510 |
- esac |
1511 |
- echo "int main() {}" | \ |
1512 |
- $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ |
1513 |
- || lbuildflags="${dbuildflags}" |
1514 |
- |
1515 |
- # We can't re-use the multilib BUILD_DIR because we run outside of it. |
1516 |
- BUILD_DIR="${WORKDIR}" \ |
1517 |
- CHOST=${CBUILD} \ |
1518 |
- CFLAGS=${BUILD_CFLAGS} \ |
1519 |
- CXXFLAGS=${BUILD_CXXFLAGS} \ |
1520 |
- CPPFLAGS=${BUILD_CPPFLAGS} \ |
1521 |
- LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ |
1522 |
- do_configure cross --without-shared --with-normal |
1523 |
- fi |
1524 |
- multilib-minimal_src_configure |
1525 |
-} |
1526 |
- |
1527 |
-multilib_src_configure() { |
1528 |
- local t |
1529 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1530 |
- do_configure "${t}" |
1531 |
- done |
1532 |
-} |
1533 |
- |
1534 |
-do_configure() { |
1535 |
- local target=$1 |
1536 |
- shift |
1537 |
- |
1538 |
- mkdir "${BUILD_DIR}/${target}" || die |
1539 |
- cd "${BUILD_DIR}/${target}" || die |
1540 |
- |
1541 |
- local conf=( |
1542 |
- # We need the basic terminfo files in /etc, bug #37026. We will |
1543 |
- # add '--with-terminfo-dirs' and then populate /etc/terminfo in |
1544 |
- # src_install() ... |
1545 |
- --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" |
1546 |
- # do not install in subdir (EPREFIX/usr/include/ncurses) |
1547 |
- --enable-overwrite |
1548 |
- |
1549 |
- # Disabled until #245417 is sorted out. |
1550 |
- #$(use_with berkdb hashed-db) |
1551 |
- |
1552 |
- # Enable installation of .pc files. |
1553 |
- --enable-pc-files |
1554 |
- # This path is used to control where the .pc files are installed. |
1555 |
- --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" |
1556 |
- |
1557 |
- # Now the rest of the various standard flags. |
1558 |
- --with-shared |
1559 |
- --without-hashed-db |
1560 |
- $(use_with ada) |
1561 |
- $(use_with cxx) |
1562 |
- $(use_with cxx cxx-binding) |
1563 |
- --with-cxx-shared |
1564 |
- $(use_with debug) |
1565 |
- $(use_with profile) |
1566 |
- # The configure script uses ldd to parse the linked output which |
1567 |
- # is flaky for cross-compiling/multilib/ldd versions/etc... |
1568 |
- $(use_with gpm gpm libgpm.so.1) |
1569 |
- # Required for building on mingw-w64, and possibly other windows |
1570 |
- # platforms, bug #639670 |
1571 |
- $(use_enable kernel_Winnt term-driver) |
1572 |
- --disable-termcap |
1573 |
- --enable-symlinks |
1574 |
- --with-rcs-ids |
1575 |
- --with-manpage-format=normal |
1576 |
- --enable-const |
1577 |
- --enable-colorfgbg |
1578 |
- --enable-hard-tabs |
1579 |
- --enable-echo |
1580 |
- $(use_enable !ada warnings) |
1581 |
- $(use_with debug assertions) |
1582 |
- $(use_enable !debug leaks) |
1583 |
- $(use_with debug expanded) |
1584 |
- $(use_with !debug macros) |
1585 |
- $(multilib_native_with progs) |
1586 |
- $(use_with test tests) |
1587 |
- $(use_with trace) |
1588 |
- $(use_with tinfo termlib) |
1589 |
- --disable-stripping |
1590 |
- ) |
1591 |
- |
1592 |
- if [[ ${target} == ncurses*w ]] ; then |
1593 |
- conf+=( --enable-widec ) |
1594 |
- else |
1595 |
- conf+=( --disable-widec ) |
1596 |
- fi |
1597 |
- if [[ ${target} == ncursest* ]] ; then |
1598 |
- conf+=( --with-{pthread,reentrant} ) |
1599 |
- else |
1600 |
- conf+=( --without-{pthread,reentrant} ) |
1601 |
- fi |
1602 |
- # Make sure each variant goes in a unique location. |
1603 |
- if [[ ${target} == "ncurses" ]] ; then |
1604 |
- # "ncurses" variant goes into "${EPREFIX}"/usr/include |
1605 |
- # It is needed on Prefix because the configure script appends |
1606 |
- # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. |
1607 |
- conf+=( --enable-overwrite ) |
1608 |
- else |
1609 |
- conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) |
1610 |
- fi |
1611 |
- # See comments in src_configure. |
1612 |
- if [[ ${target} != "cross" ]] ; then |
1613 |
- local cross_path="${WORKDIR}/cross" |
1614 |
- [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
1615 |
- fi |
1616 |
- |
1617 |
- # Force bash until upstream rebuilds the configure script with a newer |
1618 |
- # version of autotools. #545532 |
1619 |
- CONFIG_SHELL=${BASH} \ |
1620 |
- ECONF_SOURCE="${S}" \ |
1621 |
- econf "${conf[@]}" "$@" |
1622 |
-} |
1623 |
- |
1624 |
-src_compile() { |
1625 |
- # See comments in src_configure. |
1626 |
- if ! ROOT=/ has_version "~sys-libs/${P}:0" && !multilib_is_native_abi ; then |
1627 |
- # We make 'tic$(x)' here, for Cygwin having x=".exe". |
1628 |
- BUILD_DIR="${WORKDIR}" \ |
1629 |
- do_compile cross -C progs all PROGS='tic$(x)' |
1630 |
- fi |
1631 |
- |
1632 |
- multilib-minimal_src_compile |
1633 |
-} |
1634 |
- |
1635 |
-multilib_src_compile() { |
1636 |
- local t |
1637 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1638 |
- do_compile "${t}" |
1639 |
- done |
1640 |
-} |
1641 |
- |
1642 |
-do_compile() { |
1643 |
- local target=$1 |
1644 |
- shift |
1645 |
- |
1646 |
- cd "${BUILD_DIR}/${target}" || die |
1647 |
- |
1648 |
- # A little hack to fix parallel builds ... they break when |
1649 |
- # generating sources so if we generate the sources first (in |
1650 |
- # non-parallel), we can then build the rest of the package |
1651 |
- # in parallel. This is not really a perf hit since the source |
1652 |
- # generation is quite small. |
1653 |
- emake -j1 sources |
1654 |
- # For some reason, sources depends on pc-files which depends on |
1655 |
- # compiled libraries which depends on sources which ... |
1656 |
- # Manually delete the pc-files file so the install step will |
1657 |
- # create the .pc files we want. |
1658 |
- rm -f misc/pc-files || die |
1659 |
- emake "$@" |
1660 |
-} |
1661 |
- |
1662 |
-multilib_src_install() { |
1663 |
- local target |
1664 |
- for target in "${NCURSES_TARGETS[@]}" ; do |
1665 |
- emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install |
1666 |
- done |
1667 |
- |
1668 |
- # Move main libraries into /. |
1669 |
- if multilib_is_native_abi ; then |
1670 |
- gen_usr_ldscript -a \ |
1671 |
- "${NCURSES_TARGETS[@]}" \ |
1672 |
- $(use tinfo && usex unicode 'tinfow' '') \ |
1673 |
- $(usev tinfo) |
1674 |
- fi |
1675 |
- if ! tc-is-static-only ; then |
1676 |
- # Provide a link for -lcurses. |
1677 |
- ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die |
1678 |
- fi |
1679 |
- # don't delete '*.dll.a', needed for linking #631468 |
1680 |
- if ! use static-libs; then |
1681 |
- find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -a ! -name "*$(get_libname)" -delete || die |
1682 |
- fi |
1683 |
- |
1684 |
- # Build fails to create this ... |
1685 |
- dosym ../share/terminfo /usr/$(get_libdir)/terminfo |
1686 |
-} |
1687 |
- |
1688 |
-multilib_src_install_all() { |
1689 |
-# if ! use berkdb ; then |
1690 |
- # We need the basic terminfo files in /etc for embedded/recovery. #37026 |
1691 |
- einfo "Installing basic terminfo files in /etc..." |
1692 |
- local terms=( |
1693 |
- # Dumb/simple values that show up when using the in-kernel VT. |
1694 |
- ansi console dumb linux |
1695 |
- vt{52,100,102,200,220} |
1696 |
- # [u]rxvt users used to be pretty common. Probably should drop this |
1697 |
- # since upstream is dead and people are moving away from it. |
1698 |
- rxvt{,-unicode}{,-256color} |
1699 |
- # xterm users are common, as is terminals re-using/spoofing it. |
1700 |
- xterm xterm-{,256}color |
1701 |
- # screen is common (and reused by tmux). |
1702 |
- screen{,-256color} |
1703 |
- screen.xterm-256color |
1704 |
- ) |
1705 |
- local x |
1706 |
- for x in "${terms[@]}"; do |
1707 |
- local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) |
1708 |
- local basedir=$(basename "$(dirname "${termfile}")") |
1709 |
- |
1710 |
- if [[ -n ${termfile} ]] ; then |
1711 |
- dodir "/etc/terminfo/${basedir}" |
1712 |
- mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die |
1713 |
- dosym "../../../../etc/terminfo/${basedir}/${x}" \ |
1714 |
- "/usr/share/terminfo/${basedir}/${x}" |
1715 |
- fi |
1716 |
- done |
1717 |
-# fi |
1718 |
- |
1719 |
- echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses |
1720 |
- |
1721 |
- use minimal && rm -r "${ED}"/usr/share/terminfo* |
1722 |
- # Because ncurses5-config --terminfo returns the directory we keep it |
1723 |
- keepdir /usr/share/terminfo #245374 |
1724 |
- |
1725 |
- cd "${S}" || die |
1726 |
- dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc |
1727 |
- if use doc ; then |
1728 |
- docinto html |
1729 |
- dodoc -r doc/html/ |
1730 |
- fi |
1731 |
-} |
1732 |
- |
1733 |
-pkg_preinst() { |
1734 |
- preserve_old_lib /$(get_libdir)/libncurses.so.5 |
1735 |
- use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 |
1736 |
-} |
1737 |
- |
1738 |
-pkg_postinst() { |
1739 |
- preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 |
1740 |
- use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 |
1741 |
-} |
1742 |
|
1743 |
diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild |
1744 |
deleted file mode 100644 |
1745 |
index 8feae8ec77..0000000000 |
1746 |
--- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild |
1747 |
+++ /dev/null |
1748 |
@@ -1,317 +0,0 @@ |
1749 |
-# Copyright 1999-2020 Gentoo Authors |
1750 |
-# Distributed under the terms of the GNU General Public License v2 |
1751 |
- |
1752 |
-EAPI=7 |
1753 |
- |
1754 |
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript |
1755 |
- |
1756 |
-MY_PV="${PV:0:3}" |
1757 |
-MY_P="${PN}-${MY_PV}" |
1758 |
-DESCRIPTION="console display library" |
1759 |
-HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" |
1760 |
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" |
1761 |
- |
1762 |
-if [[ "${PV}" == *_p* ]] ; then |
1763 |
- SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2 |
1764 |
- https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2" |
1765 |
-fi |
1766 |
- |
1767 |
-LICENSE="MIT" |
1768 |
-# The subslot reflects the SONAME. |
1769 |
-SLOT="0/6" |
1770 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1771 |
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" |
1772 |
-RESTRICT="!test? ( test )" |
1773 |
- |
1774 |
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" |
1775 |
-# berkdb? ( sys-libs/db )" |
1776 |
-# Block the older ncurses that installed all files w/SLOT=5. #557472 |
1777 |
-RDEPEND="${DEPEND} |
1778 |
- !<=sys-libs/ncurses-5.9-r4:5 |
1779 |
- !<sys-libs/slang-2.3.2_pre23 |
1780 |
- !<x11-terms/rxvt-unicode-9.06-r3 |
1781 |
- !<x11-terms/st-0.6-r1" |
1782 |
- |
1783 |
-S="${WORKDIR}/${MY_P}" |
1784 |
- |
1785 |
-PATCHES=( |
1786 |
- "${FILESDIR}/${PN}-5.7-nongnu.patch" |
1787 |
- "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 |
1788 |
- "${FILESDIR}/${PN}-6.0-pkg-config.patch" |
1789 |
- "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 |
1790 |
- "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 |
1791 |
- "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 |
1792 |
- "${FILESDIR}/${PN}-6.2-no_user_ldflags_in_libs.patch" |
1793 |
-) |
1794 |
- |
1795 |
-src_prepare() { |
1796 |
- if [[ "${PV}" == *_p* ]] ; then |
1797 |
- eapply "${WORKDIR}"/${P/_p/-}-patch.sh |
1798 |
- fi |
1799 |
- default |
1800 |
-} |
1801 |
- |
1802 |
-src_configure() { |
1803 |
- unset TERMINFO #115036 |
1804 |
- tc-export_build_env BUILD_{CC,CPP} |
1805 |
- BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 |
1806 |
- |
1807 |
- # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
1808 |
- # Order matters here -- we want unicode/thread versions to come last so that the |
1809 |
- # binaries in /usr/bin support both wide and narrow. |
1810 |
- # The naming is also important as we use these directly with filenames and when |
1811 |
- # checking configure flags. |
1812 |
- NCURSES_TARGETS=( |
1813 |
- ncurses |
1814 |
- $(usex unicode 'ncursesw' '') |
1815 |
- $(usex threads 'ncursest' '') |
1816 |
- $(use unicode && usex threads 'ncursestw' '') |
1817 |
- ) |
1818 |
- |
1819 |
- # When installing ncurses, we have to use a compatible version of tic. |
1820 |
- # This comes up when cross-compiling, doing multilib builds, upgrading, |
1821 |
- # or installing for the first time. Build a local copy of tic whenever |
1822 |
- # the host version isn't available. #249363 #557598 |
1823 |
- if ! has_version -b "~sys-libs/${P}:0" ; then |
1824 |
- local lbuildflags="-static" |
1825 |
- |
1826 |
- # some toolchains don't quite support static linking |
1827 |
- local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" |
1828 |
- case ${CHOST} in |
1829 |
- *-darwin*) dbuildflags= ;; |
1830 |
- *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; |
1831 |
- esac |
1832 |
- echo "int main() {}" | \ |
1833 |
- $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ |
1834 |
- || lbuildflags="${dbuildflags}" |
1835 |
- |
1836 |
- # We can't re-use the multilib BUILD_DIR because we run outside of it. |
1837 |
- BUILD_DIR="${WORKDIR}" \ |
1838 |
- CHOST=${CBUILD} \ |
1839 |
- CFLAGS=${BUILD_CFLAGS} \ |
1840 |
- CXXFLAGS=${BUILD_CXXFLAGS} \ |
1841 |
- CPPFLAGS=${BUILD_CPPFLAGS} \ |
1842 |
- LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ |
1843 |
- do_configure cross --without-shared --with-normal |
1844 |
- fi |
1845 |
- multilib-minimal_src_configure |
1846 |
-} |
1847 |
- |
1848 |
-multilib_src_configure() { |
1849 |
- local t |
1850 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1851 |
- do_configure "${t}" |
1852 |
- done |
1853 |
-} |
1854 |
- |
1855 |
-do_configure() { |
1856 |
- local target=$1 |
1857 |
- shift |
1858 |
- |
1859 |
- mkdir "${BUILD_DIR}/${target}" || die |
1860 |
- cd "${BUILD_DIR}/${target}" || die |
1861 |
- |
1862 |
- local conf=( |
1863 |
- # We need the basic terminfo files in /etc, bug #37026. We will |
1864 |
- # add '--with-terminfo-dirs' and then populate /etc/terminfo in |
1865 |
- # src_install() ... |
1866 |
- --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" |
1867 |
- |
1868 |
- # Disabled until #245417 is sorted out. |
1869 |
- #$(use_with berkdb hashed-db) |
1870 |
- |
1871 |
- # Enable installation of .pc files. |
1872 |
- --enable-pc-files |
1873 |
- # This path is used to control where the .pc files are installed. |
1874 |
- --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" |
1875 |
- |
1876 |
- # Now the rest of the various standard flags. |
1877 |
- --with-shared |
1878 |
- --without-hashed-db |
1879 |
- $(use_with ada) |
1880 |
- $(use_with cxx) |
1881 |
- $(use_with cxx cxx-binding) |
1882 |
- --with-cxx-shared |
1883 |
- $(use_with debug) |
1884 |
- $(use_with profile) |
1885 |
- # The configure script uses ldd to parse the linked output which |
1886 |
- # is flaky for cross-compiling/multilib/ldd versions/etc... |
1887 |
- $(use_with gpm gpm libgpm.so.1) |
1888 |
- # Required for building on mingw-w64, and possibly other windows |
1889 |
- # platforms, bug #639670 |
1890 |
- $(use_enable kernel_Winnt term-driver) |
1891 |
- --disable-termcap |
1892 |
- --enable-symlinks |
1893 |
- --with-rcs-ids |
1894 |
- --with-manpage-format=normal |
1895 |
- --enable-const |
1896 |
- --enable-colorfgbg |
1897 |
- --enable-hard-tabs |
1898 |
- --enable-echo |
1899 |
- $(use_enable !ada warnings) |
1900 |
- $(use_with debug assertions) |
1901 |
- $(use_enable !debug leaks) |
1902 |
- $(use_with debug expanded) |
1903 |
- $(use_with !debug macros) |
1904 |
- $(multilib_native_with progs) |
1905 |
- $(use_with test tests) |
1906 |
- $(use_with trace) |
1907 |
- $(use_with tinfo termlib) |
1908 |
- --disable-stripping |
1909 |
- ) |
1910 |
- |
1911 |
- if [[ ${target} == ncurses*w ]] ; then |
1912 |
- conf+=( --enable-widec ) |
1913 |
- else |
1914 |
- conf+=( --disable-widec ) |
1915 |
- fi |
1916 |
- if [[ ${target} == ncursest* ]] ; then |
1917 |
- conf+=( --with-{pthread,reentrant} ) |
1918 |
- else |
1919 |
- conf+=( --without-{pthread,reentrant} ) |
1920 |
- fi |
1921 |
- # Make sure each variant goes in a unique location. |
1922 |
- if [[ ${target} == "ncurses" ]] ; then |
1923 |
- # "ncurses" variant goes into "${EPREFIX}"/usr/include |
1924 |
- # It is needed on Prefix because the configure script appends |
1925 |
- # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. |
1926 |
- conf+=( --enable-overwrite ) |
1927 |
- else |
1928 |
- conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) |
1929 |
- fi |
1930 |
- # See comments in src_configure. |
1931 |
- if [[ ${target} != "cross" ]] ; then |
1932 |
- local cross_path="${WORKDIR}/cross" |
1933 |
- [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
1934 |
- fi |
1935 |
- |
1936 |
- # Force bash until upstream rebuilds the configure script with a newer |
1937 |
- # version of autotools. #545532 |
1938 |
- CONFIG_SHELL=${EPREFIX}/bin/bash \ |
1939 |
- ECONF_SOURCE="${S}" \ |
1940 |
- econf "${conf[@]}" "$@" |
1941 |
-} |
1942 |
- |
1943 |
-src_compile() { |
1944 |
- # See comments in src_configure. |
1945 |
- if ! ROOT=/ has_version "~sys-libs/${P}:0" && ! multilib_is_native_abi ; then |
1946 |
- # We make 'tic$(x)' here, for Cygwin having x=".exe". |
1947 |
- BUILD_DIR="${WORKDIR}" \ |
1948 |
- do_compile cross -C progs all PROGS='tic$(x)' |
1949 |
- fi |
1950 |
- |
1951 |
- multilib-minimal_src_compile |
1952 |
-} |
1953 |
- |
1954 |
-multilib_src_compile() { |
1955 |
- local t |
1956 |
- for t in "${NCURSES_TARGETS[@]}" ; do |
1957 |
- do_compile "${t}" |
1958 |
- done |
1959 |
-} |
1960 |
- |
1961 |
-do_compile() { |
1962 |
- local target=$1 |
1963 |
- shift |
1964 |
- |
1965 |
- cd "${BUILD_DIR}/${target}" || die |
1966 |
- |
1967 |
- # A little hack to fix parallel builds ... they break when |
1968 |
- # generating sources so if we generate the sources first (in |
1969 |
- # non-parallel), we can then build the rest of the package |
1970 |
- # in parallel. This is not really a perf hit since the source |
1971 |
- # generation is quite small. |
1972 |
- emake -j1 sources |
1973 |
- # For some reason, sources depends on pc-files which depends on |
1974 |
- # compiled libraries which depends on sources which ... |
1975 |
- # Manually delete the pc-files file so the install step will |
1976 |
- # create the .pc files we want. |
1977 |
- rm -f misc/pc-files || die |
1978 |
- emake "$@" |
1979 |
-} |
1980 |
- |
1981 |
-multilib_src_install() { |
1982 |
- local target |
1983 |
- for target in "${NCURSES_TARGETS[@]}" ; do |
1984 |
- emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install |
1985 |
- done |
1986 |
- |
1987 |
- # Move main libraries into /. |
1988 |
- if multilib_is_native_abi ; then |
1989 |
- gen_usr_ldscript -a \ |
1990 |
- "${NCURSES_TARGETS[@]}" \ |
1991 |
- $(use tinfo && usex unicode 'tinfow' '') \ |
1992 |
- $(usev tinfo) |
1993 |
- fi |
1994 |
- if ! tc-is-static-only ; then |
1995 |
- # Provide a link for -lcurses. |
1996 |
- ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die |
1997 |
- fi |
1998 |
- # don't delete '*.dll.a', needed for linking #631468 |
1999 |
- if ! use static-libs; then |
2000 |
- find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die |
2001 |
- fi |
2002 |
- |
2003 |
- # Build fails to create this ... |
2004 |
- # -FIXME- |
2005 |
- # Ugly hackaround for riscv having two parts libdir (#689240) |
2006 |
- # Replace this hack with an official solution once we have one... |
2007 |
- # -FIXME- |
2008 |
- dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \ |
2009 |
- /usr/$(get_libdir)/terminfo |
2010 |
-} |
2011 |
- |
2012 |
-multilib_src_install_all() { |
2013 |
-# if ! use berkdb ; then |
2014 |
- # We need the basic terminfo files in /etc for embedded/recovery. #37026 |
2015 |
- einfo "Installing basic terminfo files in /etc..." |
2016 |
- local terms=( |
2017 |
- # Dumb/simple values that show up when using the in-kernel VT. |
2018 |
- ansi console dumb linux |
2019 |
- vt{52,100,102,200,220} |
2020 |
- # [u]rxvt users used to be pretty common. Probably should drop this |
2021 |
- # since upstream is dead and people are moving away from it. |
2022 |
- rxvt{,-unicode}{,-256color} |
2023 |
- # xterm users are common, as is terminals re-using/spoofing it. |
2024 |
- xterm xterm-{,256}color |
2025 |
- # screen is common (and reused by tmux). |
2026 |
- screen{,-256color} |
2027 |
- screen.xterm-256color |
2028 |
- ) |
2029 |
- local x |
2030 |
- for x in "${terms[@]}"; do |
2031 |
- local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) |
2032 |
- local basedir=$(basename "$(dirname "${termfile}")") |
2033 |
- |
2034 |
- if [[ -n ${termfile} ]] ; then |
2035 |
- dodir "/etc/terminfo/${basedir}" |
2036 |
- mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die |
2037 |
- dosym "../../../../etc/terminfo/${basedir}/${x}" \ |
2038 |
- "/usr/share/terminfo/${basedir}/${x}" |
2039 |
- fi |
2040 |
- done |
2041 |
-# fi |
2042 |
- |
2043 |
- echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses |
2044 |
- |
2045 |
- use minimal && rm -r "${ED}"/usr/share/terminfo* |
2046 |
- # Because ncurses5-config --terminfo returns the directory we keep it |
2047 |
- keepdir /usr/share/terminfo #245374 |
2048 |
- |
2049 |
- cd "${S}" || die |
2050 |
- dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc |
2051 |
- if use doc ; then |
2052 |
- docinto html |
2053 |
- dodoc -r doc/html/ |
2054 |
- fi |
2055 |
-} |
2056 |
- |
2057 |
-pkg_preinst() { |
2058 |
- preserve_old_lib /$(get_libdir)/libncurses.so.5 |
2059 |
- use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 |
2060 |
-} |
2061 |
- |
2062 |
-pkg_postinst() { |
2063 |
- preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 |
2064 |
- use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 |
2065 |
-} |