From 6c382195283257e995e4edad35bd9fbf64499dae Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 19 Jul 2024 20:07:08 +0100 Subject: [PATCH] sys-libs/libselinux: Fix libsepol dependency by enforcing static-libs Bug: https://bugs.gentoo.org/936306 Signed-off-by: James Le Cuirot --- sys-libs/libselinux/libselinux-3.5-r1.ebuild | 2 +- sys-libs/libselinux/libselinux-3.6-r1.ebuild | 2 +- .../{libselinux-3.7.ebuild => libselinux-3.7-r1.ebuild} | 2 +- sys-libs/libselinux/libselinux-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename sys-libs/libselinux/{libselinux-3.7.ebuild => libselinux-3.7-r1.ebuild} (98%) diff --git a/sys-libs/libselinux/libselinux-3.5-r1.ebuild b/sys-libs/libselinux/libselinux-3.5-r1.ebuild index dc0b5af229be5..dd4272b05308a 100644 --- a/sys-libs/libselinux/libselinux-3.5-r1.ebuild +++ b/sys-libs/libselinux/libselinux-3.5-r1.ebuild @@ -30,7 +30,7 @@ IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targe REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) diff --git a/sys-libs/libselinux/libselinux-3.6-r1.ebuild b/sys-libs/libselinux/libselinux-3.6-r1.ebuild index 002a1bf64a54a..9dcde9eb591d9 100644 --- a/sys-libs/libselinux/libselinux-3.6-r1.ebuild +++ b/sys-libs/libselinux/libselinux-3.6-r1.ebuild @@ -30,7 +30,7 @@ IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targe REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) diff --git a/sys-libs/libselinux/libselinux-3.7.ebuild b/sys-libs/libselinux/libselinux-3.7-r1.ebuild similarity index 98% rename from sys-libs/libselinux/libselinux-3.7.ebuild rename to sys-libs/libselinux/libselinux-3.7-r1.ebuild index 17cfb428401a0..72e3b36bde1a7 100644 --- a/sys-libs/libselinux/libselinux-3.7.ebuild +++ b/sys-libs/libselinux/libselinux-3.7-r1.ebuild @@ -30,7 +30,7 @@ IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targe REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 17cfb428401a0..72e3b36bde1a7 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -30,7 +30,7 @@ IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targe REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 )