gentoo auto-resync : 07:12:2024 - 02:07:26

3 files changed, 166 insertions, 1 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 117cd6b77d46..363754a74568 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -5,6 +5,7 @@ AUX gettext-0.21-musl-omit_setlocale_lock.patch 1598 BLAKE2B 6b27ad4db1fcaed8b88
 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.23-libxml2-2.12.0.patch 1417 BLAKE2B 6ebf749c052465d01dbd8aa16cca196190a579cd6d71f5731e27b139c33d6c9f1798a31dfaae0c51f3a80148bff3cdccd06dacc82b22a0bba3e49e849be44a52 SHA512 428a6668437c5a63fd5b984e5c7374611d552c851e17367952767c3446d57b723c09ddf0358ef600f2a6760792a188abb0b0c7da4c70e3bacb5287b8ad26f377
+AUX gettext-0.23-no-nls.patch 5158 BLAKE2B 3d989698288f493ed9f51f701d153c10d54acf13d630c50d9b33f6647b6490238b29d4cf584f7b394dc98a8707d86666f519883a668f8b1e5e0fdbc4d5dabc0c SHA512 bfde98fcc3db13ea130843f8461b7ce75fe1c73672019c9de1b3fe83a75b51885487d8355f376ab215723a09846045c6d2ee7c8811a09c28b09898ee89cae6bd
 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.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc SHA512 0f3620b1621b85b3df9e372885c2f040c8a91ec0b2d4e16978459a8a2a152318a0e6f5fefb8d971bad80c437e7ee8ac8c24edc4de0ab86e729528b8a2ac62c51
@@ -17,5 +18,5 @@ EBUILD gettext-0.21.1.ebuild 5183 BLAKE2B abbb7e45677f053c241c9d05f1c1598157ff5a
 EBUILD gettext-0.22.4.ebuild 5179 BLAKE2B dbf62738b07f3018facf85b453e5462673dff921e53f0085d6c9d70083ebd76b4354fe5edc7d03ada5bca5f582a9431283a85ff651e8724185299f4e83c4ae20 SHA512 4e41eeeb86dc02c731ecc2f93cf8a796753d490fb52dc3d38cd849d65996c36e591141bf4bfc829dc5e356968fb87ba8b011fd76f482fcdac71f2ad50f3a74ea
 EBUILD gettext-0.22.5-r1.ebuild 5446 BLAKE2B 87ab467c84bcad48e3e33cee7f328228b9e7b75317118f42740e48a5ebc6320a4d7b3873d521419779c1461887a311aedb8a5929ebfd6de037f7c6bc9e7634ec SHA512 35410f269686459167a14512f1511312a4c83c99d78c51fb6ed32d7302b0d2bc5b8a28f5c05875f6bc1827d91fed56b147442218a3c40fb98af29e084f9153d4
 EBUILD gettext-0.22.5.ebuild 5430 BLAKE2B ff685b6f9986b5e29f5dc78dcd2986bbd1b75d3b5e547235f896103eacf73d7adca2108d20496bd83d0a28f2ebfd55d61fbca92049aa09065442bdc3b4d92306 SHA512 48eef0acb483f019bec013e87abd23eacbb68b3755e00d67351cbecaaab9f1854ca5a3278e8ea3834eda0972d3e6fc21944086af371a94fcaca5cdd6110e290c
-EBUILD gettext-0.23.ebuild 5338 BLAKE2B 8ccae32b93633b40fcdef6a0c6db0c3067160e11962d0e6f88cc2c985c1710b88f9e75a155d9ed1cd1bda2370b45fd173724377b0f1c4c8ba545b7c1171c00f6 SHA512 eeec5477ca985cf711f65de57c428026aeeba758792a68f96910b48270e64ae5198b96fc678feaaede49261a9e3603e7dba08bcca5e27c9989a189a68c75d6ce
+EBUILD gettext-0.23.ebuild 5377 BLAKE2B e45a2d966c66cc448ba810031245de4e86936f796507e42ea50fb021834010d9735cb0dfa5edf01a8186bc72ea02e52835dfea5628e73463196abae9f2d24503 SHA512 633c6795b50d7766021acd2203ce5ab14377cb8b47edf1908258441d86c49547d3f137bacea2d34ac000dbec63c3722ac4587535bdfb6cf6ba734708d3209318
 MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c
