diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-22 14:28:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-22 14:28:15 +0000 |
| commit | aae71b4d8e684ca22d28ef0f1da0989e7bf6468d (patch) | |
| tree | 0e9cf35d85726e6aa9fbd58b12035f92ffec0130 /sys-libs/ncurses | |
| parent | 20ed81714fa97f5845db16a3c142b3b44d820bc4 (diff) | |
gentoo auto-resync : 22:02:2023 - 14:28:15
Diffstat (limited to 'sys-libs/ncurses')
| -rw-r--r-- | sys-libs/ncurses/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild | 21 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-6.4.ebuild | 19 |
3 files changed, 17 insertions, 27 deletions
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index ccfd7460cb66..49688a86e8bf 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -124,6 +124,6 @@ DIST ncurses-6.3_p20221203-patches.tar.xz 66988 BLAKE2B ea01eee64b0468fbd5b1a540 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 -EBUILD ncurses-6.3_p20221203-r2.ebuild 14185 BLAKE2B b473ccb4ec78ec3481b2d0ef5aa942524aaba9ae8c973cbd37540cb4227bfb83220bec92b44fe2158a1014795ed2e11f13ee2604a0878925a2a26ed44de49b01 SHA512 46580c1e32fac62170942f5a3dc14a010c78b9242a105dfe44a70ac3ac7485a97de74bbc2de47bc8ecde543a20248df340b1afe8c874a797c3d985c16635f1b7 -EBUILD ncurses-6.4.ebuild 13427 BLAKE2B 1984ab8f8c05bd522dd1f3e496f2996309e754d652fc2e22836f7c03bafda1fd37d3dea768ad596e667a4fa34df6fe04ed46edaec49cccde0c1e1f8e163e6963 SHA512 05f48536f7d8a11643c43a09dfe09fbec67d2b7fcc564d5f9a73392f04f6dec2f7c90cf07882ecc9576b925746952e907c08511737866eef4f2d085f195be407 +EBUILD ncurses-6.3_p20221203-r2.ebuild 13959 BLAKE2B 30f291483f02c903fd1809f59f23fa8c0c9d033f447d3983f45f3779f8a01eca6b320afaf94900a487e5a6e403217252e13d9bbed010c1814d919802122a72c6 SHA512 6ca13267c90fa90ce2bdaec0f21c5669019326135f0e93374e933011e9db6779b5086d35aefa862d311b68ed280ebcfbba8e164e6aa0379e6c5920f8eb75962b +EBUILD ncurses-6.4.ebuild 13201 BLAKE2B f6c0d4f0b5beb5f5bc76def57f0fcac1fbfdf6c9b3027d13276a4150b480c41e67471eb116c63ce1420d56353109e9d5c7d509cd3524ddb03dc7bca4ead50179 SHA512 94d5dec61f6f27ded0944f1e8851d94cebba4d2b44708eb2be9d13bd03d3ce743c892425a89842a9c3f0d7ade72fdf15818562136938b69a7460b1ec30337d98 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba diff --git a/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild b/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild index 3dc71f8201ae..406b0ca3cb24 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# 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-minimal preserve-libs usr-ldscript verify-sig +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}" @@ -198,6 +198,11 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # bug #852665 + if [[ ${CHOST} == *-cygwin* ]]; then + BUILD_CPPFLAGS+=" -DBUILDING_NCURSES" + fi + # 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. @@ -348,17 +353,7 @@ do_configure() { src_compile() { # See comments in src_configure. if ! has_version -b "~sys-libs/${P}:0" ; then - # We could possibly merge these two branches but opting to be - # conservative when merging some of the Prefix changes. - - if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then - # We make 'tic$(x)' here, for Cygwin having x=".exe". - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs all PROGS='tic$(x)' - else - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi + BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext) fi multilib-minimal_src_compile diff --git a/sys-libs/ncurses/ncurses-6.4.ebuild b/sys-libs/ncurses/ncurses-6.4.ebuild index 2bbacd762737..58a97be7ee7d 100644 --- a/sys-libs/ncurses/ncurses-6.4.ebuild +++ b/sys-libs/ncurses/ncurses-6.4.ebuild @@ -4,7 +4,7 @@ EAPI=7 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript verify-sig +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}" @@ -142,6 +142,11 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # bug #852665 + if [[ ${CHOST} == *-cygwin* ]]; then + BUILD_CPPFLAGS+=" -DBUILDING_NCURSES" + fi + # 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. @@ -288,17 +293,7 @@ do_configure() { src_compile() { # See comments in src_configure. if ! has_version -b "~sys-libs/${P}:0" ; then - # We could possibly merge these two branches but opting to be - # conservative when merging some of the Prefix changes. - - if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then - # We make 'tic$(x)' here, for Cygwin having x=".exe". - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs all PROGS='tic$(x)' - else - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi + BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext) fi multilib-minimal_src_compile |