From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC53115808E for ; Thu, 28 Apr 2022 00:55:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C92F4E087E; Thu, 28 Apr 2022 00:55:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85142E0848 for ; Thu, 28 Apr 2022 00:55:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96C2F341213 for ; Thu, 28 Apr 2022 00:55:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 356493F0 for ; Thu, 28 Apr 2022 00:55:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651107315.8ad4f0aa7753ff10ad3761c9b69f14c392fe1635.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild sys-libs/ncurses/ncurses-6.3_p20220423.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8ad4f0aa7753ff10ad3761c9b69f14c392fe1635 X-VCS-Branch: master Date: Thu, 28 Apr 2022 00:55:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4937adf6-04cd-4732-acb2-0cffe1696e5e X-Archives-Hash: 6ad69dbc83001877637e35dc7243d8bb commit: 8ad4f0aa7753ff10ad3761c9b69f14c392fe1635 Author: Sam James gentoo org> AuthorDate: Thu Apr 28 00:55:06 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 28 00:55:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad4f0aa sys-libs/ncurses: modernise style a bit more Signed-off-by: Sam James gentoo.org> sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild | 95 +++++++++++++----------- sys-libs/ncurses/ncurses-6.3_p20220423.ebuild | 94 ++++++++++++----------- 2 files changed, 100 insertions(+), 89 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild index 1d04632af4e3..1c25c4ffc2c5 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild @@ -80,8 +80,7 @@ IUSE="ada +cxx debug doc gpm minimal profile static-libs test tinfo trace" RESTRICT="!test? ( test )" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# berkdb? ( sys-libs/db )" -# Block the older ncurses that installed all files w/SLOT=5. #557472 +# Block the older ncurses that installed all files w/SLOT=5, bug #557472 RDEPEND="${DEPEND} !<=sys-libs/ncurses-5.9-r4:5 !/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 -# fi + # We need the basic terminfo files in /etc for embedded/recovery, bug #37026 + einfo "Installing basic terminfo files in /etc..." + 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 + ) + local x + 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 - keepdir /usr/share/terminfo #245374 + # bug #245374 + keepdir /usr/share/terminfo cd "${S}" || die dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild index bcfee98f91ee..69087694ef94 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild @@ -80,8 +80,7 @@ IUSE="ada +cxx debug doc gpm minimal profile static-libs test tinfo trace" RESTRICT="!test? ( test )" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# berkdb? ( sys-libs/db )" -# Block the older ncurses that installed all files w/SLOT=5. #557472 +# Block the older ncurses that installed all files w/SLOT=5, bug #557472 RDEPEND="${DEPEND} !<=sys-libs/ncurses-5.9-r4:5 !/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 -# fi + # We need the basic terminfo files in /etc for embedded/recovery, bug #37026 + einfo "Installing basic terminfo files in /etc..." + 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 + ) + local x + 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 - keepdir /usr/share/terminfo #245374 + # bug #245374 + keepdir /usr/share/terminfo cd "${S}" || die dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc