From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019

---
 sys-apps/openrc/openrc-9999.ebuild | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'sys-apps/openrc/openrc-9999.ebuild')

diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 9bb3ff7fbb38..3e6f63ea18b9 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -19,19 +19,17 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-	sysv-utils unicode kernel_linux kernel_FreeBSD"
+	sysv-utils 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,12 +42,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	bash? ( app-shells/bash )
 	!prefix? (
-		kernel_linux? (
 		sysv-utils? ( !sys-apps/sysvinit )
 		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+		virtual/tmpfiles
 	)
 	selinux? (
 		>=sec-policy/selinux-base-policy-2.20170204-r4
@@ -86,13 +81,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)
@@ -126,9 +116,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
@@ -181,11 +168,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
-- 
cgit v1.2.3