gentoo auto-resync : 10:02:2025 - 00:12:20

3 files changed, 8 insertions, 9 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 78e8b870e110..72d1d0e899ef 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -12,12 +12,12 @@ DIST gettext-0.22.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0
 DIST gettext-0.22.4.tar.xz.sig 833 BLAKE2B fbb00b53c807934a11263c120861971fffebbd39689eda1fae0fb956476e69c3fb6799440cbf3acfcf43ecea2c134ea4dadb95becbac98badb43e546f3c8e9fb SHA512 a774c98de643b1ea3df645e451878652c2baa5cd786642aa457e6d5f5c44787cb1231eb15ad4390acdf314822633acaffffaa853eb69cbbc72c3b79b547a8854
 DIST gettext-0.22.5.tar.xz 10270724 BLAKE2B 18c383518f5a78b5c04cf76de976524da2a87a892a30d6386778bb4c7dd526ffc3f14f484906c5d3a513b7caf76ea560e53962b325e552182d6940055d798f24 SHA512 a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd
 DIST gettext-0.22.5.tar.xz.sig 833 BLAKE2B bb3e5ced34ab109f498347a3567103fe3491f69addb4a5ce25bf854fae1a11340eef1a9826b369d2416b53e5f7065aeebdb1609615f064cf7fb4151e82a5b4e5 SHA512 87f1df69206702be928b09a59a19ae4c23072cbc78ea16e76bfc4c929de76a3c0bb8e4eb2c3100c6e7b3b51d23e3b0e484c7e1d576ba7e25fd887934dc9ed8f7
-DIST gettext-0.23.tar.xz 11053572 BLAKE2B 208e5a73ed021c22357b1a1f0324dd7c9fa14b458b610c6f2fbd85f6541dd2bc23179c63dcd43000689482d8a6337f5255f501581d67ee2338ef3d50ec5e9c2e SHA512 1de09c0a83b1b4bb810abacbaf7c3e0fedbfbddea1cf7c89df3838c5f0a14cf58d686eb5876cfae302acb31c93beefb61a12c8a889a998fd235798699dc2c155
-DIST gettext-0.23.tar.xz.sig 833 BLAKE2B 5da93144e3d2eb745729b3f2d68e85ad508214b62694a22da7d37c6a3c9eaacd0d44339564b6373690dce29d9140a8af31ccea9e61726d2651ecc8234405b681 SHA512 25a6a2d1d9eb406b2be036b01f709a0badb84b70e23908c51fcbc1e26836510748f9623a075622271962d37bb859d4553755c6ed9832c1f39742ae1179b9292a
+DIST gettext-0.23.1.tar.xz 11038556 BLAKE2B 08d10340f3d855a87a96594c6f2dcf72925394f02e86235090f8d272e0a27ce32e57a0fbaed61aaf61d7328ff30be076dccaecaa13832d8db3ec0a51786780b9 SHA512 d75908f73eabe36c01d72d342ca694dbefad5f43da54f0ccb43bfd0518baff5becc8f50e787f21fadb7c29b3123638e4559334ea4f8e48a97107e8c5e22453b6
+DIST gettext-0.23.1.tar.xz.sig 833 BLAKE2B 7ab3c5b76825fcd71371f25f0cc3d79704c5ae405f153917901f583f5780f3707f622522b2bac89dbf32a7bf281216ad7469608af490ad6072f12c81e472200a SHA512 8aa2ba38d863d15a91b526b8b22d5aa54e07bc9cf716a551338d4f7f4230288bfa1234d4628e28fcdb4dc4050786a233a194197ca247d98c939e4d06bca4c230
 EBUILD gettext-0.21.1.ebuild 5183 BLAKE2B abbb7e45677f053c241c9d05f1c1598157ff5a1fc67739b46ea54143973a7b95f6a2540cf50091ae5c34d649b5029edc9e2c9c85443d2c1684d64e92d1ba6169 SHA512 52b8bab71bbbf4cd7fe48ce64c730f172022003e0e9847d4adc0e3c67dcccfba9f453e25b6a4a7fade689dda6798ac55f7e790d737d94edcc2488a76e9495bbc
 EBUILD gettext-0.22.4-r1.ebuild 5189 BLAKE2B a7ab7f1a200d44b834644703222ca5c6540027192cae68900b10f5f82d5dae93c339b1d0399cbe3a05977df49e5579b41ff82c8422f12c5b08c359f91ffbba6e SHA512 e5249993d1e4777d9b52139148b00ada922766013df5300ed985d8e73295d962bbda776f02f6027d4179272568ba9596c60c89cc11c6405105ea8615db89223c
 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-r1.ebuild 5440 BLAKE2B 1dff1f18d318e71216472cb3b3ada1c00c8e646117a59a9e4146adc0f2803da9df7eb66a2c83024f4979fa170d35e9bdae077a1ee97efc85a776529b77bc8b78 SHA512 19c67232cd3f851f7921e2ab1b0b3ba76f05908daabba5cfab3657e18a92f9d23e140df585b1a844ac2c1ecfcded60b3fb51645c4552e3beaa904096d9dbdda1
 EBUILD gettext-0.22.5.ebuild 5430 BLAKE2B ff685b6f9986b5e29f5dc78dcd2986bbd1b75d3b5e547235f896103eacf73d7adca2108d20496bd83d0a28f2ebfd55d61fbca92049aa09065442bdc3b4d92306 SHA512 48eef0acb483f019bec013e87abd23eacbb68b3755e00d67351cbecaaab9f1854ca5a3278e8ea3834eda0972d3e6fc21944086af371a94fcaca5cdd6110e290c
-EBUILD gettext-0.23.ebuild 5333 BLAKE2B 4b72207970dde276daf386567b782ae674d105fe1328b57351c40f58f18923a5234fce2c79d2990ae0c1d7ac4aae0303df74d2420cf1d13d8d05de52f20208c7 SHA512 7437cf0d6d8158bca2c53a0c96c440f2fb522e7f26f50067cd09548937a5042b4a21e1a129fbbeee690923c2cc35d822d01815b8f507e926190575e97b7199f2
+EBUILD gettext-0.23.1.ebuild 5278 BLAKE2B b680d2b9eaef85ecfff868b7ac0ce7beea2505aa0ca14a33fbcf60484cd223364a6e72452c31966f745fa7b6f1e1cf96626633e4260036003cd6d2b96e03f186 SHA512 60af3f49477a5cd69bd133d8879d523dca99ab047058c0153c549c3f78e9f164bbcdd96acc399790a0d7d62ce9e185aa7a7ce19931319bdad6e639af290ce6b9
 MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c
diff --git a/sys-devel/gettext/gettext-0.22.5-r1.ebuild b/sys-devel/gettext/gettext-0.22.5-r1.ebuild
index cbcedaee51df..1528c6eabef0 100644
--- a/sys-devel/gettext/gettext-0.22.5-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.22.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
@@ -23,7 +23,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gettext/gettext-0.23.ebuild b/sys-devel/gettext/gettext-0.23.1.ebuild
index 05471c9bd42f..9a7956b9ee6a 100644
--- a/sys-devel/gettext/gettext-0.23.ebuild
+++ b/sys-devel/gettext/gettext-0.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
@@ -54,6 +54,7 @@ RDEPEND="
 	${DEPEND}
 	git? ( dev-vcs/git )
 	java? ( >=virtual/jre-1.8:* )
+	nls? ( app-i18n/gnulib-l10n )
 "
 BDEPEND="
 	git? ( dev-vcs/git )
@@ -74,8 +75,6 @@ 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"