From 987d23cee75a7c00631525ec46bc7f4546f47377 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 27 Feb 2023 07:24:58 +0000 Subject: [PATCH] sys-devel/gettext: Sync with Gentoo It's from Gentoo commit 708a5eb5bbffb026c0e6097a20987797122aa07d. --- .../sys-devel/gettext/gettext-0.21.1.ebuild | 21 +++++++++------ .../sys-devel/gettext/metadata.xml | 27 +++++++------------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild index 654d28fe3f..9bbd3f8454 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: Keep version bumps in sync with dev-libs/libintl. @@ -6,7 +6,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc -inherit java-pkg-opt-2 libtool multilib-minimal verify-sig +inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs DESCRIPTION="GNU locale utilities" HOMEPAGE="https://www.gnu.org/software/gettext/" @@ -17,13 +17,13 @@ if [[ ${PV} == *_rc* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi # Only libasprintf is under the LGPL (and libintl is in a sep package), # so put that license behind USE=cxx. LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" SLOT="0" -IUSE="acl cvs +cxx doc emacs git java ncurses nls openmp static-libs" +IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs" # only runtime goes multilib # Note: The version of libxml2 corresponds to the version bundled via gnulib. @@ -40,11 +40,9 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 )" RDEPEND="${DEPEND} - !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 )" BDEPEND=" - !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) verify-sig? ( sec-keys/openpgp-keys-gettext )" PDEPEND="emacs? ( app-emacs/po-mode )" @@ -70,7 +68,12 @@ PATCHES=( QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp java-pkg-opt-2_pkg_setup } @@ -89,7 +92,9 @@ src_prepare() { elibtoolize - use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + if use elibc_musl || use elibc_Darwin; then + eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + fi } multilib_src_configure() { @@ -114,12 +119,12 @@ multilib_src_configure() { --without-included-libxml --disable-csharp + --without-cvs $(use_enable acl) $(use_enable cxx c++) $(use_enable cxx libasprintf) $(use_with git) - $(usex git --without-cvs $(use_with cvs)) $(multilib_native_use_enable java) $(use_enable ncurses curses) $(use_enable nls) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/metadata.xml index 502becbd6b..aad767169a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/metadata.xml @@ -1,21 +1,14 @@ - - base-system@gentoo.org - Gentoo Base System - - - - When running `autopoint`, use cvs to store the internal development files; - this requires cvs at runtime, but will be faster/smaller than raw archives - - - When running `autopoint`, use git to store the internal development files; - this requires git at runtime, but will be faster/smaller than raw archives - - - - cpe:/a:gnu:gettext - + + base-system@gentoo.org + Gentoo Base System + + + When running `autopoint`, use git to store the internal development files; this requires git at runtime, but will be faster/smaller than raw archives + + + cpe:/a:gnu:gettext +