Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/
Date: Tue, 07 Sep 2021 17:37:48
Message-Id: 1631036181.b128813dd6945ed3fdf3e2016d724128dfb8cad7.floppym@gentoo
1 commit: b128813dd6945ed3fdf3e2016d724128dfb8cad7
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 5 00:43:17 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 7 17:36:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128813d
7
8 sys-fs/cryptsetup: drop udev static libs
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 .../{cryptsetup-2.3.6-r1.ebuild => cryptsetup-2.3.6-r2.ebuild} | 8 ++++----
13 .../{cryptsetup-2.4.0.ebuild => cryptsetup-2.4.0-r1.ebuild} | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
17 similarity index 96%
18 rename from sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
19 rename to sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
20 index 3c4bf01a993..205ef838d9b 100644
21 --- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
22 +++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
23 @@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
24 # and it's missing ripemd160 support so it can't provide full backward compatibility
25 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
26 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
27 - static? ( !gcrypt )" #496612
28 + static? ( !gcrypt !udev )" #496612
29
30 LIB_DEPEND="
31 dev-libs/json-c:=[static-libs(+)]
32 @@ -30,13 +30,13 @@ LIB_DEPEND="
33 nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
34 openssl? ( dev-libs/openssl:0=[static-libs(+)] )
35 pwquality? ( dev-libs/libpwquality[static-libs(+)] )
36 - sys-fs/lvm2[static-libs(+)]
37 - udev? ( virtual/libudev[static-libs(-)] )"
38 + sys-fs/lvm2[static-libs(+)]"
39 # We have to always depend on ${LIB_DEPEND} rather than put behind
40 # !static? () because we provide a shared library which links against
41 # these other packages. #414665
42 RDEPEND="static-libs? ( ${LIB_DEPEND} )
43 - ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
44 + ${LIB_DEPEND//\[static-libs\([+-]\)\]}
45 + udev? ( virtual/libudev:= )"
46 DEPEND="${RDEPEND}
47 static? ( ${LIB_DEPEND} )"
48 BDEPEND="
49
50 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
51 similarity index 96%
52 rename from sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
53 rename to sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
54 index 918f7598446..09141d7320f 100644
55 --- a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
56 +++ b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
57 @@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
58 # and it's missing ripemd160 support so it can't provide full backward compatibility
59 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom"
60 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
61 - static? ( !gcrypt )" #496612
62 + static? ( !gcrypt !udev )" #496612
63
64 LIB_DEPEND="
65 dev-libs/json-c:=[static-libs(+)]
66 @@ -31,13 +31,13 @@ LIB_DEPEND="
67 openssl? ( dev-libs/openssl:0=[static-libs(+)] )
68 pwquality? ( dev-libs/libpwquality[static-libs(+)] )
69 ssh? ( net-libs/libssh[static-libs(+)] )
70 - sys-fs/lvm2[static-libs(+)]
71 - udev? ( virtual/libudev[static-libs(-)] )"
72 + sys-fs/lvm2[static-libs(+)]"
73 # We have to always depend on ${LIB_DEPEND} rather than put behind
74 # !static? () because we provide a shared library which links against
75 # these other packages. #414665
76 RDEPEND="static-libs? ( ${LIB_DEPEND} )
77 - ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
78 + ${LIB_DEPEND//\[static-libs\([+-]\)\]}
79 + udev? ( virtual/libudev:= )"
80 DEPEND="${RDEPEND}
81 static? ( ${LIB_DEPEND} )"
82 BDEPEND="