diff --git a/sys-devel/gettext/files/gettext-0.23-no-nls.patch b/sys-devel/gettext/files/gettext-0.23-no-nls.patch
new file mode 100644
index 000000000000..cade5e421e0b
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.23-no-nls.patch
@@ -0,0 +1,163 @@
+https://bugs.gentoo.org/945817
+https://savannah.gnu.org/bugs/?66533
+https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4a2fe717080b34a2770a674235bb2b6e3e3dd86f
+
+--
+Patch from:
+https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4a2fe717080b34a2770a674235bb2b6e3e3dd86f
+Removed non-applying Changelog hunk & fixed patch prefix to match file path in the tarball.
+
+Bug: https://bugs.gentoo.org/945817
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+--- a/gettext-tools/gnulib-m4/bison-i18n.m4
++++ b/gettext-tools/gnulib-m4/bison-i18n.m4
+@@ -1,5 +1,5 @@
+ # bison-i18n.m4
+-# serial 5
++# serial 6
+ dnl Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -57,27 +57,28 @@ AC_DEFUN([BISON_I18N],
+       fi
+     fi
+     AC_SUBST([BISON_LOCALEDIR])
++  fi
+ 
+-    dnl Define BISON_LOCALEDIR_c and BISON_LOCALEDIR_c_make.
+-    dnl Find the final value of BISON_LOCALEDIR.
+-    gl_saved_prefix="${prefix}"
+-    gl_saved_datarootdir="${datarootdir}"
+-    gl_saved_localedir="${localedir}"
+-    gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
+-    dnl Unfortunately, prefix gets only finally determined at the end of
+-    dnl configure.
+-    if test "X$prefix" = "XNONE"; then
+-      prefix="$ac_default_prefix"
+-    fi
+-    eval datarootdir="$datarootdir"
+-    eval localedir="$localedir"
+-    eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
+-    gl_BUILD_TO_HOST([BISON_LOCALEDIR])
+-    BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
+-    localedir="${gl_saved_localedir}"
+-    datarootdir="${gl_saved_datarootdir}"
+-    prefix="${gl_saved_prefix}"
++  dnl Define BISON_LOCALEDIR_c and BISON_LOCALEDIR_c_make.
++  dnl Find the final value of BISON_LOCALEDIR.
++  gl_saved_prefix="${prefix}"
++  gl_saved_datarootdir="${datarootdir}"
++  gl_saved_localedir="${localedir}"
++  gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
++  dnl Unfortunately, prefix gets only finally determined at the end of
++  dnl configure.
++  if test "X$prefix" = "XNONE"; then
++    prefix="$ac_default_prefix"
+   fi
++  eval datarootdir="$datarootdir"
++  eval localedir="$localedir"
++  eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
++  gl_BUILD_TO_HOST([BISON_LOCALEDIR])
++  BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
++  localedir="${gl_saved_localedir}"
++  datarootdir="${gl_saved_datarootdir}"
++  prefix="${gl_saved_prefix}"
++
+   if test $BISON_USE_NLS = yes; then
+     AC_DEFINE([YYENABLE_NLS], [1],
+       [Define to 1 to internationalize bison runtime messages.])
+
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -29892,17 +29892,18 @@ fi
+       fi
+     fi
+ 
++  fi
+ 
+-            gl_saved_prefix="${prefix}"
+-    gl_saved_datarootdir="${datarootdir}"
+-    gl_saved_localedir="${localedir}"
+-    gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
+-            if test "X$prefix" = "XNONE"; then
+-      prefix="$ac_default_prefix"
+-    fi
+-    eval datarootdir="$datarootdir"
+-    eval localedir="$localedir"
+-    eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
++      gl_saved_prefix="${prefix}"
++  gl_saved_datarootdir="${datarootdir}"
++  gl_saved_localedir="${localedir}"
++  gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
++      if test "X$prefix" = "XNONE"; then
++    prefix="$ac_default_prefix"
++  fi
++  eval datarootdir="$datarootdir"
++  eval localedir="$localedir"
++  eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
+ 
+ 
+ 
+@@ -29927,11 +29928,11 @@ fi
+   fi
+ 
+ 
+-    BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
+-    localedir="${gl_saved_localedir}"
+-    datarootdir="${gl_saved_datarootdir}"
+-    prefix="${gl_saved_prefix}"
+-  fi
++  BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
++  localedir="${gl_saved_localedir}"
++  datarootdir="${gl_saved_datarootdir}"
++  prefix="${gl_saved_prefix}"
++
+   if test $BISON_USE_NLS = yes; then
+ 
+ printf "%s\n" "#define YYENABLE_NLS 1" >>confdefs.h
+@@ -61062,17 +61063,18 @@ fi
+       fi
+     fi
+ 
++  fi
+ 
+-            gl_saved_prefix="${prefix}"
+-    gl_saved_datarootdir="${datarootdir}"
+-    gl_saved_localedir="${localedir}"
+-    gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
+-            if test "X$prefix" = "XNONE"; then
+-      prefix="$ac_default_prefix"
+-    fi
+-    eval datarootdir="$datarootdir"
+-    eval localedir="$localedir"
+-    eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
++      gl_saved_prefix="${prefix}"
++  gl_saved_datarootdir="${datarootdir}"
++  gl_saved_localedir="${localedir}"
++  gl_saved_bisonlocaledir="${BISON_LOCALEDIR}"
++      if test "X$prefix" = "XNONE"; then
++    prefix="$ac_default_prefix"
++  fi
++  eval datarootdir="$datarootdir"
++  eval localedir="$localedir"
++  eval BISON_LOCALEDIR="$BISON_LOCALEDIR"
+ 
+ 
+ 
+@@ -61097,11 +61099,11 @@ fi
+   fi
+ 
+ 
+-    BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
+-    localedir="${gl_saved_localedir}"
+-    datarootdir="${gl_saved_datarootdir}"
+-    prefix="${gl_saved_prefix}"
+-  fi
++  BISON_LOCALEDIR="${gl_saved_bisonlocaledir}"
++  localedir="${gl_saved_localedir}"
++  datarootdir="${gl_saved_datarootdir}"
++  prefix="${gl_saved_prefix}"
++
+   if test $BISON_USE_NLS = yes; then
+ 
+ printf "%s\n" "#define YYENABLE_NLS 1" >>confdefs.h
diff --git a/sys-devel/gettext/gettext-0.23.ebuild b/sys-devel/gettext/gettext-0.23.ebuild
index 71544ab64e2f..8055b1f87851 100644
--- a/sys-devel/gettext/gettext-0.23.ebuild
+++ b/sys-devel/gettext/gettext-0.23.ebuild
@@ -75,6 +75,7 @@ MULTILIB_WRAPPED_HEADERS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
 	"${FILESDIR}"/${PN}-0.23-libxml2-2.12.0.patch
+	"${FILESDIR}"/${PN}-0.23-no-nls.patch
 )
 
 QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"