diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
| commit | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch) | |
| tree | 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-apps/openrc/openrc-0.41.2.ebuild | |
| parent | bd4aeefe33e63f613512604e47bfca7b2187697d (diff) | |
gentoo resync : 10.11.2019
Diffstat (limited to 'sys-apps/openrc/openrc-0.41.2.ebuild')
| -rw-r--r-- | sys-apps/openrc/openrc-0.41.2.ebuild | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild index 029b236f6ad9..81bb6c4a741f 100644 --- a/sys-apps/openrc/openrc-0.41.2.ebuild +++ b/sys-apps/openrc/openrc-0.41.2.ebuild @@ -19,19 +19,17 @@ fi LICENSE="BSD-2" SLOT="0" IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs - unicode kernel_linux kernel_FreeBSD" + unicode" -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) +COMMON_DEPEND=" ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase sys-libs/pam ) audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) + sys-process/psmisc + !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 @@ -44,11 +42,8 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} bash? ( app-shells/bash ) !prefix? ( - kernel_linux? ( - >=sys-apps/sysvinit-2.86-r6[selinux?] - virtual/tmpfiles - ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) + >=sys-apps/sysvinit-2.86-r6[selinux?] + virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 @@ -84,13 +79,8 @@ src_compile() { SH=$(usex bash /bin/bash /bin/sh)" local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" export BRANDING="Gentoo ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) @@ -124,9 +114,6 @@ src_install() { gen_usr_ldscript libeinfo.so gen_usr_ldscript librc.so - if ! use kernel_linux; then - keepdir /lib/rc/init.d - fi keepdir /lib/rc/tmp # Setup unicode defaults for silly unicode users @@ -179,11 +166,7 @@ pkg_postinst() { fi # Added for 0.35. - if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then - if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib - fi - elif ! use kernel_linux; then + if [[ ! -h "${EROOT}"/lib ]]; then if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib fi |