commit: 42cca0f5527c1438dc01a4a4306071cff413d4c8 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Mon Dec 16 12:13:19 2019 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sat Dec 21 14:00:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cca0f5
sys-apps/policycoreutils: Add support for /usr-merge Also fix absolute symlink QA warning. Closes: https://bugs.gentoo.org/690364 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> sys-apps/policycoreutils/policycoreutils-2.9.ebuild | 5 +++-- sys-apps/policycoreutils/policycoreutils-3.0.ebuild | 8 ++++---- sys-apps/policycoreutils/policycoreutils-9999.ebuild | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild index 6b80ee68ca7..44b821afcf4 100644 --- a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit pam dbus" +IUSE="audit dbus pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -155,7 +155,8 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + bashcomp_alias setsebool getsebool # location for policy definitions diff --git a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild index 44d6a9a3dbe..aa511658dd9 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit pam dbus" +IUSE="audit dbus pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -61,8 +61,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} - app-misc/pax-utils - !<sys-apps/openrc-0.14" + app-misc/pax-utils" PDEPEND="sys-apps/semodule-utils sys-apps/selinux-python" @@ -153,7 +152,8 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + bashcomp_alias setsebool getsebool # location for policy definitions diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 44d6a9a3dbe..aa511658dd9 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit pam dbus" +IUSE="audit dbus pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -61,8 +61,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} - app-misc/pax-utils - !<sys-apps/openrc-0.14" + app-misc/pax-utils" PDEPEND="sys-apps/semodule-utils sys-apps/selinux-python" @@ -153,7 +152,8 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + bashcomp_alias setsebool getsebool # location for policy definitions
