commit:     5118f7f864b9c5b279d9029f6ed06eceacf0e88e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 19:31:55 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 19:31:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5118f7f8

sys-libs/ncurses: sync, add bridge versions, and straight copy of 6.0

Package-Manager: portage-2.2.20-prefix

 sys-libs/ncurses/Manifest                          |   2 +-
 sys-libs/ncurses/ncurses-5.7-r7.ebuild             | 254 ------------------
 sys-libs/ncurses/ncurses-5.9-r02.1.ebuild          | 253 ------------------
 sys-libs/ncurses/ncurses-5.9-r1.ebuild             | 249 ------------------
 ...urses-5.9-r3.ebuild => ncurses-5.9-r101.ebuild} |  22 +-
 sys-libs/ncurses/ncurses-5.9-r99.ebuild            |  21 ++
 sys-libs/ncurses/ncurses-6.0-r1.ebuild             | 283 +++++++++++++++++++++
 7 files changed, 320 insertions(+), 764 deletions(-)

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 25ae7b1..577e8b0 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,3 @@
 DIST host-libtool-0.1.0.tar.gz 388867 SHA256 
a32c9046e7f63b84ea41228ed54b17b98789ce129f7d02c215840dbecb15c8f5 SHA512 
d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
 WHIRLPOOL 
5b002500155ad6d2400ba65950827db76f1c91ccc09f11fc726f71c23452d364d32229a6a92334ef3a77e72c53c353dee53b56601691868a3ab26adc0983c36b
-DIST ncurses-5.7.tar.gz 2445052 SHA256 
0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4 SHA512 
9fda7283cd50ab9d8b9181935be7c31c4ae4c974f2eee186a5dbe8c3ce5522e5c200f06af48aa22b44cdab16a22795cfc8dc36a4258e6d826b454216dfcea3c6
 WHIRLPOOL 
696258b29783b078bd83631fef90388fe2bcd92ed94ace55cfae44cfa08afbf4fb29c3902d17216f3f059ee78cb61f69eed64b05a33332ddd85cecade7af6af3
 DIST ncurses-5.9.tar.gz 2826473 SHA256 
9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 
d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 WHIRLPOOL 
069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a
+DIST ncurses-6.0.tar.gz 3131891 SHA256 
f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 SHA512 
9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 WHIRLPOOL 
25bef32a63113f07259e81e2cd34b7065e32b471d190c79d56df6e7187fa0d76ae4585ecb2a5d36b3a3dc4facecc9c928503aa97195344a8594ad031bae41949

