summaryrefslogtreecommitdiff
path: root/virtual/libc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-29 11:38:31 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-29 11:38:31 +0100
commit90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree83fc5facb6b12be510a37bc3d241cc63e965b13a /virtual/libc
parentfeb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
gentoo resync : 29.06.2020
Diffstat (limited to 'virtual/libc')
-rw-r--r--virtual/libc/Manifest3
-rw-r--r--virtual/libc/libc-1-r1.ebuild2
-rw-r--r--virtual/libc/libc-1.ebuild24
3 files changed, 2 insertions, 27 deletions
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 147639147d0e..1983acd953f7 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,2 @@
-EBUILD libc-1-r1.ebuild 825 BLAKE2B b46fabfcb5419274b1ed5d41cd6c0feda51383122b9d58c9f72761ea65a681f439c44775278d60b1312fa484e3c7ec8b269dfae6bffba91e75ca4d212b0c0085 SHA512 9797d556aa9c832a8afb0a8110026e74ea18629fc57f3e0f3fd0931c4cf3319329540aed02280de74b337dab52c4fe1f59c803e586ae922d4755ad13a1cdfc52
-EBUILD libc-1.ebuild 816 BLAKE2B ab09f702385a02e3f37d2aad82ba134bb1dc6a15e84b53abff949d54801a90a1cd5aca9fd4251c1092866fe35ef58048d6459bf49f789aa1f404c31ba86da74b SHA512 9eee98dba05909c2038b4598b7c3728c7e368d8431b4f8d89a7bdb82cec5eb94869bc254f7cc9f8663b25ffda37ab6fc872e4fb66e946aab7ff28b4de3d13551
+EBUILD libc-1-r1.ebuild 816 BLAKE2B c4be5ea3e376d3e3993a4cffcfb4062602a13731c751dc40e400ffcc86e4eed512141be2e876c9b28c3cf0c50e7ec94504265e8350287b0dd4733b7266ae1311 SHA512 f8b71845663ea9b746320d1f2c25b7eb2d1a387f237544396546a4d1c1f7b11aee5dd201122491c71a723b75d641d9fcfc87c3a883c98fddbe815dee392baa67
MISC metadata.xml 365 BLAKE2B 5a045bfed52c49ec0cfe074512001e5ab3aea429bb6211812c2c4ac0b91acc4831613141e750827b1f56b8c9c69cf6970317a9ed0ae23ecab0bca8daccd26a24 SHA512 b4b656f72037c54182557618adb9a8f5da16f1a0e0b8fda545a760e5500d9b8b52b78084f16c0cf6c2cbe58d8aa577550e4423cf28d10b6edc7f4027efc1eeb0
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 8aca9128d50d..8b62a9abad0e 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for the C library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# explicitly depend on SLOT 2.2 of glibc, because it sets
# a different SLOT for cross-compiling
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
deleted file mode 100644
index adea1bc43100..000000000000
--- a/virtual/libc/libc-1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for the C library"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# explicitly depend on SLOT 2.2 of glibc, because it sets
-# a different SLOT for cross-compiling
-# Cygwin uses newlib, which lacks libcrypt
-RDEPEND="!prefix-guest? (
- elibc_glibc? ( sys-libs/glibc:2.2 )
- elibc_musl? ( sys-libs/musl )
- elibc_uclibc? ( sys-libs/uclibc-ng )
- )
- prefix-guest? (
- elibc_Cygwin? ( sys-libs/cygwin-crypt )
- !sys-libs/glibc
- !sys-libs/musl
- !sys-libs/uclibc-ng
- !sys-libs/uclibc
- )"