From 61b5c349da78c3c825686aac65d80e0a56561e8c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Aug 2024 13:51:15 +0200 Subject: [PATCH] virtual/libiconv: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../virtual/libiconv/libiconv-0-r1.ebuild | 15 --------------- .../virtual/libiconv/libiconv-0-r2.ebuild | 4 ++-- .../virtual/libiconv/libiconv-0.ebuild | 13 ------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild deleted file mode 100644 index d9df8e3c80..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for the GNU conversion library" - -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/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild index d9df8e3c80..82821d98c4 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.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 EAPI=7 @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for the GNU conversion library" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild deleted file mode 100644 index 450c203396..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for the GNU conversion library" - -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/libiconv ) )"