sys-libs/ncurses: Sync with Gentoo

It's from Gentoo commit 5a0823e1f2f871ea038c1a8ffe87c6ac3c4682e5.
This commit is contained in:
Flatcar Buildbot 2024-07-01 07:19:41 +00:00 committed by Mathieu Tortuyaux
parent 4396005ee7
commit 19026fc8a0
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
4 changed files with 57 additions and 93 deletions

View File

@ -139,6 +139,23 @@ DIST ncurses-6.4-20240414.patch.gz.asc 729 BLAKE2B 8d579b2724245756947200a3e704c
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_p20230527-patches.tar.xz 63080 BLAKE2B 9db4ac28c8936d3a9c6f3ca5cb8a4c92aa79ee4ce49789bcfc9c031a0454bf6f55a0544bc4a3dbb5c243ed9b2d0792afb98622a6a14b11675b7988100a650eb5 SHA512 3eacda173e8a177cd201ca3fef65311ac92e7e5af4039dc8a5792beae7db1d37efd06f5a55c249eebb771d1245995ff3a206a45794936b6b4299151666dbeade
DIST ncurses-6.4_p20240330-patches.tar.xz 63796 BLAKE2B 3e6618ba0b37268d10a16cf26c2810e55c17ded97079af3753e34f2d12575f979a2e55cfd308abf783e35e39d4a848b89f435b4886d3633007ccb522b8dc2e51 SHA512 1bbf1978f9287f68bf6a8596f06d4d0523564bf3d2f6b3bd9746081a2fa0c76e36862beca62a4157d51cac0df61e456ddb6cacfae10b92344fe80cd752f72c38
DIST ncurses-6.4_p20240413-patches.tar.xz 63760 BLAKE2B 6a91d453cca3705ca54b3a6f2ef00250d655168c1697726db4b581a1597cbc143479b8794e176d5e4154c794f99ea33c3fe1eb26605789930fc82649a2da3c93 SHA512 59239503a9400e054641428528799aa9c13b12669b31f32b2ff18cb60882698801e04dcdf75ece8357c7a4c3b899a729aa973090ec12a20de72cb80a916878b8
DIST ncurses-6.5-20240504.patch.gz 16541 BLAKE2B 1b698b61fb738252eb8839f659b8670c743808058da9eaf39e6d288f5c00b3d1fbc4318daee8744fef37cdc42fa176fc41bbc5d4890295ad53a633207cd129a2 SHA512 6d72b5950dd55a2eb36f4c615c851a0879dcee5f97f9aa46eef68fc0f3c6996c7bf06d4646a05c455888a563ca673be3159e89db2266e81f0e72434cf4d3df29
DIST ncurses-6.5-20240504.patch.gz.asc 729 BLAKE2B 6a9ff6b524bb8ade98d6259514b7d467aee38d12b915c7eb030f025f244a44cc0c2dac524bd2645c5f315f54ef47fe6791dffc1728320e0e4790032a838cbbcd SHA512 4f8a2c6be0471df7c25fc67f596753df48a2a4660c848263d10126bba96010c185d31208b2424c495f29bbed6c93cc9cc88b37b4cc252e00bb971364fe68d2d8
DIST ncurses-6.5-20240511.patch.gz 85486 BLAKE2B 94a00b7013531509def2e17ec75421897f321763fba970a73813278826071e99dd9ddde815c3b4a6cad7c6a3f16eada3afb030f31ee72123dcf0de710c9bcc03 SHA512 c529f1bac7af6c774447027449ac59e41dee3fc30004f7c82113936cc3aed9b5536466d2ca91d99d13d1e1e0e9d7357b87ceb9cc6dc54b212c730d088835288c
DIST ncurses-6.5-20240511.patch.gz.asc 729 BLAKE2B 8b38ff421f7b9cb9115f40cad4e9002083103b4509a346ddf4af39e8a34a8b6fff38546eed0a41c439d2fb80b691adb171216c527cdda352322639ca357c951d SHA512 dbbecf02d46fa97918437a2e9e4e563062c7a8b0d0dd556c22d07d4b186e3c6d13f8f40e1e25a575ba0f4740751db007ad936db275685e253eb3c3fa9cecb6ce
DIST ncurses-6.5-20240518.patch.gz 182827 BLAKE2B 25bfb9822f24dad7ee01314d592c923dd1ac0f21ec6c3bd9c8cc0d858b776cf0441fab4cc3dabb04bd03eee6855062e51a3ac29bccc7116fbdc28a4f9aed4dd5 SHA512 1948cdfc5eb7c1be224a148714e8a482ca6545bbce6230f493fa7e722d3fc776c9b56563b59b60008058e54916ff298443f2e482012f47fa1037f4983b8cd333
DIST ncurses-6.5-20240518.patch.gz.asc 729 BLAKE2B 25162fbcabe332acc337dfc84b8dccf89c255dfd76ecf150ed658257ab770498ae2ffd9e6a66fe591848456a9a910905ef66daec827b3af05b4dc8620e92ea40 SHA512 e10486194cad17dda2f96399eadc8addfa8d41e09372610df902ff5fb305282432906a6a8c1d4499d860b9eafa56cd26fa64f15c539e3ef6064ea1f450029b3f
DIST ncurses-6.5-20240519.patch.gz 11069 BLAKE2B 8cead0924705fb6e3a0f154f336a26922e4f0e50f1a47e8df0f4f4c8d6ecc76f8b4b9d6dc818f34d72063f7e5e2ef1c3068f4e2c11d317a27d6d129904ff6f2f SHA512 b2b92a6ec97c598ec0ffbcddfca4e68322836744a225e458b7cd92690a931d1c1fbade2d1a3753a799593c72940c557f6495dd979bad5d78d0cbd03f860f9bd4
DIST ncurses-6.5-20240519.patch.gz.asc 729 BLAKE2B 75e61ea2c8a86a2849bca0650fe8b466abafe35a8c12b90e0039e11fc649ca95daa75f85a2c27979172cd45cef1bc20967bffa24191314f23056ab3fbbce4f75 SHA512 8543b2a8e56905e106f76dce1e3b50172051d0cbccd21b630305330d572f6cf99eaf23535fad225643c053244a47374971d762a39d393c5205e360399c61d334
DIST ncurses-6.5-20240525.patch.gz 119175 BLAKE2B 61a3fa6854238886ab107f62a2266a27d6b8c4aa47868f2a4b36acc1cfa439ffb2649da451f4df744a27eb0d823ec531441216011778485a5d9a3402c8483bf3 SHA512 2a3254943e9e1351004d32cdcb83c135084b4116c70d36cf07f5f072a37a329d5dbb4044f7237c1c47a7959e3b7497372ec93e283d1a79f7ead0be86a71c44bd
DIST ncurses-6.5-20240525.patch.gz.asc 729 BLAKE2B 41c0516cde5a3e289686dd6e0c34a2dee6ddd1fd554cafdaea964d312c366a66a259e5f8357fccbab16243a89dd3468705d56d7da1b95eb43a02633f2ec76bf1 SHA512 cc25f91547c02202a4b030a94e142a05e28854fb1330d25b13f8e20e351a3b8562399fce0b6f185f71c616f88059151af003c817642cb3353b177c815a18081a
DIST ncurses-6.5-20240601.patch.gz 62426 BLAKE2B 1794aa064fd32974aa90bd2f71a52db6ccf117a032fb3e234f6390e1e98c932f3d3894e3019ba54a65990b36c9864cc7ad631566760f22b5ebc071d61bc31919 SHA512 2a4e4c91e27b72ee4c578daaac1dc160426b53c6e1947a6782fda39bc320081baad6f91f8bb54e443920fba17852614fbf7621d601e94d0f4c96a78f449fb361
DIST ncurses-6.5-20240601.patch.gz.asc 729 BLAKE2B 5b2ffb8ce5c17902271d8dc4f4d92c0eb2f59bbb9a7e494113cae157ed7e90721e755424c4e0956441e552fe52256c45e6e77ff0dbb3c09974c439d1fb0725bc SHA512 a037bc544f6a57468b667e91fbc72ac078c312fef165807e2af5c6add0ade29552a68df723ceb1b019238873368e7d63c2d9f45948ea0453ce97c1fcd4b55272
DIST ncurses-6.5-20240608.patch.gz 51416 BLAKE2B 8bb8141fe13e770837d1f2fee3902e402743c2a06cb08f9981635937dea238c090c474446bba1e227de867be07d7be00c70061c4d3254b9a8b779115382cb4ad SHA512 d7db7404bd16bbeb5340ad964062634f5a7f66180ee8c6fdee356b5386a8c87d5f5e0c76159923d220ff024d6a43c55220f8ea837a06f4ac5d76d2bcf42c9e0f
DIST ncurses-6.5-20240608.patch.gz.asc 729 BLAKE2B 2788a5172f7ee437be0aa61fadf04a62c459777e33f150500c32bc29c80c0dee83cb267f3e8174a316363a196bd415401c5e8f56049487855eff814f8047e88c SHA512 ab2162f9cb7e587ff2d049dd1c50b36cfb4cc4914b9c53067dbbca8cbbb63dfe47a690385ae72c2feb5a73dee965e844b4d76ce31463ee0e0f052e4706d4f4ed
DIST ncurses-6.5-20240615.patch.gz 10195 BLAKE2B 0bfb266ebeb1c92b48ce2c2d2e193671dccb26e90d4bb61a4394360b8b3029087eb65be05e3ab20c665da82a8619354fa5c2b99ce6e3bab6e27b4029e8e5919a SHA512 d72e9334b58ff800ee189a20713c7be65a78aad05aae16f537355e5e48495f1658291552569454c744b9c5d9af3199d892ecf8d41a9917bd83b81238c87c5564
DIST ncurses-6.5-20240615.patch.gz.asc 729 BLAKE2B 1e7179beb1908ae8c9733c0f55e5e027d2e6bab5265603f3d61063bd5a746a395c75e6f134bc2314277735e881a828790901e735e17bdef54b7cbd54e4d2d72d SHA512 ecc1adb886abb8364c93c0155412198e4e64955643de38ebbc3bff77c6675d537b135a138f68b6c216f6b50df8ccca0b63b83f32cad7c20a5d552305f103c0f8
DIST ncurses-6.5.tar.gz 3688489 BLAKE2B d0a05c218b5f320ba9abe2f322787baef1d15d764e503c81d49772b54b2927d28ecbeb500c8e514996226b41f69445b4de44ff423cec25b61847307fe61682ec SHA512 fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8
DIST ncurses-6.5.tar.gz.sig 438 BLAKE2B 5789b47932ec97d3863c7a65306369f0a36cb5b1a35c1e009b5174f50941edceafc22e6f07db3843a096773663a0ca602c0ecb9465e6042d9a78d76ae5008215 SHA512 96ce61a3d529e48e249acecbf4bb9eae2d9f2f67506e92ffa3182f5e98040c38babf0c2c15d92fc5d96e1181e72be1b29fdbff7bee859dfe2ae387f9b8883092
DIST ncurses-6.5_p20240615-patches.tar.xz 63232 BLAKE2B c7fdc496bb3b055b6766ea8a8b5edaba08cecbe9dfe1b3035e55067bce958eb2bf235f226058e30712f14bf6401112901c3add42093216e3b6b42b4ffd438f67 SHA512 a4d9d09c6110a2971bed0facab87c7e255b4c3e34bfa3b8faddd86af9c95fea89833cd14286fd690db138ca60c0fcff818f11d30a6aa820136899619a4e7f95a