diff --git a/sys-libs/ncurses/ncurses-5.7-r7.ebuild 
b/sys-libs/ncurses/ncurses-5.7-r7.ebuild
deleted file mode 100644
index 7cbe877..0000000
--- a/sys-libs/ncurses/ncurses-5.7-r7.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 
1.10 2012/06/24 00:24:08 vapier Exp $
-
-EAPI="1"
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit eutils flag-o-matic toolchain-funcs multilib autotools
-
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode"
-
-DEPEND="gpm? ( sys-libs/gpm )
-       kernel_AIX? ( ${AUTOTOOLS_DEPEND} )
-       kernel_HPUX? ( ${AUTOTOOLS_DEPEND} )"
-#      berkdb? ( sys-libs/db )"
-RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
-
-S=${WORKDIR}/${MY_P}
-
-need-libtool() {
-       # need libtool to build aix-style shared objects inside archive libs, 
but
-       # cannot depend on libtool, as this would create circular 
dependencies...
-       # And libtool-1.5.26 needs (a similar) patch for AIX (DESTDIR) as found 
in
-       # http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
-       # Use libtool on hpux too to get some soname.
-       [[ ${CHOST} == *'-aix'* || ${CHOST} == *'-hpux'* ]]
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
-       epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
-       epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527
-       epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
-       epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881
-       epatch "${FILESDIR}"/${PN}-5.7-rxvt-unicode-9.09.patch #192083
-       epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370
-       sed -i '/with_no_leaks=yes/s:=.*:=$enableval:' configure #305889
-
-       epatch "${FILESDIR}"/${PN}-5.7-mint.patch
-       epatch "${FILESDIR}"/${PN}-5.7-mint-terminfo.patch
-       epatch "${FILESDIR}"/${PN}-5.5-aix-shared.patch
-       epatch "${FILESDIR}"/${PN}-5.6-interix.patch
-       epatch "${FILESDIR}"/${PN}-5.6-netbsd.patch
-#      epatch "${FILESDIR}"/${PN}-5.6-libtool.patch # used on aix
-       epatch "${FILESDIR}"/${PN}-5.7-x64-freebsd.patch
-       epatch "${FILESDIR}"/${PN}-5.7-ldflags-with-libtool.patch
-
-       # irix /bin/sh is no good
-       find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh'
-
-       if need-libtool; then
-               mkdir "${WORKDIR}"/local-libtool || die
-               cd "${WORKDIR}"/local-libtool || die
-               cat >configure.ac<<-EOF
-                       AC_INIT(local-libtool, 0)
-                       AC_PROG_CC
-                       AC_PROG_CXX
-                       AC_PROG_LIBTOOL
-                       AC_OUTPUT
-               EOF
-               eautoreconf
-       fi
-}
-
-src_compile() {
-       if need-libtool; then
-               cd "${WORKDIR}"/local-libtool || die
-               econf
-               export PATH="${WORKDIR}"/local-libtool:${PATH}
-               cd "${S}" || die
-       fi
-
-       unset TERMINFO #115036
-       tc-export BUILD_CC
-       export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-       # when cross-compiling, we need to build up our own tic
-       # because people often don't keep matching host/target
-       # ncurses versions #249363
-       if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
-               make_flags="-C progs tic"
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} -static" \
-               do_compile cross --without-shared --with-normal
-       fi
-
-       make_flags=""
-       do_compile narrowc
-       use unicode && do_compile widec --enable-widec 
--includedir="${EPREFIX}"/usr/include/ncursesw
-
-}
-do_compile() {
-       ECONF_SOURCE=${S}
-
-       mkdir "${WORKDIR}"/$1
-       cd "${WORKDIR}"/$1
-       shift
-
-       # The chtype/mmask-t settings below are to retain ABI compat
-       # with ncurses-5.4 so dont change em !
-       local conf_abi="
-               --with-chtype=long \
-               --with-mmask-t=long \
-               --disable-ext-colors \
-               --disable-ext-mouse \
-               --without-pthread \
-               --without-reentrant \
-       "
-
-       local myconf=""
-       if need-libtool; then
-               myconf="${myconf} --with-libtool"
-       elif [[ ${CHOST} == *-mint* ]]; then
-               :
-       else
-               myconf="--with-shared"
-       fi
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               myconf="--without-leaks"
-       fi
-
-       # We need the basic terminfo files in /etc, bug #37026.  We will
-       # add '--with-terminfo-dirs' and then populate /etc/terminfo in
-       # src_install() ...
-#              $(use_with berkdb hashed-db) \
-       econf \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" \
-               ${myconf} \
-               --without-hashed-db \
-               --enable-overwrite \
-               $(use_with ada) \
-               $(use_with cxx) \
-               $(use_with cxx cxx-binding) \
-               $(use_with debug) \
-               $(use_with profile) \
-               $(use_with gpm) \
-               --disable-termcap \
-               --enable-symlinks \
-               --with-rcs-ids \
-               --with-manpage-format=normal \
-               --enable-const \
-               --enable-colorfgbg \
-               --enable-echo \
-               $(use_enable !ada warnings) \
-               $(use_with debug assertions) \
-               $(use_enable debug leaks) \
-               $(use_with debug expanded) \
-               $(use_with !debug macros) \
-               $(use_with trace) \
-               ${conf_abi} \
-               "$@"
-
-       [[ ${CHOST} == *-solaris* ]] && \
-               sed -i -e 's/-D_XOPEN_SOURCE_EXTENDED//g' c++/Makefile
-
-       # Fix for install location of the lib{,n}curses{,w} libs as in Gentoo we
-       # want those in lib not usr/lib.  We cannot move them lateron after
-       # installing, because that will result in broken install_names for
-       # platforms that store pointers to the libs instead of directories.
-       # But this only is true when building without libtool.
-       need-libtool ||
-       sed -i -e '/^libdir/s:/usr/lib\(64\|\)$:/lib\1:' ncurses/Makefile || 
die "nlibdir"
-
-       # for IRIX to get tests compiling
-       epatch "${FILESDIR}"/${PN}-5.7-irix.patch
-
-       # A little hack to fix parallel builds ... they break when
-       # generating sources so if we generate the sources first (in
-       # non-parallel), we can then build the rest of the package
-       # in parallel.  This is not really a perf hit since the source
-       # generation is quite small.
-       emake -j1 sources || die
-       emake ${make_flags} || die
-}
-
-src_install() {
-       # use the cross-compiled tic (if need be) #249363
-       export PATH=${WORKDIR}/cross/progs:${PATH}
-
-       # install unicode version second so that the binaries in /usr/bin
-       # support both wide and narrow
-       cd "${WORKDIR}"/narrowc
-       emake DESTDIR="${D}" install || die
-       if use unicode ; then
-               cd "${WORKDIR}"/widec
-               emake DESTDIR="${D}" install || die
-       fi
-
-       if need-libtool; then
-               # Move dynamic ncurses libraries into /lib
-               dodir /$(get_libdir)
-               local f
-               for f in 
"${ED}"usr/$(get_libdir)/lib{,n}curses{,w}$(get_libname)*; do
-                       [[ -f ${f} ]] || continue
-                       mv "${f}" "${ED}"$(get_libdir)/ || die "could not move 
${f#${ED}}"
-               done
-       else # keeping intendation to keep diff small
-       # Move static and extraneous ncurses static libraries out of /lib
-       cd "${ED}"/$(get_libdir)
-       mv *.a "${ED}"/usr/$(get_libdir)/
-       fi
-       gen_usr_ldscript lib{,n}curses$(get_libname)
-       use unicode && gen_usr_ldscript libncursesw$(get_libname)
-       ln -sf libncurses$(get_libname) 
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
-       use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name 
'*curses++*.a' -delete
-
-#      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
-               do
-                       local termfile=$(find "${ED}"/usr/share/terminfo/ -name 
"${x}" 2>/dev/null)
-                       local basedir=$(basename $(dirname "${termfile}"))
-
-                       if [[ -n ${termfile} ]] ; then
-                               dodir /etc/terminfo/${basedir}
-                               mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
-                               dosym ../../../../etc/terminfo/${basedir}/${x} \
-                                       /usr/share/terminfo/${basedir}/${x}
-                       fi
-               done
-
-               # Build fails to create this ...
-               dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-#      fi
-
-       echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
-       doenvd "${T}"/50ncurses
-
-       use minimal && rm -r "${ED}"/usr/share/terminfo*
-       # Because ncurses5-config --terminfo returns the directory we keep it
-       keepdir /usr/share/terminfo #245374
-
-       cd "${S}"
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       use doc && dohtml -r doc/html/
-}

diff --git a/sys-libs/ncurses/ncurses-5.9-r02.1.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r02.1.ebuild
deleted file mode 100644
index f0f8473..0000000
--- a/sys-libs/ncurses/ncurses-5.9-r02.1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 
1.18 2014/01/18 02:22:37 vapier Exp $
-
-EAPI="1"
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-MY_P=${PN}-${MY_PV}
-HOSTLTV="0.1.0"
-HOSTLT="host-libtool-${HOSTLTV}"
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz";
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
-       kernel_AIX? ( ${HOSTLT_URI} )
-       kernel_HPUX? ( ${HOSTLT_URI} )
-"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
-
-DEPEND="gpm? ( sys-libs/gpm )"
-#      berkdb? ( sys-libs/db )"
-RDEPEND="${DEPEND}
-       !<x11-terms/rxvt-unicode-9.06-r3"
-
-S=${WORKDIR}/${MY_P}
-
-need-libtool() {
-       # need libtool to build aix-style shared objects inside archive libs, 
but
-       # cannot depend on libtool, as this would create circular 
dependencies...
-       # And libtool-1.5.26 needs (a similar) patch for AIX (DESTDIR) as found 
in
-       # http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
-       # Use libtool on hpux too to get some soname.
-       [[ ${CHOST} == *'-aix'* || ${CHOST} == *'-hpux'* ]]
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
-       epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
-       epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
-       epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
-       epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
-
-       epatch "${FILESDIR}"/${PN}-5.6-interix.patch
-
-       # /bin/sh is not always good enough
-       find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh'
-
-       if need-libtool; then
-               S="${WORKDIR}"/${HOSTLT} elibtoolize
-
-               # Don't need local libraries (-L../lib) for libncurses,
-               # ends up as insecure runpath in libncurses.so[shr.o] on AIX
-               sed -i -e '/^SHLIB_LIST[ \t]*=/s/\$(SHLIB_DIRS)//' 
ncurses/Makefile.in || die
-       fi
-
-       # Don't mess with _XOPEN_SOURCE for C++ on (Open)Solaris.  The compiler
-       # defines a value for it, and depending on version, a different 
definition
-       # is used.  Defining this variable on these systems is dangerous any 
time,
-       # since the system headers do strict checks on compatability of flags 
and
-       # standards.
-       # Defining _XOPEN_SOURCE_EXTENDED together with _XOPEN_SOURCE leads to
-       # pre-_XOPEN_SOURCE=500 stuff, so only do it for non-C++ code.
-       # See also bug #431352
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               sed -i \
-                       -e '/-D__EXTENSIONS__/ 
s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \
-                       -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' 
\
-                       configure || die
-               # ONLY in C-mode, NOT C++
-               append-cflags -D_XOPEN_SOURCE_EXTENDED
-       fi
-}
-
-src_compile() {
-       if need-libtool; then
-               cd "${WORKDIR}"/${HOSTLT} || die
-               econf
-               export PATH="${WORKDIR}"/${HOSTLT}:${PATH}
-               cd "${S}" || die
-       fi
-
-       unset TERMINFO #115036
-       tc-export_build_env BUILD_{CC,CPP}
-       BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-       # when cross-compiling, we need to build up our own tic
-       # because people often don't keep matching host/target
-       # ncurses versions #249363
-       if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
-               make_flags="-C progs tic"
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} -static" \
-               do_compile cross --without-shared --with-normal
-       fi
-
-       make_flags=""
-       do_compile narrowc
-       use unicode && do_compile widec --enable-widec 
--includedir="${EPREFIX}"/usr/include/ncursesw
-}
-do_compile() {
-       ECONF_SOURCE=${S}
-
-       mkdir "${WORKDIR}"/$1
-       cd "${WORKDIR}"/$1
-       shift
-
-       # 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.
-       tc-export PKG_CONFIG
-       export PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-
-       # The chtype/mmask-t settings below are to retain ABI compat
-       # with ncurses-5.4 so dont change em !
-       local conf_abi="
-               --with-chtype=long \
-               --with-mmask-t=long \
-               --disable-ext-colors \
-               --disable-ext-mouse \
-               --without-pthread \
-               --without-reentrant \
-       "
-
-       local myconf=""
-       if need-libtool; then
-               myconf="${myconf} --with-libtool"
-       elif [[ ${CHOST} == *-mint* ]]; then
-               :
-       else
-               myconf="--with-shared"
-       fi
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               myconf="--without-leaks"
-       fi
-
-       # We need the basic terminfo files in /etc, bug #37026.  We will
-       # add '--with-terminfo-dirs' and then populate /etc/terminfo in
-       # src_install() ...
-#              $(use_with berkdb hashed-db)
-       econf \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" \
-               ${myconf} \
-               --without-hashed-db \
-               --enable-overwrite \
-               $(use_with ada) \
-               $(use_with cxx) \
-               $(use_with cxx cxx-binding) \
-               $(use_with debug) \
-               $(use_with profile) \
-               $(use_with gpm) \
-               --disable-termcap \
-               --enable-symlinks \
-               --with-rcs-ids \
-               --with-manpage-format=normal \
-               --enable-const \
-               --enable-colorfgbg \
-               --enable-echo \
-               --enable-pc-files \
-               $(use_enable !ada warnings) \
-               $(use_with debug assertions) \
-               $(use_enable debug leaks) \
-               $(use_with debug expanded) \
-               $(use_with !debug macros) \
-               $(use_with trace) \
-               $(use_with tinfo termlib) \
-               ${conf_abi} \
-               "$@"
-
-       # A little hack to fix parallel builds ... they break when
-       # generating sources so if we generate the sources first (in
-       # non-parallel), we can then build the rest of the package
-       # in parallel.  This is not really a perf hit since the source
-       # generation is quite small.
-       emake -j1 sources || die
-       # For some reason, sources depends on pc-files which depends on
-       # compiled libraries which depends on sources which ...
-       # Manually delete the pc-files file so the install step will
-       # create the .pc files we want.
-       rm -f misc/pc-files
-       emake ${make_flags} || die
-}
-
-src_install() {
-       # use the cross-compiled tic (if need be) #249363
-       export PATH=${WORKDIR}/cross/progs:${PATH}
-
-       # install unicode version second so that the binaries in /usr/bin
-       # support both wide and narrow
-       cd "${WORKDIR}"/narrowc
-       emake DESTDIR="${D}" install || die
-       if use unicode ; then
-               cd "${WORKDIR}"/widec
-               emake DESTDIR="${D}" install || die
-       fi
-
-       # Move static and extraneous ncurses static libraries out of /lib
-       cd "${ED}"/$(get_libdir)
-       mv *.a "${ED}"/usr/$(get_libdir)/
-       gen_usr_ldscript -a \
-               ncurses \
-               $(usex unicode 'ncursesw' '') \
-               $(use tinfo && usex unicode 'tinfow' '') \
-               $(usev tinfo)
-       if ! tc-is-static-only ; then
-               ln -sf libncurses$(get_libname) 
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
-       fi
-       use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name 
'*curses++*.a' -delete
-
-#      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
-               do
-                       local termfile=$(find "${ED}"/usr/share/terminfo/ -name 
"${x}" 2>/dev/null)
-                       local basedir=$(basename $(dirname "${termfile}"))
-
-                       if [[ -n ${termfile} ]] ; then
-                               dodir /etc/terminfo/${basedir}
-                               mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
-                               dosym ../../../../etc/terminfo/${basedir}/${x} \
-                                       /usr/share/terminfo/${basedir}/${x}
-                       fi
-               done
-
-               # Build fails to create this ...
-               dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-#      fi
-
-       echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
-       doenvd "${T}"/50ncurses
-
-       use minimal && rm -r "${ED}"/usr/share/terminfo*
-       # Because ncurses5-config --terminfo returns the directory we keep it
-       keepdir /usr/share/terminfo #245374
-
-       cd "${S}"
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       use doc && dohtml -r doc/html/
-}

