commit:     765cf801b251b0dbecaaf90d070cca1c3d2b6962
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 00:33:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 00:33:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765cf801

sys-libs/ncurses: drop 6.4, 6.4_p20230424, 6.4_p20230506

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/ncurses/Manifest                     |   3 -
 sys-libs/ncurses/ncurses-6.4.ebuild           | 417 -------------------------
 sys-libs/ncurses/ncurses-6.4_p20230424.ebuild | 429 -------------------------
 sys-libs/ncurses/ncurses-6.4_p20230506.ebuild | 434 --------------------------
 4 files changed, 1283 deletions(-)

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 3c6f33956701..78ae728c9622 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -159,10 +159,7 @@ DIST ncurses-6.4-20230520.patch.gz 3090 BLAKE2B 
93e376bc6250509c1a83e799efc2d476
 DIST ncurses-6.4-20230520.patch.gz.asc 729 BLAKE2B 
08db3a1a8152c4cc29fcc11b24ec3d1a6d3c425eed9a54f33bc370b86f26a13a9cdd273652c448e6e4dd179f5ca41ae653f7ef44902a10eaa18828e2be3a6247
 SHA512 
7bf2aa9442bc5041ce316af7edc2ff5c5da2ab1bf941c26c6592c8785dc0e47539da3bc2c1e570daafb6a293812f55b8b3b327f90ff9908984eba37e89d5eb7d
 DIST ncurses-6.4-20230527.patch.gz 9787 BLAKE2B 
951a53b87056f2b3b530f03d0bab5a06ecf6bae0bf2fb580af8c0d96ae169e4813ed2063bf1696fd0fcc1cb0f7da03348904818de7ce454cbcb9a42bb939b6b8
 SHA512 
f600d7bdbde1f0752d3d530ceb98e9ba51a246a3bd898cc0d0d65bb8b51dab68fa5668789f5f86473c28eb890ec62cecf8e4dc901ac96fccf162c1a5f161f897
 DIST ncurses-6.4-20230527.patch.gz.asc 729 BLAKE2B 
472421bd7c9093a293e99ec0f343ed471a77e7aa7f705cd99bb61f907c7059b134158c176fb232c542842ba042a1a88ca8e192df81d2d760a70f26a4d76ae624
 SHA512 
74a0ae5123b339c00f786d4d15a6c100d5d323731b7534e495dd396c9fd03b7ebc61d3fdf6eb71f2fa106160e15da5d093af6e4d53b4a6cfc53c436045a5a614
-DIST ncurses-6.4-patches.tar.xz 63720 BLAKE2B 
6b767f65a9c7e8f9fdebaa2623e3770872e710fa103d11e48509e5315ebf5ad1a37519b1b40c5138e631693fb2e2e30ea5eef11002698a341a623a85c5b0b4fc
 SHA512 
5094f6cb8fa54d9df0802173f1e0ff2ad40fc3d4bd298c0742479f72ba4f9afee0ccf9f0a4eb068b0a5552523abf7b212861b61abbde6f69ff22d62dd686daa9
 DIST ncurses-6.4.tar.gz 3612591 BLAKE2B 
47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3
 SHA512 
1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 DIST ncurses-6.4.tar.gz.sig 438 BLAKE2B 
e6a78b8d0cbce1577205b49b0260394094632cefd95294813c7e4e51a2908e8599a9f24b3b648e42ba16c015fb9424b2a82236f58aac3bf96f5400a50482e44e
 SHA512 
f2a7859725b4d5d62f68006338d56598ac6b38a1448983108906e192f0ec922be287cc89bcc79c1ae49ebc80c967af3dd077427f35ae579b00d445c882414fed
 DIST ncurses-6.4_p20230408-patches.tar.xz 80472 BLAKE2B 
0ba8156ebd4f1691fec7bc1b800ef39ce6a4210573c027dd437919cdcd7c995830116da06c69f31c65923845a4d5c88e974673fac38acce5813f7d6cdc646e3e
 SHA512 
32960e2cc4cd9dc60c38b49f46c5ce2c02179479abb66ca29f63cd06475ae8e26299a78b5f06762d114aefbbca3ba6fbebe7093a58106eeaa40cf500d21633a4
-DIST ncurses-6.4_p20230424-patches.tar.xz 63080 BLAKE2B 
3924b22d60d995766987a217b960b4c719a51f7334c9be80d19c0df4615e1f9c657507e77124cc8f5663249cbd480cac6570fdd49362a12e2fb69fcae8c800e8
 SHA512 
