Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/
Date: Thu, 09 Mar 2017 05:01:38
Message-Id: 1489035470.94f99af61ba52171a74feccf91a0f387ddecf7ae.vapier@gentoo
1 commit: 94f99af61ba52171a74feccf91a0f387ddecf7ae
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 9 04:56:33 2017 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 9 04:57:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f99af6
7
8 sys-libs/ncurses: drop old versions with funky SLOTs
9
10 sys-libs/ncurses/ncurses-5.9-r3.ebuild | 225 -------------------------------
11 sys-libs/ncurses/ncurses-5.9-r4.ebuild | 230 -------------------------------
12 sys-libs/ncurses/ncurses-5.9-r5.ebuild | 232 --------------------------------
13 sys-libs/ncurses/ncurses-5.9-r99.ebuild | 20 ---
14 sys-libs/ncurses/ncurses-6.0.ebuild | 20 ---
15 5 files changed, 727 deletions(-)
16
17 diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
18 deleted file mode 100644
19 index 2d540b0ae87..00000000000
20 --- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
21 +++ /dev/null
22 @@ -1,225 +0,0 @@
23 -# Copyright 1999-2014 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI="4"
27 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
28 -
29 -MY_PV=${PV:0:3}
30 -PV_SNAP=${PV:4}
31 -MY_P=${PN}-${MY_PV}
32 -DESCRIPTION="console display library"
33 -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
34 -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
35 -
36 -LICENSE="MIT"
37 -SLOT="0"
38 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
39 -IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
40 -
41 -DEPEND="gpm? ( sys-libs/gpm )"
42 -# berkdb? ( sys-libs/db )"
43 -# Block the older ncurses that installed all files w/SLOT=5. #557472
44 -RDEPEND="${DEPEND}
45 - !<x11-terms/rxvt-unicode-9.06-r3
46 - abi_x86_32? (
47 - !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
48 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
49 - )"
50 -# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
51 -# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
52 -# line below once we can assume multilib gpm is available everywhere.
53 -PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
54 -
55 -S=${WORKDIR}/${MY_P}
56 -HOSTTIC_DIR=${WORKDIR}/${P}-host
57 -
58 -src_prepare() {
59 - [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
60 - epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
61 - epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
62 - epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
63 - epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
64 - epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
65 -}
66 -
67 -src_configure() {
68 - unset TERMINFO #115036
69 - tc-export_build_env BUILD_{CC,CPP}
70 - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
71 -
72 - # when cross-compiling, we need to build up our own tic
73 - # because people often don't keep matching host/target
74 - # ncurses versions #249363
75 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
76 - CHOST=${CBUILD} \
77 - CFLAGS=${BUILD_CFLAGS} \
78 - CXXFLAGS=${BUILD_CXXFLAGS} \
79 - CPPFLAGS=${BUILD_CPPFLAGS} \
80 - LDFLAGS="${BUILD_LDFLAGS} -static" \
81 - BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal
82 - fi
83 - multilib-minimal_src_configure
84 -}
85 -
86 -multilib_src_configure() {
87 - do_configure narrowc
88 - use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
89 -}
90 -
91 -do_configure() {
92 - ECONF_SOURCE=${S}
93 -
94 - mkdir "${BUILD_DIR}"-$1
95 - cd "${BUILD_DIR}"-$1 || die
96 - shift
97 -
98 - local conf=(
99 - # We need the basic terminfo files in /etc, bug #37026. We will
100 - # add '--with-terminfo-dirs' and then populate /etc/terminfo in
101 - # src_install() ...
102 - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
103 -
104 - # Disabled until #245417 is sorted out.
105 - #$(use_with berkdb hashed-db)
106 -
107 - # ncurses is dumb and doesn't install .pc files unless pkg-config
108 - # is also installed. Force the tests to go our way. Note that it
109 - # doesn't actually use pkg-config ... it just looks for set vars.
110 - --enable-pc-files
111 - --with-pkg-config="$(tc-getPKG_CONFIG)"
112 - # This path is used to control where the .pc files are installed.
113 - PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
114 -
115 - # Now the rest of the various standard flags.
116 - --with-shared
117 - --without-hashed-db
118 - $(use_with ada)
119 - $(use_with cxx)
120 - $(use_with cxx cxx-binding)
121 - $(use_with debug)
122 - $(use_with profile)
123 - # The configure script uses ldd to parse the linked output which
124 - # is flaky for cross-compiling/multilib/ldd versions/etc...
125 - $(use_with gpm gpm libgpm.so.1)
126 - --disable-termcap
127 - --enable-symlinks
128 - --with-rcs-ids
129 - --with-manpage-format=normal
130 - --enable-const
131 - --enable-colorfgbg
132 - --enable-echo
133 - $(use_enable !ada warnings)
134 - $(use_with debug assertions)
135 - $(use_enable debug leaks)
136 - $(use_with debug expanded)
137 - $(use_with !debug macros)
138 - $(use_with trace)
139 - $(use_with tinfo termlib)
140 -
141 - # The chtype/mmask-t settings below are to retain ABI compat
142 - # with ncurses-5.4 so dont change em !
143 - --with-chtype=long
144 - --with-mmask-t=long
145 - --disable-ext-colors
146 - --disable-ext-mouse
147 - --without-pthread
148 - --without-reentrant
149 - )
150 -
151 - econf "${conf[@]}" "$@"
152 -}
153 -
154 -src_compile() {
155 - # when cross-compiling, we need to build up our own tic
156 - # because people often don't keep matching host/target
157 - # ncurses versions #249363
158 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
159 - make_flags="-C progs tic"
160 - BUILD_DIR="${HOSTTIC_DIR}" do_compile cross
161 - fi
162 -
163 - multilib-minimal_src_compile
164 -}
165 -
166 -multilib_src_compile() {
167 - make_flags=""
168 - multilib_is_native_abi || make_flags="PROGS= "
169 - do_compile narrowc
170 - use unicode && do_compile widec
171 -}
172 -
173 -do_compile() {
174 - cd "${BUILD_DIR}"-$1 || die
175 -
176 - # A little hack to fix parallel builds ... they break when
177 - # generating sources so if we generate the sources first (in
178 - # non-parallel), we can then build the rest of the package
179 - # in parallel. This is not really a perf hit since the source
180 - # generation is quite small.
181 - emake -j1 sources
182 - # For some reason, sources depends on pc-files which depends on
183 - # compiled libraries which depends on sources which ...
184 - # Manually delete the pc-files file so the install step will
185 - # create the .pc files we want.
186 - rm -f misc/pc-files
187 - emake ${make_flags}
188 -}
189 -
190 -multilib_src_install() {
191 - # use the cross-compiled tic (if need be) #249363
192 - export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}"
193 -
194 - # install unicode version second so that the binaries in /usr/bin
195 - # support both wide and narrow
196 - cd "${BUILD_DIR}"-narrowc || die
197 - emake DESTDIR="${D}" install
198 - if use unicode ; then
199 - cd "${BUILD_DIR}"-widec || die
200 - emake DESTDIR="${D}" install
201 - fi
202 -
203 - # Move libncurses{,w} into /lib
204 - gen_usr_ldscript -a \
205 - ncurses \
206 - $(usex unicode 'ncursesw' '') \
207 - $(use tinfo && usex unicode 'tinfow' '') \
208 - $(usev tinfo)
209 - if ! tc-is-static-only ; then
210 - ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
211 - fi
212 - use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
213 -
214 - # Build fails to create this ...
215 - dosym ../share/terminfo /usr/$(get_libdir)/terminfo
216 -}
217 -
218 -multilib_src_install_all() {
219 -# if ! use berkdb ; then
220 - # We need the basic terminfo files in /etc, bug #37026
221 - einfo "Installing basic terminfo files in /etc..."
222 - for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
223 - xterm xterm-color xterm-xfree86
224 - do
225 - local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
226 - local basedir=$(basename $(dirname "${termfile}"))
227 -
228 - if [[ -n ${termfile} ]] ; then
229 - dodir /etc/terminfo/${basedir}
230 - mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
231 - dosym ../../../../etc/terminfo/${basedir}/${x} \
232 - /usr/share/terminfo/${basedir}/${x}
233 - fi
234 - done
235 -# fi
236 -
237 - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
238 - doenvd "${T}"/50ncurses
239 -
240 - use minimal && rm -r "${ED}"/usr/share/terminfo*
241 - # Because ncurses5-config --terminfo returns the directory we keep it
242 - keepdir /usr/share/terminfo #245374
243 -
244 - cd "${S}"
245 - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
246 - use doc && dohtml -r doc/html/
247 -}
248
249 diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
250 deleted file mode 100644
251 index 2d4baab203f..00000000000
252 --- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
253 +++ /dev/null
254 @@ -1,230 +0,0 @@
255 -# Copyright 1999-2015 Gentoo Foundation
256 -# Distributed under the terms of the GNU General Public License v2
257 -
258 -EAPI="4"
259 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
260 -
261 -MY_PV=${PV:0:3}
262 -PV_SNAP=${PV:4}
263 -MY_P=${PN}-${MY_PV}
264 -DESCRIPTION="console display library"
265 -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
266 -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
267 -
268 -LICENSE="MIT"
269 -SLOT="0"
270 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
271 -IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
272 -
273 -DEPEND="gpm? ( sys-libs/gpm )"
274 -# berkdb? ( sys-libs/db )"
275 -# Block the older ncurses that installed all files w/SLOT=5. #557472
276 -RDEPEND="${DEPEND}
277 - !<=sys-libs/ncurses-5.9-r4:5
278 - !<x11-terms/rxvt-unicode-9.06-r3
279 - abi_x86_32? (
280 - !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
281 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
282 - )"
283 -# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
284 -# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
285 -# line below once we can assume multilib gpm is available everywhere.
286 -PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
287 -
288 -S=${WORKDIR}/${MY_P}
289 -HOSTTIC_DIR=${WORKDIR}/${P}-host
290 -
291 -src_prepare() {
292 - [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
293 - epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
294 - epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
295 - epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
296 - epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
297 - epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
298 - epatch "${FILESDIR}"/${P}-no-I-usr-include.patch #522586
299 - epatch "${FILESDIR}"/${P}-gcc-5.patch #545114
300 -}
301 -
302 -src_configure() {
303 - unset TERMINFO #115036
304 - tc-export_build_env BUILD_{CC,CPP}
305 - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
306 -
307 - # when cross-compiling, we need to build up our own tic
308 - # because people often don't keep matching host/target
309 - # ncurses versions #249363
310 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
311 - CHOST=${CBUILD} \
312 - CFLAGS=${BUILD_CFLAGS} \
313 - CXXFLAGS=${BUILD_CXXFLAGS} \
314 - CPPFLAGS=${BUILD_CPPFLAGS} \
315 - LDFLAGS="${BUILD_LDFLAGS} -static" \
316 - BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal
317 - fi
318 - multilib-minimal_src_configure
319 -}
320 -
321 -multilib_src_configure() {
322 - do_configure narrowc
323 - use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
324 -}
325 -
326 -do_configure() {
327 - ECONF_SOURCE=${S}
328 -
329 - mkdir "${BUILD_DIR}"-$1
330 - cd "${BUILD_DIR}"-$1 || die
331 - shift
332 -
333 - local conf=(
334 - # We need the basic terminfo files in /etc, bug #37026. We will
335 - # add '--with-terminfo-dirs' and then populate /etc/terminfo in
336 - # src_install() ...
337 - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
338 -
339 - # Disabled until #245417 is sorted out.
340 - #$(use_with berkdb hashed-db)
341 -
342 - # ncurses is dumb and doesn't install .pc files unless pkg-config
343 - # is also installed. Force the tests to go our way. Note that it
344 - # doesn't actually use pkg-config ... it just looks for set vars.
345 - --enable-pc-files
346 - --with-pkg-config="$(tc-getPKG_CONFIG)"
347 - # This path is used to control where the .pc files are installed.
348 - PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
349 -
350 - # Now the rest of the various standard flags.
351 - --with-shared
352 - --without-hashed-db
353 - $(use_with ada)
354 - $(use_with cxx)
355 - $(use_with cxx cxx-binding)
356 - $(use_with debug)
357 - $(use_with profile)
358 - # The configure script uses ldd to parse the linked output which
359 - # is flaky for cross-compiling/multilib/ldd versions/etc...
360 - $(use_with gpm gpm libgpm.so.1)
361 - --disable-termcap
362 - --enable-symlinks
363 - --with-rcs-ids
364 - --with-manpage-format=normal
365 - --enable-const
366 - --enable-colorfgbg
367 - --enable-echo
368 - $(use_enable !ada warnings)
369 - $(use_with debug assertions)
370 - $(use_enable !debug leaks)
371 - $(use_with debug expanded)
372 - $(use_with !debug macros)
373 - $(use_with trace)
374 - $(use_with tinfo termlib)
375 -
376 - # The chtype/mmask-t settings below are to retain ABI compat
377 - # with ncurses-5.4 so dont change em !
378 - --with-chtype=long
379 - --with-mmask-t=long
380 - --disable-ext-colors
381 - --disable-ext-mouse
382 - --without-pthread
383 - --without-reentrant
384 - )
385 -
386 - # Force bash until upstream rebuilds the configure script with a newer
387 - # version of autotools. #545532
388 - CONFIG_SHELL=/bin/bash econf "${conf[@]}" "$@"
389 -}
390 -
391 -src_compile() {
392 - # when cross-compiling, we need to build up our own tic
393 - # because people often don't keep matching host/target
394 - # ncurses versions #249363
395 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
396 - make_flags="-C progs tic"
397 - BUILD_DIR="${HOSTTIC_DIR}" do_compile cross
398 - fi
399 -
400 - multilib-minimal_src_compile
401 -}
402 -
403 -multilib_src_compile() {
404 - make_flags=""
405 - multilib_is_native_abi || make_flags="PROGS= "
406 - do_compile narrowc
407 - use unicode && do_compile widec
408 -}
409 -
410 -do_compile() {
411 - cd "${BUILD_DIR}"-$1 || die
412 -
413 - # A little hack to fix parallel builds ... they break when
414 - # generating sources so if we generate the sources first (in
415 - # non-parallel), we can then build the rest of the package
416 - # in parallel. This is not really a perf hit since the source
417 - # generation is quite small.
418 - emake -j1 sources
419 - # For some reason, sources depends on pc-files which depends on
420 - # compiled libraries which depends on sources which ...
421 - # Manually delete the pc-files file so the install step will
422 - # create the .pc files we want.
423 - rm -f misc/pc-files
424 - emake ${make_flags}
425 -}
426 -
427 -multilib_src_install() {
428 - # use the cross-compiled tic (if need be) #249363
429 - export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}"
430 -
431 - # install unicode version second so that the binaries in /usr/bin
432 - # support both wide and narrow
433 - cd "${BUILD_DIR}"-narrowc || die
434 - emake DESTDIR="${D}" install
435 - if use unicode ; then
436 - cd "${BUILD_DIR}"-widec || die
437 - emake DESTDIR="${D}" install
438 - fi
439 -
440 - # Move libncurses{,w} into /lib
441 - gen_usr_ldscript -a \
442 - ncurses \
443 - $(usex unicode 'ncursesw' '') \
444 - $(use tinfo && usex unicode 'tinfow' '') \
445 - $(usev tinfo)
446 - if ! tc-is-static-only ; then
447 - ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
448 - fi
449 - use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
450 -
451 - # Build fails to create this ...
452 - dosym ../share/terminfo /usr/$(get_libdir)/terminfo
453 -}
454 -
455 -multilib_src_install_all() {
456 -# if ! use berkdb ; then
457 - # We need the basic terminfo files in /etc, bug #37026
458 - einfo "Installing basic terminfo files in /etc..."
459 - for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
460 - xterm xterm-color xterm-xfree86
461 - do
462 - local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
463 - local basedir=$(basename $(dirname "${termfile}"))
464 -
465 - if [[ -n ${termfile} ]] ; then
466 - dodir /etc/terminfo/${basedir}
467 - mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
468 - dosym ../../../../etc/terminfo/${basedir}/${x} \
469 - /usr/share/terminfo/${basedir}/${x}
470 - fi
471 - done
472 -# fi
473 -
474 - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
475 - doenvd "${T}"/50ncurses
476 -
477 - use minimal && rm -r "${ED}"/usr/share/terminfo*
478 - # Because ncurses5-config --terminfo returns the directory we keep it
479 - keepdir /usr/share/terminfo #245374
480 -
481 - cd "${S}"
482 - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
483 - use doc && dohtml -r doc/html/
484 -}
485
486 diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
487 deleted file mode 100644
488 index 001fc43c297..00000000000
489 --- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild
490 +++ /dev/null
491 @@ -1,232 +0,0 @@
492 -# Copyright 1999-2015 Gentoo Foundation
493 -# Distributed under the terms of the GNU General Public License v2
494 -
495 -EAPI="5"
496 -
497 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal
498 -
499 -MY_PV=${PV:0:3}
500 -PV_SNAP=${PV:4}
501 -MY_P=${PN}-${MY_PV}
502 -DESCRIPTION="console display library"
503 -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
504 -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
505 -
506 -LICENSE="MIT"
507 -# The subslot reflects the SONAME.
508 -SLOT="0/5"
509 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
510 -IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
511 -
512 -DEPEND="gpm? ( sys-libs/gpm )"
513 -# berkdb? ( sys-libs/db )"
514 -# Block the older ncurses that installed all files w/SLOT=5. #557472
515 -RDEPEND="${DEPEND}
516 - !<=sys-libs/ncurses-5.9-r4:5
517 - !<x11-terms/rxvt-unicode-9.06-r3
518 - abi_x86_32? (
519 - !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
520 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
521 - )"
522 -# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
523 -# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
524 -# line below once we can assume multilib gpm is available everywhere.
525 -PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
526 -
527 -S=${WORKDIR}/${MY_P}
528 -HOSTTIC_DIR=${WORKDIR}/${P}-host
529 -
530 -src_prepare() {
531 - [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
532 - epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
533 - epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
534 - epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
535 - epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
536 - epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
537 - epatch "${FILESDIR}"/${P}-no-I-usr-include.patch #522586
538 - epatch "${FILESDIR}"/${P}-gcc-5.patch #545114
539 -}
540 -
541 -src_configure() {
542 - unset TERMINFO #115036
543 - tc-export_build_env BUILD_{CC,CPP}
544 - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
545 -
546 - # when cross-compiling, we need to build up our own tic
547 - # because people often don't keep matching host/target
548 - # ncurses versions #249363
549 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
550 - CHOST=${CBUILD} \
551 - CFLAGS=${BUILD_CFLAGS} \
552 - CXXFLAGS=${BUILD_CXXFLAGS} \
553 - CPPFLAGS=${BUILD_CPPFLAGS} \
554 - LDFLAGS="${BUILD_LDFLAGS} -static" \
555 - BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal
556 - fi
557 - multilib-minimal_src_configure
558 -}
559 -
560 -multilib_src_configure() {
561 - do_configure narrowc
562 - use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
563 -}
564 -
565 -do_configure() {
566 - ECONF_SOURCE=${S}
567 -
568 - mkdir "${BUILD_DIR}"-$1
569 - cd "${BUILD_DIR}"-$1 || die
570 - shift
571 -
572 - local conf=(
573 - # We need the basic terminfo files in /etc, bug #37026. We will
574 - # add '--with-terminfo-dirs' and then populate /etc/terminfo in
575 - # src_install() ...
576 - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
577 -
578 - # Disabled until #245417 is sorted out.
579 - #$(use_with berkdb hashed-db)
580 -
581 - # ncurses is dumb and doesn't install .pc files unless pkg-config
582 - # is also installed. Force the tests to go our way. Note that it
583 - # doesn't actually use pkg-config ... it just looks for set vars.
584 - --enable-pc-files
585 - --with-pkg-config="$(tc-getPKG_CONFIG)"
586 - # This path is used to control where the .pc files are installed.
587 - PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
588 -
589 - # Now the rest of the various standard flags.
590 - --with-shared
591 - --without-hashed-db
592 - $(use_with ada)
593 - $(use_with cxx)
594 - $(use_with cxx cxx-binding)
595 - $(use_with debug)
596 - $(use_with profile)
597 - # The configure script uses ldd to parse the linked output which
598 - # is flaky for cross-compiling/multilib/ldd versions/etc...
599 - $(use_with gpm gpm libgpm.so.1)
600 - --disable-termcap
601 - --enable-symlinks
602 - --with-rcs-ids
603 - --with-manpage-format=normal
604 - --enable-const
605 - --enable-colorfgbg
606 - --enable-echo
607 - $(use_enable !ada warnings)
608 - $(use_with debug assertions)
609 - $(use_enable !debug leaks)
610 - $(use_with debug expanded)
611 - $(use_with !debug macros)
612 - $(use_with trace)
613 - $(use_with tinfo termlib)
614 -
615 - # The chtype/mmask-t settings below are to retain ABI compat
616 - # with ncurses-5.4 so dont change em !
617 - --with-chtype=long
618 - --with-mmask-t=long
619 - --disable-ext-colors
620 - --disable-ext-mouse
621 - --without-pthread
622 - --without-reentrant
623 - )
624 -
625 - # Force bash until upstream rebuilds the configure script with a newer
626 - # version of autotools. #545532
627 - CONFIG_SHELL=/bin/bash econf "${conf[@]}" "$@"
628 -}
629 -
630 -src_compile() {
631 - # when cross-compiling, we need to build up our own tic
632 - # because people often don't keep matching host/target
633 - # ncurses versions #249363
634 - if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
635 - make_flags="-C progs tic"
636 - BUILD_DIR="${HOSTTIC_DIR}" do_compile cross
637 - fi
638 -
639 - multilib-minimal_src_compile
640 -}
641 -
642 -multilib_src_compile() {
643 - make_flags=""
644 - multilib_is_native_abi || make_flags="PROGS= "
645 - do_compile narrowc
646 - use unicode && do_compile widec
647 -}
648 -
649 -do_compile() {
650 - cd "${BUILD_DIR}"-$1 || die
651 -
652 - # A little hack to fix parallel builds ... they break when
653 - # generating sources so if we generate the sources first (in
654 - # non-parallel), we can then build the rest of the package
655 - # in parallel. This is not really a perf hit since the source
656 - # generation is quite small.
657 - emake -j1 sources
658 - # For some reason, sources depends on pc-files which depends on
659 - # compiled libraries which depends on sources which ...
660 - # Manually delete the pc-files file so the install step will
661 - # create the .pc files we want.
662 - rm -f misc/pc-files
663 - emake ${make_flags}
664 -}
665 -
666 -multilib_src_install() {
667 - # use the cross-compiled tic (if need be) #249363
668 - export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}"
669 -
670 - # install unicode version second so that the binaries in /usr/bin
671 - # support both wide and narrow
672 - cd "${BUILD_DIR}"-narrowc || die
673 - emake DESTDIR="${D}" install
674 - if use unicode ; then
675 - cd "${BUILD_DIR}"-widec || die
676 - emake DESTDIR="${D}" install
677 - fi
678 -
679 - # Move libncurses{,w} into /lib
680 - gen_usr_ldscript -a \
681 - ncurses \
682 - $(usex unicode 'ncursesw' '') \
683 - $(use tinfo && usex unicode 'tinfow' '') \
684 - $(usev tinfo)
685 - if ! tc-is-static-only ; then
686 - ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
687 - fi
688 - use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
689 -
690 - # Build fails to create this ...
691 - dosym ../share/terminfo /usr/$(get_libdir)/terminfo
692 -}
693 -
694 -multilib_src_install_all() {
695 -# if ! use berkdb ; then
696 - # We need the basic terminfo files in /etc, bug #37026
697 - einfo "Installing basic terminfo files in /etc..."
698 - for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
699 - xterm xterm-color xterm-xfree86
700 - do
701 - local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
702 - local basedir=$(basename $(dirname "${termfile}"))
703 -
704 - if [[ -n ${termfile} ]] ; then
705 - dodir /etc/terminfo/${basedir}
706 - mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
707 - dosym ../../../../etc/terminfo/${basedir}/${x} \
708 - /usr/share/terminfo/${basedir}/${x}
709 - fi
710 - done
711 -# fi
712 -
713 - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
714 - doenvd "${T}"/50ncurses
715 -
716 - use minimal && rm -r "${ED}"/usr/share/terminfo*
717 - # Because ncurses5-config --terminfo returns the directory we keep it
718 - keepdir /usr/share/terminfo #245374
719 -
720 - cd "${S}"
721 - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
722 - use doc && dohtml -r doc/html/
723 -}
724
725 diff --git a/sys-libs/ncurses/ncurses-5.9-r99.ebuild b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
726 deleted file mode 100644
727 index cc3356f93e0..00000000000
728 --- a/sys-libs/ncurses/ncurses-5.9-r99.ebuild
729 +++ /dev/null
730 @@ -1,20 +0,0 @@
731 -# Copyright 1999-2015 Gentoo Foundation
732 -# Distributed under the terms of the GNU General Public License v2
733 -
734 -# Bridge the old SLOT=5[/5] ebuild to the new SLOT=0/5 since the slotmove
735 -# functionality does not handle implicit subslots correctly. #558856
736 -
737 -EAPI="5"
738 -
739 -inherit multilib-build
740 -
741 -DESCRIPTION="transitional package"
742 -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
743 -
744 -LICENSE="metapackage"
745 -SLOT="5/5"
746 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
747 -IUSE="ada +cxx gpm static-libs tinfo unicode"
748 -
749 -DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
750 -RDEPEND="${DEPEND}"
751
752 diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
753 deleted file mode 100644
754 index d2c8782a6e8..00000000000
755 --- a/sys-libs/ncurses/ncurses-6.0.ebuild
756 +++ /dev/null
757 @@ -1,20 +0,0 @@
758 -# Copyright 1999-2016 Gentoo Foundation
759 -# Distributed under the terms of the GNU General Public License v2
760 -
761 -# Bridge the old SLOT=5[/6] ebuild to the new SLOT=0/6 since the slotmove
762 -# functionality does not handle implicit subslots correctly. #558856
763 -
764 -EAPI="5"
765 -
766 -inherit multilib-build
767 -
768 -DESCRIPTION="transitional package"
769 -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
770 -
771 -LICENSE="metapackage"
772 -SLOT="5/6"
773 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
774 -IUSE="ada +cxx gpm static-libs tinfo unicode"
775 -
776 -DEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
777 -RDEPEND="${DEPEND}"