diff --git a/sys-libs/ncurses/ncurses-5.9-r1.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
deleted file mode 100644
index 1aed3ef..0000000
--- a/sys-libs/ncurses/ncurses-5.9-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 
1.2 2012/06/24 00:24:08 vapier Exp $
-
-EAPI="1"
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit eutils flag-o-matic toolchain-funcs multilib autotools
-
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode"
-
-DEPEND="gpm? ( sys-libs/gpm )
-       kernel_AIX? ( ${AUTOTOOLS_DEPEND} )
-       kernel_HPUX? ( ${AUTOTOOLS_DEPEND} )"
-#      berkdb? ( sys-libs/db )"
-RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
-
-S=${WORKDIR}/${MY_P}
-
-need-libtool() {
-       # need libtool to build aix-style shared objects inside archive libs, 
but
-       # cannot depend on libtool, as this would create circular 
dependencies...
-       # And libtool-1.5.26 needs (a similar) patch for AIX (DESTDIR) as found 
in
-       # http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
-       # Use libtool on hpux too to get some soname.
-       [[ ${CHOST} == *'-aix'* || ${CHOST} == *'-hpux'* ]]
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
-       epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
-       epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
-       epatch "${FILESDIR}"/${PN}-5.8-rxvt-unicode.patch #192083
-       sed -i \
-               -e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
-               misc/Makefile.in || die
-
-       epatch "${FILESDIR}"/${PN}-5.5-aix-shared.patch
-       epatch "${FILESDIR}"/${PN}-5.6-interix.patch
-
-       # /bin/sh is not always good enough
-       find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh'
-
-       if need-libtool; then
-               mkdir "${WORKDIR}"/local-libtool || die
-               cd "${WORKDIR}"/local-libtool || die
-               cat >configure.ac<<-EOF
-                       AC_INIT(local-libtool, 0)
-                       AC_PROG_CC
-                       AC_PROG_CXX
-                       AC_PROG_LIBTOOL
-                       AC_OUTPUT
-               EOF
-               eautoreconf
-       fi
-}
-
-src_compile() {
-       if need-libtool; then
-               cd "${WORKDIR}"/local-libtool || die
-               econf
-               export PATH="${WORKDIR}"/local-libtool:${PATH}
-               cd "${S}" || die
-       fi
-
-       unset TERMINFO #115036
-       tc-export BUILD_CC
-       export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-       # when cross-compiling, we need to build up our own tic
-       # because people often don't keep matching host/target
-       # ncurses versions #249363
-       if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
-               make_flags="-C progs tic"
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} -static" \
-               do_compile cross --without-shared --with-normal
-       fi
-
-       make_flags=""
-       do_compile narrowc
-       use unicode && do_compile widec --enable-widec 
--includedir="${EPREFIX}"/usr/include/ncursesw
-
-}
-do_compile() {
-       ECONF_SOURCE=${S}
-
-       mkdir "${WORKDIR}"/$1
-       cd "${WORKDIR}"/$1
-       shift
-
-       # The chtype/mmask-t settings below are to retain ABI compat
-       # with ncurses-5.4 so dont change em !
-       local conf_abi="
-               --with-chtype=long \
-               --with-mmask-t=long \
-               --disable-ext-colors \
-               --disable-ext-mouse \
-               --without-pthread \
-               --without-reentrant \
-       "
-
-       local myconf=""
-       if need-libtool; then
-               myconf="${myconf} --with-libtool"
-       elif [[ ${CHOST} == *-mint* ]]; then
-               :
-       else
-               myconf="--with-shared"
-       fi
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               myconf="--without-leaks"
-       fi
-
-       # We need the basic terminfo files in /etc, bug #37026.  We will
-       # add '--with-terminfo-dirs' and then populate /etc/terminfo in
-       # src_install() ...
-#              $(use_with berkdb hashed-db) \
-       econf \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" \
-               ${myconf} \
-               --without-hashed-db \
-               --enable-overwrite \
-               $(use_with ada) \
-               $(use_with cxx) \
-               $(use_with cxx cxx-binding) \
-               $(use_with debug) \
-               $(use_with profile) \
-               $(use_with gpm) \
-               --disable-termcap \
-               --enable-symlinks \
-               --with-rcs-ids \
-               --with-manpage-format=normal \
-               --enable-const \
-               --enable-colorfgbg \
-               --enable-echo \
-               --enable-pc-files \
-               $(use_enable !ada warnings) \
-               $(use_with debug assertions) \
-               $(use_enable debug leaks) \
-               $(use_with debug expanded) \
-               $(use_with !debug macros) \
-               $(use_with trace) \
-               ${conf_abi} \
-               "$@"
-
-       # Fix for install location of the lib{,n}curses{,w} libs as in Gentoo we
-       # want those in lib not usr/lib.  We cannot move them lateron after
-       # installing, because that will result in broken install_names for
-       # platforms that store pointers to the libs instead of directories.
-       # But this only is true when building without libtool.
-       need-libtool ||
-       sed -i -e '/^libdir/s:/usr/lib\(64\|\)$:/lib\1:' ncurses/Makefile || 
die "nlibdir"
-
-       # A little hack to fix parallel builds ... they break when
-       # generating sources so if we generate the sources first (in
-       # non-parallel), we can then build the rest of the package
-       # in parallel.  This is not really a perf hit since the source
-       # generation is quite small.
-       emake -j1 sources || die
-       # For some reason, sources depends on pc-files which depends on
-       # compiled libraries which depends on sources which ...
-       # Manually delete the pc-files file so the install step will
-       # create the .pc files we want.
-       rm -f misc/pc-files
-       emake ${make_flags} || die
-}
-
-src_install() {
-       # use the cross-compiled tic (if need be) #249363
-       export PATH=${WORKDIR}/cross/progs:${PATH}
-
-       # install unicode version second so that the binaries in /usr/bin
-       # support both wide and narrow
-       cd "${WORKDIR}"/narrowc
-       emake DESTDIR="${D}" install || die
-       if use unicode ; then
-               cd "${WORKDIR}"/widec
-               emake DESTDIR="${D}" install || die
-       fi
-
-       if need-libtool; then
-               # Move dynamic ncurses libraries into /lib
-               dodir /$(get_libdir)
-               local f
-               for f in 
"${ED}"usr/$(get_libdir)/lib{,n}curses{,w}$(get_libname)*; do
-                       [[ -f ${f} ]] || continue
-                       mv "${f}" "${ED}"$(get_libdir)/ || die "could not move 
${f#${ED}}"
-               done
-       else # keeping intendation to keep diff small
-       # Move static and extraneous ncurses static libraries out of /lib
-       cd "${ED}"/$(get_libdir)
-       mv *.a "${ED}"/usr/$(get_libdir)/
-       fi
-       gen_usr_ldscript -a ncurses
-       use unicode && gen_usr_ldscript -a ncursesw
-       if ! tc-is-static-only ; then
-               ln -sf libncurses$(get_libname) 
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
-       fi
-       use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name 
'*curses++*.a' -delete
-
-#      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
-               do
-                       local termfile=$(find "${ED}"/usr/share/terminfo/ -name 
"${x}" 2>/dev/null)
-                       local basedir=$(basename $(dirname "${termfile}"))
-
-                       if [[ -n ${termfile} ]] ; then
-                               dodir /etc/terminfo/${basedir}
-                               mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
-                               dosym ../../../../etc/terminfo/${basedir}/${x} \
-                                       /usr/share/terminfo/${basedir}/${x}
-                       fi
-               done
-
-               # Build fails to create this ...
-               dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-#      fi
-
-       echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
-       doenvd "${T}"/50ncurses
-
-       use minimal && rm -r "${ED}"/usr/share/terminfo*
-       # Because ncurses5-config --terminfo returns the directory we keep it
-       keepdir /usr/share/terminfo #245374
-
-       cd "${S}"
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       use doc && dohtml -r doc/html/
-}

diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
similarity index 94%
rename from sys-libs/ncurses/ncurses-5.9-r3.ebuild
rename to sys-libs/ncurses/ncurses-5.9-r101.ebuild
index 67c0eda..deea104 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 
1.17 2014/08/05 16:09:26 ottxor Exp $
+# $Id$
+
+# This version is just for the ABI .5 library
+
+EAPI="5"
 
-EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal libtool
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
 SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 
 HOSTLTV="0.1.0"
@@ -21,7 +24,8 @@ SRC_URI="${SRC_URI}
 "
 
 LICENSE="MIT"
-SLOT="5"
+# The subslot reflects the SONAME.
+SLOT="5/5"
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
@@ -57,6 +61,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
        epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
        epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
+       epatch "${FILESDIR}"/${P}-no-I-usr-include.patch #522586
+       epatch "${FILESDIR}"/${P}-gcc-5.patch #545114
 
        # /bin/sh is not always good enough
        find . -name "*.sh" | xargs sed -i -e '1c\#!/usr/bin/env sh'
@@ -169,7 +175,7 @@ do_configure() {
                --enable-echo
                $(use_enable !ada warnings)
                $(use_with debug assertions)
-               $(use_enable debug leaks)
+               $(use_enable !debug leaks)
                $(use_with debug expanded)
                $(use_with !debug macros)
                $(use_with trace)
@@ -185,7 +191,9 @@ do_configure() {
                --without-reentrant
        )
 
-       econf "${conf[@]}" "$@"
+       # Force bash until upstream rebuilds the configure script with a newer
+       # version of autotools. #545532
+       CONFIG_SHELL="${BASH}" econf "${conf[@]}" "$@"
 }
 
 src_compile() {

diff --git a/sys-libs/ncurses/ncurses-5.9-r99.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
new file mode 100644
index 0000000..8a68a77
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Bridge the old SLOT=5[/5] ebuild to the new SLOT=0/5 since the slotmove
+# functionality does not handle implicit subslots correctly. #558856
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="transitional package"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
+
+LICENSE="metapackage"
+SLOT="5/5"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx gpm static-libs tinfo unicode"
+
+DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"

diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild 
b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
new file mode 100644
index 0000000..0b7ca5a
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/";
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo 
trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+#      berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+       !<=sys-libs/ncurses-5.9-r4:5
+       !<x11-terms/rxvt-unicode-9.06-r3
+       !<x11-terms/st-0.6-r1
+       !app-emulation/emul-linux-x86-baselibs"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+       "${FILESDIR}/${PN}-6.0-gfbsd.patch"
+       "${FILESDIR}/${PN}-5.7-nongnu.patch"
+       "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+       "${FILESDIR}/${PN}-6.0-pkg-config.patch"
+       "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+       "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+)
+
+src_prepare() {
+       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+       epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+       unset TERMINFO #115036
+       tc-export_build_env BUILD_{CC,CPP}
+       BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+       # Build the various variants of ncurses -- narrow, wide, and threaded. 
#510440
+       # Order matters here -- we want unicode/thread versions to come last so 
that the
+       # binaries in /usr/bin support both wide and narrow.
+       # The naming is also important as we use these directly with filenames 
and when
+       # checking configure flags.
+       NCURSES_TARGETS=(
+               ncurses
+               $(usex unicode 'ncursesw' '')
+               $(usex threads 'ncursest' '')
+               $(use unicode && usex threads 'ncursestw' '')
+       )
+
+       multijob_init
+
+       # When installing ncurses, we have to use a compatible version of tic.
+       # This comes up when cross-compiling, doing multilib builds, upgrading,
+       # or installing for the first time.  Build a local copy of tic whenever
+       # the host version isn't available. #249363 #557598
+       if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+               local lbuildflags="-static"
+
+               # some toolchains don't quite support static linking
+               local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+               case ${CHOST} in
+                       *-darwin*)  dbuildflags=     ;;
+               esac
+               echo "int main() {}" | \
+                       $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& 
/dev/null \
+                       || lbuildflags="${dbuildflags}"
+
+               # We can't re-use the multilib BUILD_DIR because we run outside 
of it.
+               BUILD_DIR="${WORKDIR}" \
+               CHOST=${CBUILD} \
+               CFLAGS=${BUILD_CFLAGS} \
+               CXXFLAGS=${BUILD_CXXFLAGS} \
+               CPPFLAGS=${BUILD_CPPFLAGS} \
+               LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+               multijob_child_init do_configure cross --without-shared 
--with-normal
+       fi
+       multilib-minimal_src_configure
+       multijob_finish
+}
+
+multilib_src_configure() {
+       local t
+       for t in "${NCURSES_TARGETS[@]}" ; do
+               multijob_child_init do_configure "${t}"
+       done
+}
+
+do_configure() {
+       local target=$1
+       shift
+
+       mkdir "${BUILD_DIR}/${target}"
+       cd "${BUILD_DIR}/${target}" || die
+
+       local conf=(
+               # We need the basic terminfo files in /etc, bug #37026.  We will
+               # add '--with-terminfo-dirs' and then populate /etc/terminfo in
+               # src_install() ...
+               
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+               # 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-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"
+
+               # Now the rest of the various standard flags.
+               --with-shared
+               --without-hashed-db
+               $(use_with ada)
+               $(use_with cxx)
+               $(use_with cxx cxx-binding)
+               --with-cxx-shared
+               $(use_with debug)
+               $(use_with profile)
+               # The configure script uses ldd to parse the linked output which
+               # is flaky for cross-compiling/multilib/ldd versions/etc...
+               $(use_with gpm gpm libgpm.so.1)
+               --disable-termcap
+               --enable-symlinks
+               --with-rcs-ids
+               --with-manpage-format=normal
+               --enable-const
+               --enable-colorfgbg
+               --enable-hard-tabs
+               --enable-echo
+               $(use_enable !ada warnings)
+               $(use_with debug assertions)
+               $(use_enable !debug leaks)
+               $(use_with debug expanded)
+               $(use_with !debug macros)
+               $(multilib_native_with progs)
+               $(use_with test tests)
+               $(use_with trace)
+               $(use_with tinfo termlib)
+       )
+
+       if [[ ${target} == ncurses*w ]] ; then
+               conf+=( --enable-widec )
+       else
+               conf+=( --disable-widec )
+       fi
+       if [[ ${target} == ncursest* ]] ; then
+               conf+=( --with-{pthread,reentrant} )
+       else
+               conf+=( --without-{pthread,reentrant} )
+       fi
+       # Make sure each variant goes in a unique location.
+       if [[ ${target} != "ncurses" ]] ; then
+               conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+       fi
+       # See comments in src_configure.
+       if [[ ${target} != "cross" ]] ; then
+               local cross_path="${WORKDIR}/cross"
+               [[ -d ${cross_path} ]] && export 
TIC_PATH="${cross_path}/progs/tic"
+       fi
+
+       # Force bash until upstream rebuilds the configure script with a newer
+       # version of autotools. #545532
+       CONFIG_SHELL=${EPREFIX}/bin/bash \
+       ECONF_SOURCE=${S} \
+       econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+       # See comments in src_configure.
+       if ! ROOT=/ has_version "~sys-libs/${P}" ; then
+               BUILD_DIR="${WORKDIR}" \
+               do_compile cross -C progs tic
+       fi
+
+       multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+       local t
+       for t in "${NCURSES_TARGETS[@]}" ; do
+               do_compile "${t}"
+       done
+}
+
+do_compile() {
+       local target=$1
+       shift
+
+       cd "${BUILD_DIR}/${target}" || die
+
+       # A little hack to fix parallel builds ... they break when
+       # generating sources so if we generate the sources first (in
+       # non-parallel), we can then build the rest of the package
+       # in parallel.  This is not really a perf hit since the source
+       # generation is quite small.
+       emake -j1 sources
+       # For some reason, sources depends on pc-files which depends on
+       # compiled libraries which depends on sources which ...
+       # Manually delete the pc-files file so the install step will
+       # create the .pc files we want.
+       rm -f misc/pc-files
+       emake "$@"
+}
+
+multilib_src_install() {
+       local target
+       for target in "${NCURSES_TARGETS[@]}" ; do
+               emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+       done
+
+       # Move main libraries into /.
+       if multilib_is_native_abi ; then
+               gen_usr_ldscript -a \
+                       "${NCURSES_TARGETS[@]}"
+                       $(use tinfo && usex unicode 'tinfow' '') \
+                       $(usev tinfo)
+       fi
+       if ! tc-is-static-only ; then
+               # Provide a link for -lcurses.
+               ln -sf libncurses$(get_libname) 
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+       fi
+       use static-libs || find "${ED}"/usr/ -name '*.a' -delete
+
+       # Build fails to create this ...
+       dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+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
+               do
+                       local termfile=$(find "${ED}"/usr/share/terminfo/ -name 
"${x}" 2>/dev/null)
+                       local basedir=$(basename $(dirname "${termfile}"))
+
+                       if [[ -n ${termfile} ]] ; then
+                               dodir /etc/terminfo/${basedir}
+                               mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
+                               dosym ../../../../etc/terminfo/${basedir}/${x} \
+                                       /usr/share/terminfo/${basedir}/${x}
+                       fi
+               done
+#      fi
+
+       echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+       doenvd "${T}"/50ncurses
+
+       use minimal && rm -r "${ED}"/usr/share/terminfo*
+       # Because ncurses5-config --terminfo returns the directory we keep it
+       keepdir /usr/share/terminfo #245374
+
+       cd "${S}"
+       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+       use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+       preserve_old_lib /$(get_libdir)/libncurses.so.5
+       use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+       preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+       use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}

Reply via email to