From: Andreas K. Hüttel <dilfridge@gentoo.org>
Date: Sat, 2 May 2020 10:57:45 +0000 (+0300)
Subject: virtual/libcrypt: Uncomplexificate
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3eaa162a568d52d49cdeba206cb47b9a7e29dd5;p=gentoo.git

virtual/libcrypt: Uncomplexificate

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 <dilfridge@gentoo.org>
---

diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild
similarity index 83%
rename from virtual/libcrypt/libcrypt-1.ebuild
rename to virtual/libcrypt/libcrypt-1-r1.ebuild
index 549b652f3736..e4ab9cdaf26b 100644
--- a/virtual/libcrypt/libcrypt-1.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r1.ebuild
@@ -12,12 +12,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="+static-libs"
 
 RDEPEND="
-	elibc_glibc? (
-		|| (
-			>=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?]
-			<sys-libs/glibc-2.30-r2
-		)
-	)
+	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 )