gentoo resync : 12.05.2022

4 files changed, 2 insertions, 32 deletions

diff --git a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest
index 66b7376910d0..fd2062632682 100644
--- a/virtual/libiconv/Manifest
+++ b/virtual/libiconv/Manifest
@@ -1,4 +1,2 @@
-EBUILD libiconv-0-r1.ebuild 603 BLAKE2B 35ea891e141c90da13f5c3f3dcae3b8f30b79de3ec54b24e654ddab243ab05b9fdeb6f3aa4cb9e5d4b627e3171d5ffff5af45a82d7fb492037ed5ea5f7948e4b SHA512 feaf5f3a1e785a9f1e5f2f6c154ac90393a321a5b096e89bff5c7149b1c92e3407fc947922b9ed206588d1c145d80d320e34e591a6e1a368f9efd54520b61788
-EBUILD libiconv-0-r2.ebuild 603 BLAKE2B 35ea891e141c90da13f5c3f3dcae3b8f30b79de3ec54b24e654ddab243ab05b9fdeb6f3aa4cb9e5d4b627e3171d5ffff5af45a82d7fb492037ed5ea5f7948e4b SHA512 feaf5f3a1e785a9f1e5f2f6c154ac90393a321a5b096e89bff5c7149b1c92e3407fc947922b9ed206588d1c145d80d320e34e591a6e1a368f9efd54520b61788
-EBUILD libiconv-0.ebuild 549 BLAKE2B 3185ef8858576fddc132e280346e1b9fbfaf96954bc1238003b976ca4393aa845fc20ad59807f09694718a4b48fd0a3a7ff7b686b78fa93c5b9759e17578ab3d SHA512 6b276bb576cac9e8af5e9fb18f1a78eca2e1c31ded4a648f02bf23678f269f6ef1159af9de94f21cf30de1fa905eecec05931a7b73df69adc2c646ad9d051c8d
+EBUILD libiconv-0-r2.ebuild 610 BLAKE2B d7f024c6bd9c810d786a61409b21616e6e1c7db8d7b155c50852c6709802ca1222364217b91ee7c778a51374bf845f0af586ec1fb7cd7858b2ceefdd1f7bafb8 SHA512 d4793086a446c59691b0b81e21e07fee61f6051c73167c5e6c9cd02596a78206050976e5e2410a970832dd9934886845620a47faee8f224d9869c927e30ce724
 MISC metadata.xml 243 BLAKE2B 5c67a1d94ddd6d62dc4773d20fe3fa6428a2079280aea082d024402876accd9e4089facf78825a0cc1d7ae469a6f96823afe59a5170b543b80dced3bfbe2b7d5 SHA512 7b32e4157bc8d89cb4bf4b78a122af5529c9221572252029b51c43a7bd7daa1f509280117011e01843375d759b3316f0d97017ca7c5c4e683ffdacf19dc89888
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
deleted file mode 100644
index d9df8e3c8034..000000000000
--- a/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/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index d9df8e3c8034..ef4260eb94b0 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-0-r2.ebuild
@@ -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 ~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/virtual/libiconv/libiconv-0.ebuild b/virtual/libiconv/libiconv-0.ebuild
deleted file mode 100644
index 450c20339629..000000000000
--- a/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 ) )"