commit: eff075e104fdd571cd905bf4a7034d1b1cf91e5b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 29 15:03:16 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 29 15:04:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff075e1
dev-libs/libintl: add 0.21.1 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libintl/Manifest | 2 + .../files/libintl-0.21.1-java-autoconf.patch | 100 +++++++++++++++++++++ dev-libs/libintl/libintl-0.21.1.ebuild | 96 ++++++++++++++++++++ 3 files changed, 198 insertions(+) diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest index 653a9cf0788c..b0e7dcae84f3 100644 --- a/dev-libs/libintl/Manifest +++ b/dev-libs/libintl/Manifest @@ -1,2 +1,4 @@ +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.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703 diff --git a/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch b/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch new file mode 100644 index 000000000000..a7471ac724c9 --- /dev/null +++ b/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch @@ -0,0 +1,100 @@ +From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001 +From: Bruno Haible <[email protected]> +Date: Tue, 11 Oct 2022 01:54:44 +0200 +Subject: [PATCH] Avoid warnings during configure execution with + --disable-java. + +Reported by Sam James <[email protected]> +in <https://savannah.gnu.org/bugs/?63193>. + +* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline. +* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and +gt_JAVACOMP_DISABLED inline. +--- a/gettext-runtime/configure.ac ++++ b/gettext-runtime/configure.ac +@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVA= ++ HAVE_JAVA_ENVVAR= ++ HAVE_GIJ= ++ HAVE_JAVA= ++ HAVE_JRE= ++ HAVE_JVIEW= ++ AC_SUBST([CONF_JAVA]) ++ AC_SUBST([HAVE_JAVA_ENVVAR]) ++ AC_SUBST([HAVE_GIJ]) ++ AC_SUBST([HAVE_JAVA]) ++ AC_SUBST([HAVE_JRE]) ++ AC_SUBST([HAVE_JVIEW]) ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index 5e2d593..cf579ff 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -7070,7 +7070,11 @@ fi + + else $as_nop + +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index f897bc3..3af54cd 100755 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -8718,8 +8718,11 @@ fi + + else $as_nop + +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild new file mode 100644 index 000000000000..851d216d34de --- /dev/null +++ b/dev-libs/libintl/libintl-0.21.1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with sys-devel/gettext. + +EAPI=7 + +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" +SRC_URI+=" 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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 + eapply "${FILESDIR}"/${P}-java-autoconf.patch + + # 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 +}