View File

@ -152,7 +152,7 @@ S="${WORKDIR}/${MY_P}"
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"
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 )"

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -22,7 +22,7 @@ SRC_URI="
"
GENTOO_PATCH_DEV=sam
GENTOO_PATCH_PV=6.4_p20230527
GENTOO_PATCH_PV=6.4_p20240413
GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
# Populated below in a loop. Do not add patches manually here.
@ -43,24 +43,7 @@ if [[ ${PV} == *_p* ]] ; then
# 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
20230506
20230514
20230520
#20240101
# Latest patch is just _pN = $(ver_cut 4)
$(ver_cut 4)
@ -97,6 +80,7 @@ if [[ ${PV} == *_p* ]] ; then
fi
SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
# The subslot reflects the SONAME.
@ -105,6 +89,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
RESTRICT="!test? ( test )"
# TODO: ncurses allows (and we take advantage of this, even) passing
# the SONAME for dlopen() use, so only the header is needed at build time.
# Maybe we should bundle a copy of gpm.h so we can move gpm to PDEPEND
# which would be far nicer UX-wise.
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
# Block the older ncurses that installed all files w/SLOT=5, bug #557472
RDEPEND="
@ -116,8 +104,6 @@ RDEPEND="
"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${UPSTREAM_PATCHES[@]/#/${WORKDIR}/${MY_P}-}"
@ -235,6 +221,7 @@ do_configure() {
# Now the rest of the various standard flags.
--with-shared
--enable-fvisibility
# (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.)
@ -248,6 +235,13 @@ do_configure() {
# 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)
# bug #930806
--disable-setuid-environ
# TODO: Maybe do these for USE=hardened
#--disable-root-access
#--disable-root-environ
--disable-term-driver
--disable-termcap
--enable-symlinks

View File

@ -22,7 +22,7 @@ SRC_URI="
"
GENTOO_PATCH_DEV=sam
GENTOO_PATCH_PV=6.4_p20240330
GENTOO_PATCH_PV=6.5_p20240615
GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
# Populated below in a loop. Do not add patches manually here.
@ -43,72 +43,13 @@ if [[ ${PV} == *_p* ]] ; then
# 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
20230506
20230514
20230520
20230527
20230603
20230610
20230615
20230617
20230624
20230625
20230701
20230708
20230715
20230722
20230729
20230805
20230812
20230819
20230826
20230902
20230909
20230917
20230918
20230923
20231001
20231007
20231014
20231016
20231021
20231028
20231104
20231111
20231118
20231121
20231125
20231202
20231209
20231217
20231223
20231230
20240106
20240113
20240120
20240127
20240203
20240210
20240217
20240224
20240302
20240309
20240323
20240504
20240511
20240518
20240519
20240525
20240601
20240608
# Latest patch is just _pN = $(ver_cut 4)
$(ver_cut 4)
@ -150,10 +91,14 @@ S="${WORKDIR}/${MY_P}"
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"
#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 )"
# TODO: ncurses allows (and we take advantage of this, even) passing
# the SONAME for dlopen() use, so only the header is needed at build time.
# Maybe we should bundle a copy of gpm.h so we can move gpm to PDEPEND
# which would be far nicer UX-wise.
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
# Block the older ncurses that installed all files w/SLOT=5, bug #557472
RDEPEND="
@ -282,6 +227,7 @@ do_configure() {
# Now the rest of the various standard flags.
--with-shared
--enable-fvisibility
# (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.)
@ -295,6 +241,13 @@ do_configure() {
# 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)
# bug #930806
--disable-setuid-environ
# TODO: Maybe do these for USE=hardened
#--disable-root-access
#--disable-root-environ
--disable-term-driver
--disable-termcap
--enable-symlinks