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>

diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
index 6b80ee68ca73d53803a0881bf0172613a0647e02..44b821afcf4dad6742f5c2b1ccef68f0c6466248 100644 (file)
--- 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 44d6a9a3dbe8fc1e57f420981fae129ee3d4d521..aa511658dd96691155516dddf71f16d20c011e57 100644 (file)
--- 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 44d6a9a3dbe8fc1e57f420981fae129ee3d4d521..aa511658dd96691155516dddf71f16d20c011e57 100644 (file)
--- 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