188b4da6d75cd15397977a07789ee6365262bd392fb7b2714e870834b2195d29fc5aadff6664a9a13d8d73e88aa43f502ae97c7b1f980231ce392a05ed4d3eb7
-DIST ncurses-6.4_p20230506-patches.tar.xz 63132 BLAKE2B 
5067aa5f82ff9c9ffad0cc9effc1990095b808a1c76ce1ad640aef39f896ed3f1a81caf000cbdb355a2f213133d877bad949ca14debeb88b2d0d3c3a8331e605
 SHA512 
cef883f486cf5b2abecfd951e408aeeb76257b53abea465b33b0e9f4b9bd9b7dc001f4aa48dcbd429143ed14b784bd841bcd5bc722d528d21521d5630dcf8315
 DIST ncurses-6.4_p20230527-patches.tar.xz 63080 BLAKE2B 
9db4ac28c8936d3a9c6f3ca5cb8a4c92aa79ee4ce49789bcfc9c031a0454bf6f55a0544bc4a3dbb5c243ed9b2d0792afb98622a6a14b11675b7988100a650eb5
 SHA512 
3eacda173e8a177cd201ca3fef65311ac92e7e5af4039dc8a5792beae7db1d37efd06f5a55c249eebb771d1245995ff3a206a45794936b6b4299151666dbeade

