From e3f21c8aff8a76afe3423721c437a088e9232840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 23 Apr 2024 23:59:27 +0100 Subject: gentoo auto-resync : 23:04:2024 - 23:59:26 --- sys-libs/Manifest.gz | Bin 14577 -> 14574 bytes sys-libs/glibc/Manifest | 6 +- sys-libs/glibc/glibc-2.38-r12.ebuild | 2 +- sys-libs/glibc/glibc-2.39-r3.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- sys-libs/readline/Manifest | 11 +- sys-libs/readline/readline-8.1_p2-r1.ebuild | 6 +- sys-libs/readline/readline-8.1_p2-r2.ebuild | 6 +- sys-libs/readline/readline-8.2_p10.ebuild | 6 +- sys-libs/readline/readline-8.3_alpha.ebuild | 251 ++++++++++++++++++++++++++++ sys-libs/readline/readline-9999.ebuild | 15 +- 11 files changed, 281 insertions(+), 26 deletions(-) create mode 100644 sys-libs/readline/readline-8.3_alpha.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index f00d57a65055..c38890bbaa77 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 52a9ef0874a3..3b2797fb6ecc 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -52,7 +52,7 @@ EBUILD glibc-2.36-r8.ebuild 52468 BLAKE2B 005a5537d1cbcc1ba128174c06aa9fe797b2f1 EBUILD glibc-2.37-r10.ebuild 52997 BLAKE2B 5302881267c59582fbdb775dd789597c199461735a92cf91d2609e1827b80fdfd5514d836867a917895ab2f0c1ea61d4a899321ae490e68af33c17456b20c164 SHA512 c0010d3a73918e95ab9cfc50c3cf452b528a028e78a4522659df3be3f8f753094bd2ba5542d539a83a76d51608d563054a3560f25ee0a862757730e1cd18adad EBUILD glibc-2.38-r10.ebuild 54293 BLAKE2B a1e9e5df6cf6454cd823f4c497113b4b958ee48f2e7caa1f0faa8f0a798d287b4c9b333b3e10a51f0f687fcea77f1cbf10aeb2d254f9d636e3224a645e39eb82 SHA512 49bd7ced8fe1781929d1b416dd121f247a2902bf258af361826fe58ef0192cb31055855fcf8cd36f8893e3013dc915febc8899bf4c61fc8010aa36480d245552 EBUILD glibc-2.38-r11.ebuild 54516 BLAKE2B 5f54284b49ed56c0d22b425300d4926655d81755e6ba27417dc1fdc5e1137a50b9ae3de26c7475844b93b7b1ba815ab54e5d52c4c91b881a029a6320bdb0063b SHA512 e37b8a2498d8c0444843406e53b4b5f3fff873cee1521218eb5de364308c3dadb7d599314ba34efaf09d6b1309fa8e6fdb468e708597390252d4858d8047440c -EBUILD glibc-2.38-r12.ebuild 54518 BLAKE2B 1a51ca1611d9f6050318a43b4c46cfd20b6b942cabb704de6e8c43946ca48be0f90ab2fce9a3a92ddb90a7482e5aabef1f60bbcef205ab529507720fc5133153 SHA512 fd17c9d664e60a326058bd25d756d475735e039dc7f2a90f74f60912c35b01af80d32e5f0d037a30ff0666bef3d9e789caaea8f62b1f9747cdf8c6dc02904ead -EBUILD glibc-2.39-r3.ebuild 54302 BLAKE2B 6f11bf8a572f860d3285d6da4869881e9eaf9a88ce3a1166493e645bf8006d0d760304f2dba3636b1304947a0a6ff9e6952b0472c83f919af0778c03c4e43f7f SHA512 3a8c30464a6015dfc8ea77b2fe1998cd374c37e05e79ac02f262530150b73796675073cf4645074a7e4508bf074724c58cd12efaa9d155fd9a26c329854d8439 -EBUILD glibc-9999.ebuild 54303 BLAKE2B fb17c851cddbdfb5417aa0e11847b2e4a1219db670b652f17e8b0952105c66782b9d4f4d58e343e57bc0a0d41c4ed4527fb65485f36fd011908a7e2b06dfc9ba SHA512 3d496f1df146744c303ba005b48d134babce84e9e4f43e85acb589620e21afa5dc944dab43b903169d3057a20bc6a37f074076bb4d532230b79401e702c0be5f +EBUILD glibc-2.38-r12.ebuild 54528 BLAKE2B ad58539ba74e6f0624a99a983cad8e9627cad97f57aff0b054a5d4e29bff80e2c6e4a7a36cc1617d2c19007aef68e03d4375648e7d8e677b53f478ad712bf3b9 SHA512 7ab49ab26b087e829a37ab5928074078d15de70678bc3f271495e8de6eb312dbb4e1b8164915a5f0b3599197dac8da8e927b52eebb5cc72e24b6d3dba5d69064 +EBUILD glibc-2.39-r3.ebuild 54312 BLAKE2B 072e510616ea7803201aaf7254a57caaf74f9ed590dfa16c61a45d0f592b722fe3f967d95181ffea5c7c9659e8765137bb04b6c98c8e9b0e291c2b15420e74d0 SHA512 85af2ba4330308ab2e940f42681e3f15b7f2581fb18811ef970b6acf4d862ca1ee6087a08bc7041f10c9f32cf240f3a366805d44a8670efc4401534a71fe2f9a +EBUILD glibc-9999.ebuild 54313 BLAKE2B 92c498ab3299b45949e908051753456d855e9fe50cd0297240115e6c2220138725cb44660e361b2cdfd7edfc2319d65e9c5287b0470795c89173ca49a6fea284 SHA512 83e28cf60b14a97c0d71b0534efbc73869fcf1d14bf8c320c3a657be7ba2ca73be3aef9c627e24628396ab2bc252313596b29a503e9dc7c3ebd8318c0fa63fd2 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c diff --git a/sys-libs/glibc/glibc-2.38-r12.ebuild b/sys-libs/glibc/glibc-2.38-r12.ebuild index aef3c5d5d479..88280475bb10 100644 --- a/sys-libs/glibc/glibc-2.38-r12.ebuild +++ b/sys-libs/glibc/glibc-2.38-r12.ebuild @@ -663,7 +663,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild b/sys-libs/glibc/glibc-2.39-r3.ebuild index f53dac7811b7..1e6aadbb04e3 100644 --- a/sys-libs/glibc/glibc-2.39-r3.ebuild +++ b/sys-libs/glibc/glibc-2.39-r3.ebuild @@ -676,7 +676,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index c6fc206e2d4f..c3dce15e7e99 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -676,7 +676,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index 6b726b6c3fc0..c762ad3ef6fa 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -8,6 +8,8 @@ DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa DIST readline-8.1.tar.gz.sig 95 BLAKE2B 8a297ef2ebf815ac53f02d6395aa2ff9f24234aef6b9793bfcd5a610cd3a5024182ad8ec8beb75eadd5cf876c57cd56d4226075578a86e0e2421d2e9b1677aa5 SHA512 42a6052d5882f16e5b6f8cd16433d793a9cbb43cf1886b2d858dc65ce067a4c39c8dda7331e52f76426c43de02c358f9ffdaf5c8fd7b089479008c1e5aa19112 DIST readline-8.2.tar.gz 3043952 BLAKE2B 7974322b9c092a756a79e537df08e8532f8e0fcb598f77732e28287c33ebec9e9837ed88b43334c310892d56a871b423903f0f564def2fbe700a1004f2ae7b18 SHA512 0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a DIST readline-8.2.tar.gz.sig 95 BLAKE2B dc510459c0c47782ca87364a6677b4d8f0b68a984143122c08bd15aef08a71bff59ac92d3c3ada518dad09f189c144748e840175041eb619f679e2d8b95dc2aa SHA512 0effd273689e5f7fe7e049c8f2c5f3c97149f198a90d053231ee4de34901560a465ab0d4fd71fd07c7d7e233caed7f42e5b668bffaf1e23a7eb373c8f9e150fe +DIST readline-8.3-alpha.tar.gz 3091427 BLAKE2B f40e1db1ea39bbf4183901688733df0c67666eb58a33333f9b57ea7ba5399956f5523748ecce9bc5b6dc1954647c0bceb6ebbb4fe93b0085a595047650ad7c7e SHA512 d3aacd82826f1d1adc7ea846d8b8e70726da925e74a8bb1d141a9093e0d5e375236d1c745f0609f8ba3aff9f5266b1cf3da31d76e414a284b6ed798d92a1a1f6 +DIST readline-8.3-alpha.tar.gz.sig 95 BLAKE2B c11d1b4dd8f453bc5f7d19dd25901bfa4796825efa4f07f2043aa94d556a39bc1c928aed7fdc09ed6325c6ef017f72df18bbdd461a52a7122ccdf9b58a345c17 SHA512 fb070ae3dbafa042f591d8a5c24f48b40a672843e41e78f5d6a5ded5228046fe75893be6b10a9634d8852617bfa8b675e68a4c808f06ee95f07a40536fc63769 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54 DIST readline81-001.sig 95 BLAKE2B 7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e SHA512 7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff @@ -32,8 +34,9 @@ DIST readline82-009 2270 BLAKE2B ecfa4f3f445b0c90d4ba1cf4116c9a773a3e5ee737966d9 DIST readline82-009.sig 95 BLAKE2B 5484f3df25e550a717915ecf70e8410f747ff6d192a873e5449a4fb664bd3557d21a3cf40c5c9e0097dfaf2cee205243cd1cf6af34200f89e79f9d73626c49c1 SHA512 383cc954f8324588c699968d7cdf9a4f3c0e461917c8a16f5599cd0ffb59ff9539207478195a7d77c1842c11bd912cc17d3b3b56e6a9463db1991fb5c24d5409 DIST readline82-010 2653 BLAKE2B 44ebbf93b6449d848b2dda49716b494596d207bef08cdea0d01808b5291d68714e01ef914e97652bb73e81808a91fff829c8035a097db5b3649be1e0735e3eab SHA512 b611b42e31601ea5fcd7de59e6c1cdd3fece7cc8287e0e495ddfc4d5e8f765b3c6567b728fe0a317d6cb00240b772fa4c26f374c8bf361355a9d262bc5133874 DIST readline82-010.sig 95 BLAKE2B a5a6ccaace88a79c4e28f3c9d3a9ffad186ab772ada7668653b729190d5a598cbe46c769861a72acd08b5fb36f84537bd2018a98fbd0602565660411810447f7 SHA512 0c781417f0cf63daa8532f54b71c9fda69bb2206ca41f7f75fceb7f44781ec949f932881d82fd55d69038208aed45692e30a1e6013d698c7d13f8c9984e331bc -EBUILD readline-8.1_p2-r1.ebuild 6611 BLAKE2B f6e601958973e862bfc643cd64b255a100f1bfe696b71e6761290d56052b5998c41675ff0f65a65b3c0b761bb7395a78fb9f67b8339254b55074848e391a16bf SHA512 dc90f61237c3fc1bb6450fe81ea688f397f6888b83d8b206f8ef2fac70ac518aa86f7c82a383ca1b71350a920df12e65e042559da0f5507d1502606d9f656902 -EBUILD readline-8.1_p2-r2.ebuild 6611 BLAKE2B f6e601958973e862bfc643cd64b255a100f1bfe696b71e6761290d56052b5998c41675ff0f65a65b3c0b761bb7395a78fb9f67b8339254b55074848e391a16bf SHA512 dc90f61237c3fc1bb6450fe81ea688f397f6888b83d8b206f8ef2fac70ac518aa86f7c82a383ca1b71350a920df12e65e042559da0f5507d1502606d9f656902 -EBUILD readline-8.2_p10.ebuild 7270 BLAKE2B bf7efc78aa419dffd43c1f61b7a761ad2ec70610deeb29810075c333758b22978133d0e67798605361e5b0197f460c8c91d1f125b690977b4ab53dfb7c8a8aa6 SHA512 173ea30cdbd2a06606ecbd268964654c5bb05d8ee2f26787a1f8efecf1fe38296fe2781af16492ff39d4f7a2cffd9f8ac395a79aa285aae0f03f7ec03267f08d -EBUILD readline-9999.ebuild 7270 BLAKE2B bf7efc78aa419dffd43c1f61b7a761ad2ec70610deeb29810075c333758b22978133d0e67798605361e5b0197f460c8c91d1f125b690977b4ab53dfb7c8a8aa6 SHA512 173ea30cdbd2a06606ecbd268964654c5bb05d8ee2f26787a1f8efecf1fe38296fe2781af16492ff39d4f7a2cffd9f8ac395a79aa285aae0f03f7ec03267f08d +EBUILD readline-8.1_p2-r1.ebuild 6615 BLAKE2B 4b5cf6f77ac5442de6c118190d99c65152b65b09d0581cb9e82244bc74e9f6ae1fc7dcf04ec0a97ecf98b36f638f23296faa87887f9ba14490aef92752195635 SHA512 89eb20dffd2d376b96526def055116eb133ba211ff87b71bb3007fdedfb5fd42b0c6f18223865afd4b525790b0a20dc66a2bf50e6d542163300435dff49448b8 +EBUILD readline-8.1_p2-r2.ebuild 6615 BLAKE2B 4b5cf6f77ac5442de6c118190d99c65152b65b09d0581cb9e82244bc74e9f6ae1fc7dcf04ec0a97ecf98b36f638f23296faa87887f9ba14490aef92752195635 SHA512 89eb20dffd2d376b96526def055116eb133ba211ff87b71bb3007fdedfb5fd42b0c6f18223865afd4b525790b0a20dc66a2bf50e6d542163300435dff49448b8 +EBUILD readline-8.2_p10.ebuild 7274 BLAKE2B 9bc1277cd2bc1ffc3396e4b9bc55feee9ffb296fd27174800ec57ffe219aa99b79a2575a200a16355eaf7d15f607bcdedecfde4f3e8b8d4df910ee1bf9a10e9c SHA512 f56177adc72a7cb71c35bd163401b8bf0a6c9aa3bef7722a01599a723d5461bfe0933004bc17b305a6da5e5a3748b2a9f332c6d43924d3d6387fa8c57e8f51e5 +EBUILD readline-8.3_alpha.ebuild 7221 BLAKE2B 20e40b57b70f17d6b0e6212a2a1606d4ac11707a5e0d924b85e158bf28a2507d555698b91bb4f8acea0bbfa7735cde151e8cc9f630e0672f4c124399ea8a588c SHA512 46ad76165480ffef1f79b18563a43675bd3905da17f7cac2bdc2feb63ba731d25b7b1cda0b1317ffe5139795da093e47fda921318624951786cfb4e2c5994245 +EBUILD readline-9999.ebuild 7221 BLAKE2B 20e40b57b70f17d6b0e6212a2a1606d4ac11707a5e0d924b85e158bf28a2507d555698b91bb4f8acea0bbfa7735cde151e8cc9f630e0672f4c124399ea8a588c SHA512 46ad76165480ffef1f79b18563a43675bd3905da17f7cac2bdc2feb63ba731d25b7b1cda0b1317ffe5139795da093e47fda921318624951786cfb4e2c5994245 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00 diff --git a/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sys-libs/readline/readline-8.1_p2-r1.ebuild index 86e18ce55222..8c2239444310 100644 --- a/sys-libs/readline/readline-8.1_p2-r1.ebuild +++ b/sys-libs/readline/readline-8.1_p2-r1.ebuild @@ -48,7 +48,7 @@ case ${PV} in # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -58,6 +58,8 @@ case ${PV} in ;; esac +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major [[ ${PV} == *_rc* ]] || \ @@ -69,8 +71,6 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-chetramey )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}"/${PN}-5.0-no_rpath.patch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 diff --git a/sys-libs/readline/readline-8.1_p2-r2.ebuild b/sys-libs/readline/readline-8.1_p2-r2.ebuild index 86e18ce55222..8c2239444310 100644 --- a/sys-libs/readline/readline-8.1_p2-r2.ebuild +++ b/sys-libs/readline/readline-8.1_p2-r2.ebuild @@ -48,7 +48,7 @@ case ${PV} in # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -58,6 +58,8 @@ case ${PV} in ;; esac +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major [[ ${PV} == *_rc* ]] || \ @@ -69,8 +71,6 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-chetramey )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}"/${PN}-5.0-no_rpath.patch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 diff --git a/sys-libs/readline/readline-8.2_p10.ebuild b/sys-libs/readline/readline-8.2_p10.ebuild index a7f0d5654c3a..26af570758a2 100644 --- a/sys-libs/readline/readline-8.2_p10.ebuild +++ b/sys-libs/readline/readline-8.2_p10.ebuild @@ -61,7 +61,7 @@ elif is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -73,6 +73,8 @@ else SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" fi +S="${WORKDIR}/${MY_P}" + if ! is_release ; then inherit autotools fi @@ -89,8 +91,6 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-chetramey )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}"/${PN}-5.0-no_rpath.patch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 diff --git a/sys-libs/readline/readline-8.3_alpha.ebuild b/sys-libs/readline/readline-8.3_alpha.ebuild new file mode 100644 index 000000000000..616ce593d07b --- /dev/null +++ b/sys-libs/readline/readline-8.3_alpha.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# There's no standard way of versioning the point releases upstream +# make anyway, so while this was added for RC versions, it's fine +# in general. +QA_PKGCONFIG_VERSION=$(ver_cut 1-2) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc +inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs verify-sig + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +MY_PATCHES=() + +is_release() { + case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +[[ ${PV} != *_p* ]] && PLEVEL=0 + +DESCRIPTION="Another cute console display library" +HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" + + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + + patch_url= + my_patch_index= + + upstream_url_base="mirror://gnu/readline" + mirror_url_base="ftp://ftp.cwru.edu/pub/readline" + + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) + done + + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + fi +else + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" +fi + +S="${WORKDIR}/${MY_P}" + +if ! is_release ; then + inherit autotools +fi + +LICENSE="GPL-3+" +SLOT="0/8" # subslot matches SONAME major +if is_release ; then + 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" +fi +IUSE="static-libs +unicode utils" + +RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-chetramey ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0-no_rpath.patch + "${FILESDIR}"/${PN}-7.0-headers.patch + "${FILESDIR}"/${PN}-8.0-headers.patch + + # TODO: rebase + #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + # Needed because we don't want the patches being unpacked + # (which emits annoying and useless error messages) + verify-sig_src_unpack + unpack ${MY_P}.tar.gz + fi +} + +src_prepare() { + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + + default + + is_release || eautoreconf + + if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then + # If we're bootstrapping, make a guess. We don't have pkg-config + # around yet. bug #818103. + # Incorrectly populating this leads to underlinked libreadline. + local ncurses_libs + local ncurses_libs_suffix=$(usex unicode w '') + + ncurses_libs="-lncurses${ncurses_libs_suffix}" + + if has_version "sys-libs/ncurses[tinfo(+)]" ; then + ncurses_libs+=" -ltinfo${ncurses_libs_suffix}" + fi + else + # Force ncurses linking, bug #71420. + # Use pkg-config to get the right values, bug #457558. + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) + fi + + sed -i \ + -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ + support/shobj-conf || die + sed -i \ + -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ + examples/rlfe/configure || die + + # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # objformat for years, so we don't want to rely on that. + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die + + # For local readline headers + ln -s ../.. examples/rlfe/readline || die +} + +src_configure() { + # Fix implicit decls with widechar funcs + append-cppflags -D_GNU_SOURCE + # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free + + # Make sure configure picks a better ar than `ar`, bug #484866 + export ac_cv_prog_AR="$(tc-getAR)" + + # Force the test since we used sed above to force it. + export bash_cv_termcap_lib=ncurses + + # Control cross-compiling cases when we know the right answer. + # In cases where the C library doesn't support wide characters, readline + # itself won't work correctly, so forcing the answer below should be OK. + if tc-is-cross-compiler ; then + export bash_cv_func_sigsetjmp="present" + export bash_cv_func_ctype_nonascii="yes" + # bug #503312 + export bash_cv_wcwidth_broken="no" + fi + + # This is for rlfe, but we need to make sure LDFLAGS doesn't change + # so we can re-use the config cache file between the two. + append-ldflags -L. + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --with-curses + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # Code is full of AC_TRY_RUN() + mkdir -p examples/rlfe || die + cd examples/rlfe || die + + ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache + fi +} + +multilib_src_compile() { + emake + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # Code is full of AC_TRY_RUN() + cd examples/rlfe || die + local l + for l in readline history ; do + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die + ln -s ../../lib${l}.a lib${l}.a || die + done + emake + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi ; then + if use utils && ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe + fi + fi +} + +multilib_src_install_all() { + HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs + + dodoc USAGE + docinto ps + dodoc doc/*.ps +} +pkg_preinst() { + # bug #29865 + # Reappeared in bug #595324 with paludis so keeping this for now... + preserve_old_lib \ + /$(get_libdir)/lib{history,readline}$(get_libname 4) \ + /$(get_libdir)/lib{history,readline}$(get_libname 5) \ + /$(get_libdir)/lib{history,readline}$(get_libname 6) \ + /$(get_libdir)/lib{history,readline}$(get_libname 7) +} + +pkg_postinst() { + preserve_old_lib_notify \ + /$(get_libdir)/lib{history,readline}$(get_libname 4) \ + /$(get_libdir)/lib{history,readline}$(get_libname 5) \ + /$(get_libdir)/lib{history,readline}$(get_libname 6) \ + /$(get_libdir)/lib{history,readline}$(get_libname 7) +} diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild index a7f0d5654c3a..616ce593d07b 100644 --- a/sys-libs/readline/readline-9999.ebuild +++ b/sys-libs/readline/readline-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # There's no standard way of versioning the point releases upstream # make anyway, so while this was added for RC versions, it's fine @@ -61,7 +61,7 @@ elif is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -73,6 +73,8 @@ else SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" fi +S="${WORKDIR}/${MY_P}" + if ! is_release ; then inherit autotools fi @@ -86,14 +88,13 @@ IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-chetramey )" - -S="${WORKDIR}/${MY_P}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-chetramey ) +" PATCHES=( "${FILESDIR}"/${PN}-5.0-no_rpath.patch - "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 "${FILESDIR}"/${PN}-7.0-headers.patch "${FILESDIR}"/${PN}-8.0-headers.patch -- cgit v1.2.3