commit:     c94776f9bbcb5e37c8440b59770b8515bbe61bac
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 18:55:19 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 18:56:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94776f9

sys-libs/ncurses: Security cleanup.

Bug: https://bugs.gentoo.org/624644
Bug: https://bugs.gentoo.org/625830
Bug: https://bugs.gentoo.org/639706
Package-Manager: Portage-2.3.29, Repoman-2.3.9

 sys-libs/ncurses/Manifest              |   1 -
 sys-libs/ncurses/ncurses-6.0-r1.ebuild | 286 --------------------------------
 sys-libs/ncurses/ncurses-6.0-r2.ebuild | 295 ---------------------------------
 3 files changed, 582 deletions(-)

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index e42031303a1..f7db79467ef 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,2 @@
 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/ncurses-6.0-r1.ebuild 
b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
deleted file mode 100644
index 562662fc29b..00000000000
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
-
-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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
-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
-       "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
-)
-
-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' '')
-       )
-
-       # 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=     ;;
-                       *-aix*)     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}" \
-               do_configure cross --without-shared --with-normal
-       fi
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local t
-       for t in "${NCURSES_TARGETS[@]}" ; do
-               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
-               # "ncurses" variant goes into "${EPREFIX}"/usr/include
-               # It is needed on Prefix because the configure script appends
-               # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-               conf+=( --enable-overwrite )
-       else
-               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}:0" ; 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
-}

diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild 
b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
deleted file mode 100644
index 6587f1b72a6..00000000000
--- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-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
-       "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
-)
-
-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' '')
-       )
-
-       # 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=     ;;
-                       *-aix*)     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}" \
-               do_configure cross --without-shared --with-normal
-       fi
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local t
-       for t in "${NCURSES_TARGETS[@]}" ; do
-               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.
-               # This is fixed in newer versions:
-               # 
https://lists.gnu.org/archive/html/bug-ncurses/2015-08/msg00026.html
-               --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)
-               # Required for building  on mingw-w64, and possibly other 
windows
-               # platforms, bug #639670
-               $(use_enable kernel_Winnt term-driver)
-               --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
-               # "ncurses" variant goes into "${EPREFIX}"/usr/include
-               # It is needed on Prefix because the configure script appends
-               # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-               conf+=( --enable-overwrite )
-       else
-               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}:0" ; 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
-       # don't delete '*.dll.a', needed for linking #631468
-       if ! use static-libs; then
-               find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-       fi
-
-       # 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..."
-               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}"))
-
-                       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