summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <perfinion@gentoo.org>2019-12-16 20:13:19 +0800
committerJason Zaman <perfinion@gentoo.org>2019-12-21 22:00:40 +0800
commit42cca0f5527c1438dc01a4a4306071cff413d4c8 (patch)
tree4d6f6b7c0d0ca2a1f8c34125e9bde9fd595c4699 /sys-apps/policycoreutils
parentnet-wireless/unifi: bump to 5.12.46 (diff)
downloadgentoo-42cca0f5527c1438dc01a4a4306071cff413d4c8.tar.gz
gentoo-42cca0f5527c1438dc01a4a4306071cff413d4c8.tar.bz2
gentoo-42cca0f5527c1438dc01a4a4306071cff413d4c8.zip
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@gentoo.org>
Diffstat (limited to 'sys-apps/policycoreutils')
-rw-r--r--sys-apps/policycoreutils/policycoreutils-2.9.ebuild5
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.0.ebuild8
-rw-r--r--sys-apps/policycoreutils/policycoreutils-9999.ebuild8
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 6b80ee68ca73..44b821afcf4d 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 44d6a9a3dbe8..aa511658dd96 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 44d6a9a3dbe8..aa511658dd96 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