From 00ebd266b5f179a653dad4562cf8e5db119be46d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 18:18:59 +0100 Subject: [PATCH] virtual/libiconv: Sync with gentoo It's from gentoo commit d30bf2dea1e39ce12a82697b57bd39bad5f9e7dc. --- .../virtual/libiconv/libiconv-0-r1.ebuild | 8 ++++---- .../virtual/libiconv/libiconv-0-r2.ebuild | 10 +++++----- .../portage-stable/virtual/libiconv/libiconv-0.ebuild | 8 ++++---- .../portage-stable/virtual/libiconv/metadata.xml | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) 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 index 5ce327a7c7..d9df8e3c80 100644 --- 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 @@ -1,14 +1,14 @@ -# Copyright 1999-2018 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 conversion library" + SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_musl" +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 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 7bc49872a5..d9df8e3c80 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,15 +1,15 @@ -# Copyright 1999-2018 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 conversion library" + SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_musl" +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}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) )" +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.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild index c89c687511..450c203396 100644 --- 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 @@ -1,12 +1,12 @@ -# Copyright 1999-2018 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 conversion library" + SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_musl" +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 diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/libiconv/metadata.xml index 885654671f..a799d64051 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/libiconv/metadata.xml @@ -1,8 +1,8 @@ - + - - alt@gentoo.org - Gentoo Alt - + + prefix@gentoo.org + +