diff --git a/sys-libs/ncurses/ncurses-6.4.ebuild 
b/sys-libs/ncurses/ncurses-6.4.ebuild
deleted file mode 100644
index ab876df76ad1..000000000000
--- a/sys-libs/ncurses/ncurses-6.4.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs 
usr-ldscript verify-sig
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Console display library"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ 
https://invisible-island.net/ncurses/";
-# Keep invisible-mirror.net here as some users reported 403 forbidden with 
invisible-island.net
-SRC_URI="
-       mirror://gnu/ncurses/${MY_P}.tar.gz
-       https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
-       https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
-       verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
-"
-
-GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4
-GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
-
-# Populated below in a loop. Do not add patches manually here.
-UPSTREAM_PATCHES=()
-
-if [[ ${PV} == *_p* ]] ; then
-       # Sometimes, after releases, there's no megapatch available yet.
-       #
-       # From upstream README at e.g. 
https://invisible-island.net/archives/ncurses/6.3/:
-       #
-       #       "At times (generally to mark a relatively stable point), I 
create a rollup
-       #       patch, which consists of all changes from the release through 
the current date."
-       #
-       # Also, from 
https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
-       # the patches are considered to be acceptable to use after some 
testing. They
-       # are both for development but also bug fixes.
-       #
-       # This array should contain a list of all the snapshots since the last
-       # release if there's no megapatch available yet.
-       PATCH_DATES=(
-               #20221126
-
-               # Latest patch is just _pN = $(ver_cut 4)
-               $(ver_cut 4)
-       )
-
-       if [[ -z ${PATCH_DATES[@]} ]] ; then
-               SRC_URI+=" 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz";
-               SRC_URI+=" verify-sig? ( 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc";
-
-               # If we have a rollup patch, use that instead of the individual 
ones.
-               UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
-       else
-               patch_url=
-               my_patch_index=
-
-               # We keep a bunch of mirrors here as we've had reports of 
invisible*.net
-               # being 403 forbidden for some users.
-               urls=(
-                       
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
-               )
-
-               for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; 
my_patch_index++)); do
-                       for url in "${urls[@]}" ; do
-                               patch_url="$(printf ${urls} 
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-                               SRC_URI+=" ${patch_url}"
-                               SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-                       done
-
-                       UPSTREAM_PATCHES+=( 
"${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-               done
-
-               unset patch_url
-               unset my_patch_index
-               unset urls
-       fi
-fi
-
-SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz";
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign 
static-libs test tinfo trace"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the older ncurses that installed all files w/SLOT=5, bug #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
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${UPSTREAM_PATCHES[@]}"
-
-       # When rebasing Gentoo's patchset, please use git from a clean
-       # src_prepare with upstream patches already applied. git am --reject
-       # the existing patchset and rebase as required. This makes it easier
-       # to manage future rebasing & adding new patches.
-       #
-       # For the same reasons, please include the original configure.in 
changes,
-       # NOT just the generated results!
-       "${WORKDIR}"/${GENTOO_PATCH_NAME}
-)
-
-src_unpack() {
-       # Avoid trying to verify our own patchset tarball, there's no point
-       if use verify-sig ; then
-               local file
-               for file in ${A} ; do
-                       if [[ ${file} == ${MY_P}.tar.gz ]] ; then
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.sig
-                       else
-                               [[ ${file} == 
@(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
-
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.asc
-                       fi
-               done
-       fi
-
-       default
-}
-
-src_configure() {
-       # bug #115036
-       unset TERMINFO
-
-       tc-export_build_env BUILD_{CC,CXX,CPP}
-
-       # bug #214642
-       BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
-
-       # 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
-               ncursesw
-               ncursest
-               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. bug #249363, bug #557598
-       if ! has_version -b "~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=     ;;
-                       *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
-               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}" \
-               CC=${BUILD_CC} \
-               CXX=${BUILD_CXX} \
-               CPP=${BUILD_CPP} \
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-               do_configure cross --without-shared --with-normal --with-progs 
--without-ada
-       fi
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       if [[ ${ABI} == x86 ]] ; then
-               # For compatibility with older binaries at slight performance 
cost.
-               # bug #616402
-               use stack-realign && append-flags -mstackrealign
-       fi
-
-       local t
-       for t in "${NCURSES_TARGETS[@]}" ; do
-               do_configure "${t}"
-       done
-}
-
-do_configure() {
-       local target=$1
-       shift
-
-       mkdir "${BUILD_DIR}/${target}" || die
-       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"
-
-               # Enable installation of .pc files.
-               --enable-pc-files
-               # 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
-               # (Originally disabled until bug #245417 is sorted out, but now
-               # just keeping it off for good, given nobody needed it until now
-               # (2022) and we're trying to phase out bdb.)
-               --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-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)
-               --disable-stripping
-               --disable-pkg-ldflags
-       )
-
-       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
-
-       ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-       # See comments in src_configure.
-       if ! has_version -b "~sys-libs/${P}:0" ; then
-               BUILD_DIR="${WORKDIR}" do_compile cross -C progs 
tic$(get_exeext)
-       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 || die
-       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[@]}" \
-                       $(usex tinfo 'tinfow tinfo' '')
-       fi
-
-       # Don't delete '*.dll.a', needed for linking, bug #631468
-       if ! use static-libs; then
-               find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-       fi
-
-       # Build fails to create this ...
-       # -FIXME-
-       # Ugly hackaround for riscv having two parts libdir (bug #689240)
-       # Replace this hack with an official solution once we have one...
-       # -FIXME-
-       dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-               /usr/$(get_libdir)/terminfo
-
-       # Remove obsolete libcurses symlink that is created by the build
-       # system. Technically, this could be also achieved
-       # via --disable-overwrite but it also moves headers implicitly,
-       # and we do not want to do this yet.
-       # bug #836696
-       rm "${ED}"/usr/$(get_libdir)/libcurses* || die
-}
-
-multilib_src_install_all() {
-       local terms=(
-               # Dumb/simple values that show up when using the in-kernel VT.
-               ansi console dumb linux
-               vt{52,100,102,200,220}
-               # [u]rxvt users used to be pretty common.  Probably should drop 
this
-               # since upstream is dead and people are moving away from it.
-               rxvt{,-unicode}{,-256color}
-               # xterm users are common, as is terminals re-using/spoofing it.
-               xterm xterm-{,256}color
-               # screen is common (and reused by tmux).
-               screen{,-256color}
-               screen.xterm-256color
-       )
-       if use split-usr ; then
-               local x
-               # We need the basic terminfo files in /etc for 
embedded/recovery, bug #37026
-               einfo "Installing basic terminfo files in /etc..."
-               for x in "${terms[@]}"; 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}/" || die
-                               dosym 
"../../../../etc/terminfo/${basedir}/${x}" \
-                                       "/usr/share/terminfo/${basedir}/${x}"
-                       fi
-               done
-
-               echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 
50ncurses
-
-               use minimal && rm -r "${ED}"/usr/share/terminfo*
-               # Because ncurses5-config --terminfo returns the directory we 
keep it
-               # bug #245374
-               keepdir /usr/share/terminfo
-       elif use minimal ; then
-               # Keep only the basic terminfo files
-               find "${ED}"/usr/share/terminfo/ \
-                       \( -type f -o -type l \) ${terms[*]/#/! -name } -delete 
, \
-                       -type d -empty -delete || die
-       fi
-
-       cd "${S}" || die
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       if use doc ; then
-               docinto html
-               dodoc -r doc/html/
-       fi
-}
-
-pkg_preinst() {
-       preserve_old_lib /$(get_libdir)/libncurses.so.5
-       preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-       preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-       preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}

