commit: b128813dd6945ed3fdf3e2016d724128dfb8cad7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 5 00:43:17 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 17:36:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128813d
sys-fs/cryptsetup: drop udev static libs
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{cryptsetup-2.3.6-r1.ebuild => cryptsetup-2.3.6-r2.ebuild} | 8 ++++----
.../{cryptsetup-2.4.0.ebuild => cryptsetup-2.4.0-r1.ebuild} | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
similarity index 96%
rename from sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
index 3c4bf01a993..205ef838d9b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# and it's missing ripemd160 support so it can't provide full backward
compatibility
IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs
+udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
- static? ( !gcrypt )" #496612
+ static? ( !gcrypt !udev )" #496612
LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
@@ -30,13 +30,13 @@ LIB_DEPEND="
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
- sys-fs/lvm2[static-libs(+)]
- udev? ( virtual/libudev[static-libs(-)] )"
+ sys-fs/lvm2[static-libs(+)]"
# We have to always depend on ${LIB_DEPEND} rather than put behind
# !static? () because we provide a shared library which links against
# these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} )
- ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+ ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+ udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
BDEPEND="
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
similarity index 96%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
index 918f7598446..09141d7320f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# and it's missing ripemd160 support so it can't provide full backward
compatibility
IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static
static-libs +udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
- static? ( !gcrypt )" #496612
+ static? ( !gcrypt !udev )" #496612
LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
@@ -31,13 +31,13 @@ LIB_DEPEND="
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
ssh? ( net-libs/libssh[static-libs(+)] )
- sys-fs/lvm2[static-libs(+)]
- udev? ( virtual/libudev[static-libs(-)] )"
+ sys-fs/lvm2[static-libs(+)]"
# We have to always depend on ${LIB_DEPEND} rather than put behind
# !static? () because we provide a shared library which links against
# these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} )
- ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+ ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+ udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
BDEPEND="