From 14d0dd2d542410a41c1a08c2ee127c8ef01c68ce Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:24:44 +0100 Subject: [PATCH] virtual/libintl: Sync with gentoo It's from gentoo commit 0554ed55a8b2e7431edf0ebd494708d52f43218d. --- .../virtual/libintl/libintl-0-r1.ebuild | 13 ++++++------- .../virtual/libintl/libintl-0-r2.ebuild | 13 ++++++------- .../portage-stable/virtual/libintl/libintl-0.ebuild | 13 ++++++------- .../portage-stable/virtual/libintl/metadata.xml | 10 +++++----- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild index 3f8f181b2d..6d540e41d7 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit multilib-build DESCRIPTION="Virtual for the GNU Internationalization Library" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc" -# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between -# that and gcc. And don't force uClibc to dep on this. +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" + +# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc. RDEPEND="!elibc_glibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild index 8c81d5f612..91d4615442 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit multilib-build DESCRIPTION="Virtual for the GNU Internationalization Library" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc elibc_musl" -# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between -# that and gcc. And don't force uClibc to dep on this. +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" + +# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc. RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild index 35f465a8b0..861f565ad4 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Virtual for the GNU Internationalization Library" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc" -# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between -# that and gcc. And don't force uClibc to dep on this. +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" + +# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc. RDEPEND="!elibc_glibc? ( !elibc_musl? ( sys-devel/gettext ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/libintl/metadata.xml index 885654671f..a799d64051 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/metadata.xml @@ -1,8 +1,8 @@ - + - - alt@gentoo.org - Gentoo Alt - + + prefix@gentoo.org + +