gentoo resync : 10.11.2019

4 files changed, 28 insertions, 79 deletions

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bfee18ec27e2..9aa50db8c5d5 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,7 +2,7 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5787 BLAKE2B ac01992ca07c9ee352e72fa241c61630ee11f6ad4c514153febd9d6d126008ff7c4c18976c8734231e36e8cba3c1115f4af8eb0ccc933a55f97f71c2ad23d393 SHA512 449adec16cf5d0131e2adeb8d0694684700ff707f3080389775d3203317d46ee2bc7c9f5c0e025f4b93872cce0f78c52b930e6fffd093d988619e289cd92dbf7
-EBUILD openrc-0.42.1.ebuild 5902 BLAKE2B 5387455fdf77a16a9f5f17cda3d9d087d97f5da6cc42f4765015dfe314550fe6186e53d1bd396b604edd58e3b78c8e7df79c40f3e7780bfb096238704cee6c74 SHA512 9c9e0d68f5d5aa35b91a1002a7ea4c79576916de761dbbc789b42f5e01304a5de78c518f4ba6a50c3ee0b84f34b654374d92dd5f0aaa241e49acac6436c65535
-EBUILD openrc-9999.ebuild 5902 BLAKE2B 5387455fdf77a16a9f5f17cda3d9d087d97f5da6cc42f4765015dfe314550fe6186e53d1bd396b604edd58e3b78c8e7df79c40f3e7780bfb096238704cee6c74 SHA512 9c9e0d68f5d5aa35b91a1002a7ea4c79576916de761dbbc789b42f5e01304a5de78c518f4ba6a50c3ee0b84f34b654374d92dd5f0aaa241e49acac6436c65535
+EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
+EBUILD openrc-0.42.1.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
+EBUILD openrc-9999.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
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
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 9bb3ff7fbb38..3e6f63ea18b9 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.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
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