From 9cf91cd598c121e6247fdd6fd6c0ba1893e4fc81 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jul 2024 07:20:09 +0000 Subject: [PATCH] sys-libs/libselinux: Sync with Gentoo It's from Gentoo commit 6c382195283257e995e4edad35bd9fbf64499dae. --- .../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} | 4 ++-- .../portage-stable/sys-libs/libselinux/libselinux-9999.ebuild | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-libs/libselinux/{libselinux-3.7.ebuild => libselinux-3.7-r1.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild index dc0b5af229..dd4272b053 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6-r1.ebuild index 002a1bf64a..9dcde9eb59 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.7-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.7.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.7-r1.ebuild index 000aae0c00..72e3b36bde 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/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 ) @@ -141,7 +141,7 @@ multilib_src_install() { done fi - use static-libs || rm "${D}"/usr/lib*/*.a || die + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } pkg_postinst() { diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild index 000aae0c00..72e3b36bde 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/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 ) @@ -141,7 +141,7 @@ multilib_src_install() { done fi - use static-libs || rm "${D}"/usr/lib*/*.a || die + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } pkg_postinst() {