summaryrefslogtreecommitdiff
path: root/virtual/libc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /virtual/libc
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'virtual/libc')
-rw-r--r--virtual/libc/Manifest4
-rw-r--r--virtual/libc/libc-0.ebuild16
-rw-r--r--virtual/libc/libc-1-r1.ebuild25
-rw-r--r--virtual/libc/libc-1.ebuild2
4 files changed, 28 insertions, 19 deletions
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index d03c25d72b06..8573fb232e5a 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,3 @@
-EBUILD libc-0.ebuild 617 BLAKE2B c4a64688a47dbb8ac2a27cf8efa1bd651b6c2b46e36b67fc133ceac29bf24967324b477ec53704f45eb7ce505f2ebc5004d48a2654ba192da8b9d5c641c2743d SHA512 57827e8c444ee9402730d990957836a2ddd4a0c6918e0d5b82bb7629907953819dbf8243679480b078144de0256a84594735263598b8ec10fb36b20231b06d81
-EBUILD libc-1.ebuild 844 BLAKE2B c0f62c77d83dd0f531cf67b660714b9faba6afe3793cc7ba50a6d4d702291de39b963ea7384bdaa8acf35942c6fbc49d60bc91a821762bfe96793bb7cec96e53 SHA512 67a492be58201d21de8e49788786b808328133462ab91a6e821664f6efbf2dd254104f5009b6f1d99bd2b84fe765fe3a815e649e4b756c5d4465b8ebf941b644
+EBUILD libc-1-r1.ebuild 852 BLAKE2B a0a563675aa75137193ecee2bb0d090af681406ef2fd0b9b680f28a190212c9b1fb6a5739ec15397394d0b26416fdd11a30957b2af1cb68efcd4f2010d216c4a SHA512 d36997da2eeab62e1ca5a1fed3448c4f2e646fce8aec4fd3f68ec808afddd764d2ecc7cd7a99e446814bba9fb1ac533838fe4aac7c19475a47d12665f09a9909
+EBUILD libc-1.ebuild 842 BLAKE2B d2be3802c035386821ec6b7d580d577b35ac3016804ea531de23f724d51bed8ce3b11dad547520d3bb48d0ec71d4962f8f420f421b20dd79fbff4fa81111e041 SHA512 5d4b0eb6139552e31edbdd36fb4b15f7c8082756d3e43211bad5831b3633ad621914115c9de1b1ecbd9d43d2e19506451b874b393cf06a39d8c67bfd1875eff3
MISC metadata.xml 365 BLAKE2B 5a045bfed52c49ec0cfe074512001e5ab3aea429bb6211812c2c4ac0b91acc4831613141e750827b1f56b8c9c69cf6970317a9ed0ae23ecab0bca8daccd26a24 SHA512 b4b656f72037c54182557618adb9a8f5da16f1a0e0b8fda545a760e5500d9b8b52b78084f16c0cf6c2cbe58d8aa577550e4423cf28d10b6edc7f4027efc1eeb0
diff --git a/virtual/libc/libc-0.ebuild b/virtual/libc/libc-0.ebuild
deleted file mode 100644
index 4bcd976bde05..000000000000
--- a/virtual/libc/libc-0.ebuild
+++ /dev/null
@@ -1,16 +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 s390 sh sparc x86 ~ppc-aix ~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
-RDEPEND="!prefix-guest? (
- elibc_glibc? ( sys-libs/glibc:2.2 )
- elibc_musl? ( sys-libs/musl )
- elibc_uclibc? ( sys-libs/uclibc-ng )
- )"
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
new file mode 100644
index 000000000000..61b2be760b58
--- /dev/null
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+# 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
+ !sys-freebsd/freebsd-lib
+ )"
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
index 80aa2a477335..b3393b5b0495 100644
--- a/virtual/libc/libc-1.ebuild
+++ b/virtual/libc/libc-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the C library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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