diff --git a/sys-libs/ncurses/ncurses-6.4_p20230424.ebuild 
b/sys-libs/ncurses/ncurses-6.4_p20230424.ebuild
deleted file mode 100644
index 976e3e417487..000000000000
--- a/sys-libs/ncurses/ncurses-6.4_p20230424.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs 
usr-ldscript verify-sig
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Console display library"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ 
https://invisible-island.net/ncurses/";
-# Keep invisible-mirror.net here as some users reported 403 forbidden with 
invisible-island.net
-SRC_URI="
-       mirror://gnu/ncurses/${MY_P}.tar.gz
-       https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
-       https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
-       verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
-"
-
-GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4_p20230424
-GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
-
-# Populated below in a loop. Do not add patches manually here.
-UPSTREAM_PATCHES=()
-
-if [[ ${PV} == *_p* ]] ; then
-       # Sometimes, after releases, there's no megapatch available yet.
-       #
-       # From upstream README at e.g. 
https://invisible-island.net/archives/ncurses/6.3/:
-       #
-       #       "At times (generally to mark a relatively stable point), I 
create a rollup
-       #       patch, which consists of all changes from the release through 
the current date."
-       #
-       # Also, from 
https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
-       # the patches are considered to be acceptable to use after some 
testing. They
-       # are both for development but also bug fixes.
-       #
-       # This array should contain a list of all the snapshots since the last
-       # release if there's no megapatch available yet.
-       PATCH_DATES=(
-               20230107
-               20230114
-               20230121
-               20230128
-               20230211
-               20230218
-               20230225
-               20230311
-               20230401
-               20230408
-               20230415
-               20230418
-               20230423
-
-               # Latest patch is just _pN = $(ver_cut 4)
-               $(ver_cut 4)
-       )
-
-       if [[ -z ${PATCH_DATES[@]} ]] ; then
-               SRC_URI+=" 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz";
-               SRC_URI+=" verify-sig? ( 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc";
-
-               # If we have a rollup patch, use that instead of the individual 
ones.
-               UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
-       else
-               patch_url=
-               my_patch_index=
-
-               # We keep a bunch of mirrors here as we've had reports of 
invisible*.net
-               # being 403 forbidden for some users.
-               urls=(
-                       
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
-               )
-
-               for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; 
my_patch_index++)); do
-                       for url in "${urls[@]}" ; do
-                               patch_url="$(printf ${urls} 
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-                               SRC_URI+=" ${patch_url}"
-                               SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-                       done
-
-                       UPSTREAM_PATCHES+=( 
"${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-               done
-
-               unset patch_url
-               unset my_patch_index
-               unset urls
-       fi
-fi
-
-SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz";
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign 
static-libs test tinfo trace"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the older ncurses that installed all files w/SLOT=5, bug #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
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${UPSTREAM_PATCHES[@]}"
-
-       # When rebasing Gentoo's patchset, please use git from a clean
-       # src_prepare with upstream patches already applied. git am --reject
-       # the existing patchset and rebase as required. This makes it easier
-       # to manage future rebasing & adding new patches.
-       #
-       # For the same reasons, please include the original configure.in 
changes,
-       # NOT just the generated results!
-       "${WORKDIR}"/${GENTOO_PATCH_NAME}
-)
-
-src_unpack() {
-       # Avoid trying to verify our own patchset tarball, there's no point
-       if use verify-sig ; then
-               local file
-               for file in ${A} ; do
-                       if [[ ${file} == ${MY_P}.tar.gz ]] ; then
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.sig
-                       else
-                               [[ ${file} == 
@(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
-
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.asc
-                       fi
-               done
-       fi
-
-       default
-}
-
-src_configure() {
-       # bug #115036
-       unset TERMINFO
-
-       tc-export_build_env BUILD_{CC,CXX,CPP}
-
-       # bug #214642
-       BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
-
-       # 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
-               ncursesw
-               ncursest
-               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. bug #249363, bug #557598
-       if ! has_version -b "~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=     ;;
-                       *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
-               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}" \
-               CC=${BUILD_CC} \
-               CXX=${BUILD_CXX} \
-               CPP=${BUILD_CPP} \
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-               do_configure cross --without-shared --with-normal --with-progs 
--without-ada
-       fi
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       if [[ ${ABI} == x86 ]] ; then
-               # For compatibility with older binaries at slight performance 
cost.
-               # bug #616402
-               use stack-realign && append-flags -mstackrealign
-       fi
-
-       local t
-       for t in "${NCURSES_TARGETS[@]}" ; do
-               do_configure "${t}"
-       done
-}
-
-do_configure() {
-       local target=$1
-       shift
-
-       mkdir "${BUILD_DIR}/${target}" || die
-       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"
-
-               # Enable installation of .pc files.
-               --enable-pc-files
-               # 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
-               # (Originally disabled until bug #245417 is sorted out, but now
-               # just keeping it off for good, given nobody needed it until now
-               # (2022) and we're trying to phase out bdb.)
-               --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-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)
-               --disable-stripping
-               --disable-pkg-ldflags
-       )
-
-       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
-
-       ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-       # See comments in src_configure.
-       if ! has_version -b "~sys-libs/${P}:0" ; then
-               BUILD_DIR="${WORKDIR}" do_compile cross -C progs 
tic$(get_exeext)
-       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 || die
-       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[@]}" \
-                       $(usex tinfo 'tinfow tinfo' '')
-       fi
-
-       # Don't delete '*.dll.a', needed for linking, bug #631468
-       if ! use static-libs; then
-               find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-       fi
-
-       # Build fails to create this ...
-       # -FIXME-
-       # Ugly hackaround for riscv having two parts libdir (bug #689240)
-       # Replace this hack with an official solution once we have one...
-       # -FIXME-
-       dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-               /usr/$(get_libdir)/terminfo
-
-       # Remove obsolete libcurses symlink that is created by the build
-       # system. Technically, this could be also achieved
-       # via --disable-overwrite but it also moves headers implicitly,
-       # and we do not want to do this yet.
-       # bug #836696
-       rm "${ED}"/usr/$(get_libdir)/libcurses* || die
-}
-
-multilib_src_install_all() {
-       local terms=(
-               # Dumb/simple values that show up when using the in-kernel VT.
-               ansi console dumb linux
-               vt{52,100,102,200,220}
-               # [u]rxvt users used to be pretty common.  Probably should drop 
this
-               # since upstream is dead and people are moving away from it.
-               rxvt{,-unicode}{,-256color}
-               # xterm users are common, as is terminals re-using/spoofing it.
-               xterm xterm-{,256}color
-               # screen is common (and reused by tmux).
-               screen{,-256color}
-               screen.xterm-256color
-       )
-       if use split-usr ; then
-               local x
-               # We need the basic terminfo files in /etc for 
embedded/recovery, bug #37026
-               einfo "Installing basic terminfo files in /etc..."
-               for x in "${terms[@]}"; 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}/" || die
-                               dosym 
"../../../../etc/terminfo/${basedir}/${x}" \
-                                       "/usr/share/terminfo/${basedir}/${x}"
-                       fi
-               done
-
-               echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 
50ncurses
-
-               use minimal && rm -r "${ED}"/usr/share/terminfo*
-               # Because ncurses5-config --terminfo returns the directory we 
keep it
-               # bug #245374
-               keepdir /usr/share/terminfo
-       elif use minimal ; then
-               # Keep only the basic terminfo files
-               find "${ED}"/usr/share/terminfo/ \
-                       \( -type f -o -type l \) ${terms[*]/#/! -name } -delete 
, \
-                       -type d -empty -delete || die
-       fi
-
-       cd "${S}" || die
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       if use doc ; then
-               docinto html
-               dodoc -r doc/html/
-       fi
-}
-
-pkg_preinst() {
-       preserve_old_lib /$(get_libdir)/libncurses.so.5
-       preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-       preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-       preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}

