Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/libcrypt/
Date: Sat, 02 May 2020 10:59:01
Message-Id: 1588417120.a3eaa162a568d52d49cdeba206cb47b9a7e29dd5.dilfridge@gentoo
1 commit: a3eaa162a568d52d49cdeba206cb47b9a7e29dd5
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 2 10:57:45 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat May 2 10:58:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3eaa162
7
8 virtual/libcrypt: Uncomplexificate
9
10 The crypt useflag exists only recently, and there are currently no plans to make
11 it go away again. There's absolutely no point in any || dependency.
12
13 Bug: https://bugs.gentoo.org/720048
14 Package-Manager: Portage-2.3.89, Repoman-2.3.20
15 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
16
17 virtual/libcrypt/{libcrypt-1.ebuild => libcrypt-1-r1.ebuild} | 7 +------
18 1 file changed, 1 insertion(+), 6 deletions(-)
19
20 diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild
21 similarity index 83%
22 rename from virtual/libcrypt/libcrypt-1.ebuild
23 rename to virtual/libcrypt/libcrypt-1-r1.ebuild
24 index 549b652f373..e4ab9cdaf26 100644
25 --- a/virtual/libcrypt/libcrypt-1.ebuild
26 +++ b/virtual/libcrypt/libcrypt-1-r1.ebuild
27 @@ -12,12 +12,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
28 IUSE="+static-libs"
29
30 RDEPEND="
31 - elibc_glibc? (
32 - || (
33 - >=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?]
34 - <sys-libs/glibc-2.30-r2
35 - )
36 - )
37 + elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] )
38 elibc_musl? ( sys-libs/musl )
39 elibc_uclibc? ( sys-libs/uclibc-ng )
40 elibc_Cygwin? ( sys-libs/cygwin-crypt )