[gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/

["Sam James" <sam@gentoo.org>]

commit:     0ab8d224504153277d83e6d17e27a4f6be9b4cd1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 08:55:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 08:55:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab8d224

dev-libs/libintl: add 0.22.1

Note that this drops the workaround from ed66572a4917c140825ef8cb0a4150bd69296d0c
as it seems likely it was upstream bug https://savannah.gnu.org/bugs/?64323 which
is fixed in 0.22.1.

(If it isn't, please file a new upstream bug & reference that when restoring
the workaround.)

Bug: https://savannah.gnu.org/bugs/?64323
Bug: https://bugs.gentoo.org/906507
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libintl/Manifest              |  2 +
 dev-libs/libintl/libintl-0.22.1.ebuild | 99 ++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 546310d160dc..7b53d5d7aabc 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,4 +1,6 @@
 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.1.tar.xz 10229080 BLAKE2B c64dcdc88d2d5db73b4e1779ccb4e0910355f169506b16d303a2db3b1a7ef83aa6e1866d20ce47f598874737d769098f371b18e947dc6b053f7a85d304ea1780 SHA512 03c5d7d791ac45d46d2e6d0fdbea0eaafc91fa7f067841124da7c4abd9e967f78c80608cd75aeeff7c1b6a944f4345a32cd1b465d5d5111be0ec92de475821c0
+DIST gettext-0.22.1.tar.xz.sig 833 BLAKE2B 069a25c0b11c4ef8ef43e28c13271484fc55d75ddef53c709c57b31e150984bfdd54891f047187f27993770165392bdf698c70498e5bdded4611f8db8dd5d0d4 SHA512 86b43852bc465a98b4fdd5ccd156f6666b57775ecfb0f8de12b653cf3c8f86ab8a21cf9094e8e7d1f07fc520d01f2cfd9d48c81ed31a173093ed5eaa684671d8
 DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa
 DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b

diff --git a/dev-libs/libintl/libintl-0.22.1.ebuild b/dev-libs/libintl/libintl-0.22.1.ebuild
new file mode 100644
index 000000000000..8e0a98b1ff08
--- /dev/null
+++ b/dev-libs/libintl/libintl-0.22.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI=8
+
+MY_P="gettext-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
+inherit multilib-minimal libtool usr-ldscript verify-sig
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="
+	mirror://gnu/gettext/${MY_P}.tar.xz
+	verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )
+"
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="
+	${DEPEND}
+	!sys-libs/glibc
+	!sys-libs/musl
+	!<sys-devel/gettext-0.19.6-r1
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}/${MY_P}" || die
+
+	# gettext-0.21.1-java-autoconf.patch changes
+	# gettext-{runtime,tools}/configure.ac and the corresponding
+	# configure scripts. Avoid regenerating other autotools output.
+	#touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+	#touch -c configure || die
+
+	cd "${S}" || die
+
+	# The libtool files are stored higher up, so make sure we run in the
+	# whole tree and not just the subdir we build.
+	elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+
+		# Emacs support is now in a separate package.
+		--without-emacs
+		--without-lispdir
+		# Normally this controls nls behavior in general, but the libintl
+		# subdir is skipped unless this is explicitly set.  ugh.
+		--enable-nls
+		# This magic flag enables libintl.
+		--with-included-gettext
+		# The gettext package provides this library.
+		--disable-c++
+		--disable-libasprintf
+		# No Java until someone cares.
+		--disable-java
+
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# We only need things in the intl/ subdir.
+	emake -C intl
+}
+
+multilib_src_install() {
+	# We only need things in the intl/ subdir.
+	emake DESTDIR="${D}" install -C intl
+
+	gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+
+	rm -r "${ED}"/usr/share/locale || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}