diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-25 13:30:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-25 13:30:01 +0100 |
commit | e564f1661521043bc9e03e613c3cd8c79d5d7713 (patch) | |
tree | 15a54c918d3a6a7de74cc56ce001856a561165ab /sys-devel/gettext | |
parent | e59b99df9503539c0231e655a17bccf83f8a270d (diff) |
gentoo auto-resync : 25:06:2023 - 13:30:01
Diffstat (limited to 'sys-devel/gettext')
-rw-r--r-- | sys-devel/gettext/Manifest | 3 | ||||
-rw-r--r-- | sys-devel/gettext/files/gettext-0.22-disable-libintl.patch | 34 | ||||
-rw-r--r-- | sys-devel/gettext/gettext-0.22-r1.ebuild | 4 |
3 files changed, 4 insertions, 37 deletions
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 4fc42c450623..3b0f88fa9c6c 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -4,11 +4,10 @@ AUX gettext-0.21-CVE-2020-12825.patch 14074 BLAKE2B 67da10f81edf92004b8d1f4099c7 AUX gettext-0.21-musl-omit_setlocale_lock.patch 1598 BLAKE2B 6b27ad4db1fcaed8b88345f47f75eb36580eb848ed3e914f2625c8136d34c1a13cd67ca043b2d42ee352d1214b3db0e3684b1be470072640bfc7c6892b78e2cb SHA512 04bf3d840c3687255f8333ae6de1af1774b80611fbfd69a9eff0b49bed74510a0e6c40768e1c1e52853221c2ee19ccad78a211500f0b1c05763670a1dbebbf70 AUX gettext-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 -AUX gettext-0.22-disable-libintl.patch 1385 BLAKE2B 7d8b92f882f355ad077a69a6dccc12f4e4d8a38e78749611f2b3e3208c5113ff189d8a42f7bbb622c5dc4457acb597c7db1265fce7f23b0f0505f64de14b4ce1 SHA512 46e324fe80204a79bd4413ece1afc235204c4f31042958918c101f15f4c5c83afe209c90f002e1f6fc9b7fd263076b65f43133520383db53dd25d5c4c52c5fb6 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0 DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b EBUILD gettext-0.21.1.ebuild 5199 BLAKE2B a0c375609a0a988debfe68d7101b04ce9a71abc3b949d57222e9642b80757b74e652017102bb736141d085bf7a160004c4e472ac1e0e4cb6c2d396172e700567 SHA512 934dbe90a60fe2559cbb4c3f42926b61184f77124442c143244d8bf3caac583f58cb097fce7b01c69761f97dc016214ef0d0ea6da5995f4fc2efcf2266d08efa -EBUILD gettext-0.22-r1.ebuild 5122 BLAKE2B 401e96ad15a0999844f8821fa4e2bdd33e377c8df1c51e3b8d237a28c205b16484493a74ba21486741bae05cfcb6c3baea5f7b52549e44c25135f3fb2447bcf1 SHA512 e5f77273f067757c41d34249f3979cecb44b7362562439f9aff5ddf54a2224693ed1a4ffadc9f9e64e4658a4fa209c5c8283b2b0f6d1abbe4356fada9df59f01 +EBUILD gettext-0.22-r1.ebuild 5215 BLAKE2B 74d2257746329ae3a15e4d0df0cbdd7adde734f316e5dba576b2251260612c90e1a952ff661b03944a40c9581efb4c72ec0e6f340634c356ef445419ddc24303 SHA512 f48b722448f551e610c58a2005ec9c214060090a6728f586f140bbc1462ea68a5925017b2dc52be8102d3aa3ff24feda13d899568d8cc2b2b068debb18ad72bc MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch deleted file mode 100644 index b242ead4b435..000000000000 --- a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/564168 -https://bugs.gentoo.org/909041 - -Never build libintl since it's in dev-libs/libintl now. - -We can drop this if/when upstream fixes the configure flag handling: -https://savannah.gnu.org/bugs/?48233 - ---- a/gettext-runtime/configure -+++ b/gettext-runtime/configure -@@ -22765,9 +22765,7 @@ - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ -- && test "$PACKAGE" != gettext-runtime \ -- && test "$PACKAGE" != gettext-tools \ -- && test "$PACKAGE" != libintl; }; then -+ }; then - gt_use_preinstalled_gnugettext=yes - else - LIBINTL= ---- a/gettext-tools/configure -+++ b/gettext-tools/configure -@@ -26129,9 +26129,7 @@ - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ -- && test "$PACKAGE" != gettext-runtime \ -- && test "$PACKAGE" != gettext-tools \ -- && test "$PACKAGE" != libintl; }; then -+ }; then - gt_use_preinstalled_gnugettext=yes - else - LIBINTL= diff --git a/sys-devel/gettext/gettext-0.22-r1.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild index 15b71238987e..2ebf45ed888d 100644 --- a/sys-devel/gettext/gettext-0.22-r1.ebuild +++ b/sys-devel/gettext/gettext-0.22-r1.ebuild @@ -67,7 +67,6 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}"/${PN}-0.22-disable-libintl.patch "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch ) @@ -153,6 +152,9 @@ multilib_src_install() { dosym msgfmt /usr/bin/gmsgfmt # bug #43435 dobin gettext-tools/misc/gettextize fi + + # 909041 never install libintl which upstream insists on building + rm -f "${ED}"/usr/$(get_libdir)/libintl.* "${ED}"/usr/include/libintl.h } multilib_src_install_all() { |