diff --git a/sys-libs/ncurses/ncurses-6.4_p20230506.ebuild 
b/sys-libs/ncurses/ncurses-6.4_p20230506.ebuild
deleted file mode 100644
index ae0083d5601c..000000000000
--- a/sys-libs/ncurses/ncurses-6.4_p20230506.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sys-libs/ncurses-compat can be bumped with sys-libs/ncurses as upstream
-# provide a configure option for the ABI version.
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs 
usr-ldscript verify-sig
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Console display library"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ 
https://invisible-island.net/ncurses/";
-# Keep invisible-mirror.net here as some users reported 403 forbidden with 
invisible-island.net
-SRC_URI="
-       mirror://gnu/ncurses/${MY_P}.tar.gz
-       https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
-       https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
-       verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
-"
-
-GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4_p20230506
-GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
-
-# Populated below in a loop. Do not add patches manually here.
-UPSTREAM_PATCHES=()
-
-if [[ ${PV} == *_p* ]] ; then
-       # Sometimes, after releases, there's no megapatch available yet.
-       #
-       # From upstream README at e.g. 
https://invisible-island.net/archives/ncurses/6.3/:
-       #
-       #       "At times (generally to mark a relatively stable point), I 
create a rollup
-       #       patch, which consists of all changes from the release through 
the current date."
-       #
-       # Also, from 
https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
-       # the patches are considered to be acceptable to use after some 
testing. They
-       # are both for development but also bug fixes.
-       #
-       # This array should contain a list of all the snapshots since the last
-       # release if there's no megapatch available yet.
-       PATCH_DATES=(
-               20230107
-               20230114
-               20230121
-               20230128
-               20230211
-               20230218
-               20230225
-               20230311
-               20230401
-               20230408
-               20230415
-               20230418
-               20230423
-               20230424
-               20230429
-
-               # Latest patch is just _pN = $(ver_cut 4)
-               $(ver_cut 4)
-       )
-
-       if [[ -z ${PATCH_DATES[@]} ]] ; then
-               SRC_URI+=" 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz";
-               SRC_URI+=" verify-sig? ( 
https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc";
-
-               # If we have a rollup patch, use that instead of the individual 
ones.
-               UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
-       else
-               patch_url=
-               my_patch_index=
-
-               # We keep a bunch of mirrors here as we've had reports of 
invisible*.net
-               # being 403 forbidden for some users.
-               urls=(
-                       
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
-                       
"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
-               )
-
-               for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; 
my_patch_index++)); do
-                       for url in "${urls[@]}" ; do
-                               patch_url="$(printf ${urls} 
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-                               SRC_URI+=" ${patch_url}"
-                               SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-                       done
-
-                       UPSTREAM_PATCHES+=( 
"${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-               done
-
-               unset patch_url
-               unset my_patch_index
-               unset urls
-       fi
-fi
-
-SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz";
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign 
static-libs test tinfo trace"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the older ncurses that installed all files w/SLOT=5, bug #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
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${UPSTREAM_PATCHES[@]}"
-
-       # When rebasing Gentoo's patchset, please use git from a clean
-       # src_prepare with upstream patches already applied. git am --reject
-       # the existing patchset and rebase as required. This makes it easier
-       # to manage future rebasing & adding new patches.
-       #
-       # For the same reasons, please include the original configure.in 
changes,
-       # NOT just the generated results!
-       "${WORKDIR}"/${GENTOO_PATCH_NAME}
-)
-
-src_unpack() {
-       # Avoid trying to verify our own patchset tarball, there's no point
-       if use verify-sig ; then
-               local file
-               for file in ${A} ; do
-                       if [[ ${file} == ${MY_P}.tar.gz ]] ; then
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.sig
-                       else
-                               [[ ${file} == 
@(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
-
-                               verify-sig_verify_detached "${DISTDIR}"/${file} 
"${DISTDIR}"/${file}.asc
-                       fi
-               done
-       fi
-
-       default
-}
-
-src_configure() {
-       # bug #115036
-       unset TERMINFO
-
-       tc-export_build_env BUILD_{CC,CXX,CPP}
-
-       # bug #214642
-       BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
-
-       # 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
-               ncursesw
-               ncursest
-               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. bug #249363, bug #557598
-       if ! has_version -b "~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=     ;;
-                       *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
-               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}" \
-               CC=${BUILD_CC} \
-               CXX=${BUILD_CXX} \
-               CPP=${BUILD_CPP} \
-               CHOST=${CBUILD} \
-               CFLAGS=${BUILD_CFLAGS} \
-               CXXFLAGS=${BUILD_CXXFLAGS} \
-               CPPFLAGS=${BUILD_CPPFLAGS} \
-               LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-               do_configure cross --without-shared --with-normal --with-progs 
--without-ada
-       fi
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       if [[ ${ABI} == x86 ]] ; then
-               # For compatibility with older binaries at slight performance 
cost.
-               # bug #616402
-               use stack-realign && append-flags -mstackrealign
-       fi
-
-       local t
-       for t in "${NCURSES_TARGETS[@]}" ; do
-               do_configure "${t}"
-       done
-}
-
-do_configure() {
-       local target=$1
-       shift
-
-       mkdir "${BUILD_DIR}/${target}" || die
-       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"
-
-               # Enable installation of .pc files.
-               --enable-pc-files
-               # 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
-               # (Originally disabled until bug #245417 is sorted out, but now
-               # just keeping it off for good, given nobody needed it until now
-               # (2022) and we're trying to phase out bdb.)
-               --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-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)
-               --disable-stripping
-               --disable-pkg-ldflags
-       )
-
-       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
-
-       ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-       # See comments in src_configure.
-       if ! has_version -b "~sys-libs/${P}:0" ; then
-               BUILD_DIR="${WORKDIR}" do_compile cross -C progs 
tic$(get_exeext)
-       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 || die
-       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[@]}" \
-                       $(usex tinfo 'tinfow tinfo' '')
-       fi
-
-       # Don't delete '*.dll.a', needed for linking, bug #631468
-       if ! use static-libs; then
-               find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-       fi
-
-       # Build fails to create this ...
-       # -FIXME-
-       # Ugly hackaround for riscv having two parts libdir (bug #689240)
-       # Replace this hack with an official solution once we have one...
-       # -FIXME-
-       dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-               /usr/$(get_libdir)/terminfo
-
-       # Remove obsolete libcurses symlink that is created by the build
-       # system. Technically, this could be also achieved
-       # via --disable-overwrite but it also moves headers implicitly,
-       # and we do not want to do this yet.
-       # bug #836696
-       rm "${ED}"/usr/$(get_libdir)/libcurses* || die
-}
-
-multilib_src_install_all() {
-       local terms=(
-               # Dumb/simple values that show up when using the in-kernel VT.
-               ansi console dumb linux
-               vt{52,100,102,200,220}
-               # [u]rxvt users used to be pretty common.  Probably should drop 
this
-               # since upstream is dead and people are moving away from it.
-               rxvt{,-unicode}{,-256color}
-               # xterm users are common, as is terminals re-using/spoofing it.
-               xterm xterm-{,256}color
-               # screen is common (and reused by tmux).
-               screen{,-256color}
-               screen.xterm-256color
-       )
-       if use split-usr ; then
-               local x
-               # We need the basic terminfo files in /etc for 
embedded/recovery, bug #37026
-               einfo "Installing basic terminfo files in /etc..."
-               for x in "${terms[@]}"; 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}/" || die
-                               dosym 
"../../../../etc/terminfo/${basedir}/${x}" \
-                                       "/usr/share/terminfo/${basedir}/${x}"
-                       fi
-               done
-
-               echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 
50ncurses
-
-               use minimal && rm -r "${ED}"/usr/share/terminfo*
-               # Because ncurses5-config --terminfo returns the directory we 
keep it
-               # bug #245374
-               keepdir /usr/share/terminfo
-       elif use minimal ; then
-               # Keep only the basic terminfo files
-               find "${ED}"/usr/share/terminfo/ \
-                       \( -type f -o -type l \) ${terms[*]/#/! -name } -delete 
, \
-                       -type d -empty -delete || die
-       fi
-
-       cd "${S}" || die
-       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-       if use doc ; then
-               docinto html
-               dodoc -r doc/html/
-       fi
-}
-
-pkg_preinst() {
-       preserve_old_lib /$(get_libdir)/libncurses.so.5
-       preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-       preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-       preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}


Reply via email to