From a3eaa162a568d52d49cdeba206cb47b9a7e29dd5 Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sat, 2 May 2020 13:57:45 +0300 Subject: virtual/libcrypt: Uncomplexificate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The crypt useflag exists only recently, and there are currently no plans to make it go away again. There's absolutely no point in any || dependency. Bug: https://bugs.gentoo.org/720048 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas K. Hüttel --- virtual/libcrypt/libcrypt-1-r1.ebuild | 19 +++++++++++++++++++ virtual/libcrypt/libcrypt-1.ebuild | 24 ------------------------ 2 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 virtual/libcrypt/libcrypt-1-r1.ebuild delete mode 100644 virtual/libcrypt/libcrypt-1.ebuild diff --git a/virtual/libcrypt/libcrypt-1-r1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild new file mode 100644 index 000000000000..e4ab9cdaf26b --- /dev/null +++ b/virtual/libcrypt/libcrypt-1-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Virtual for libcrypt.so" + +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+static-libs" + +RDEPEND=" + elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] ) + elibc_musl? ( sys-libs/musl ) + elibc_uclibc? ( sys-libs/uclibc-ng ) + elibc_Cygwin? ( sys-libs/cygwin-crypt ) +" diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1.ebuild deleted file mode 100644 index 549b652f3736..000000000000 --- a/virtual/libcrypt/libcrypt-1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for libcrypt.so" - -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+static-libs" - -RDEPEND=" - elibc_glibc? ( - || ( - >=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?] -