From: Michał Górny Date: Sat, 26 Oct 2019 15:32:24 +0000 (+0200) Subject: sys-fs/cryptsetup: Use-default to static-libs(-) on libudev X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=547832e27c782566f91ede6c1131f55d7169b435;p=gentoo.git sys-fs/cryptsetup: Use-default to static-libs(-) on libudev Signed-off-by: Michał Górny --- diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild index 7a00cb362ff9..b37162bcba61 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild @@ -34,12 +34,12 @@ LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] - udev? ( virtual/libudev[static-libs(+)] )" + udev? ( virtual/libudev[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\([+-]\)\]} python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild similarity index 97% rename from sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild index d49df839c473..ae160fa8d7fe 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild @@ -35,12 +35,12 @@ LIB_DEPEND=" ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] - udev? ( virtual/libudev[static-libs(+)] )" + udev? ( virtual/libudev[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\([+-]\)\]}" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" BDEPEND="