commit: 146df83cbe472cee44ed461b015c185a8a20135f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Mar 26 15:40:30 2018 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Mar 26 15:40:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=146df83c
sys-libs/ncurses: sync Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6 sys-libs/ncurses/Manifest | 1 + .../files/ncurses-6.1-st07_terminfo_typo.patch | 14 +++++++++ ...ncurses-6.0-r1.ebuild => ncurses-6.1-r2.ebuild} | 33 +++++++++++++--------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index bc5c230fbe..07b5a3ad4a 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,3 +1,4 @@ DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963 +DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee 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 new file mode 100644 index 0000000000..4532d648a6 --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch @@ -0,0 +1,14 @@ +https://github.com/tmux/tmux/issues/1264 +https://bugs.gentoo.org/651494 + +--- ncurses-6.1/misc/terminfo.src ++++ ncurses-6.1/misc/terminfo.src +@@ -6260,7 +6260,7 @@ + %=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, +- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, ++ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, + kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, + kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, + kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild similarity index 92% rename from sys-libs/ncurses/ncurses-6.0-r1.ebuild rename to sys-libs/ncurses/ncurses-6.1-r2.ebuild index 6795bf45fb..e53fc18de4 100644 --- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal +inherit flag-o-matic toolchain-funcs multilib-minimal multilib-build MY_PV=${PV:0:3} PV_SNAP=${PV:4} @@ -23,6 +23,7 @@ DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" # Block the older ncurses that installed all files w/SLOT=5. #557472 RDEPEND="${DEPEND} !<=sys-libs/ncurses-5.9-r4:5 + !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1 !app-emulation/emul-linux-x86-baselibs" @@ -37,11 +38,12 @@ PATCHES=( "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 + "${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494 ) src_prepare() { - [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh - epatch "${PATCHES[@]}" + [[ -n ${PV_SNAP} ]] && eapply "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh + default } src_configure() { @@ -116,11 +118,8 @@ do_configure() { # Disabled until #245417 is sorted out. #$(use_with berkdb hashed-db) - # ncurses is dumb and doesn't install .pc files unless pkg-config - # is also installed. Force the tests to go our way. Note that it - # doesn't actually use pkg-config ... it just looks for set vars. + # Enable installation of .pc files. --enable-pc-files - --with-pkg-config="$(tc-getPKG_CONFIG)" # This path is used to control where the .pc files are installed. --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" @@ -153,6 +152,7 @@ do_configure() { $(use_with test tests) $(use_with trace) $(use_with tinfo termlib) + --disable-stripping ) if [[ ${target} == ncurses*w ]] ; then @@ -183,15 +183,16 @@ do_configure() { # Force bash until upstream rebuilds the configure script with a newer # version of autotools. #545532 CONFIG_SHELL=${BASH} \ - ECONF_SOURCE=${S} \ + ECONF_SOURCE="${S}" \ econf "${conf[@]}" "$@" } src_compile() { # See comments in src_configure. - if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + if ! ROOT=/ has_version "~sys-libs/${P}:0" && !multilib_is_native_abi ; then + # We make 'tic$(x)' here, for Cygwin having x=".exe". BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic + do_compile cross -C progs all PROGS='tic$(x)' fi multilib-minimal_src_compile @@ -251,8 +252,9 @@ multilib_src_install_all() { # if ! use berkdb ; then # We need the basic terminfo files in /etc, bug #37026 einfo "Installing basic terminfo files in /etc..." - for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \ - xterm xterm-color xterm-xfree86 + local x + for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \ + xterm xterm-{,256}color do local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) local basedir=$(basename $(dirname "${termfile}")) @@ -275,7 +277,10 @@ multilib_src_install_all() { cd "${S}" dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ + if use doc ; then + docinto html + dohtml -r doc/html/ + fi } pkg_preinst() {
