sys-apps/openrc : revision bump

3 files changed, 23 insertions, 16 deletions

diff --git a/metadata/md5-cache/sys-apps/openrc-0.44.10-r1 b/metadata/md5-cache/sys-apps/openrc-0.44.10-r2
index b42a39fe..a0926895 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.44.10-r1
+++ b/metadata/md5-cache/sys-apps/openrc-0.44.10-r2
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=apparmor? ( sys-apps/apparmor sys-apps/apparmor-utils sec-policy/apparmor-profiles ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) dkms? ( sys-kernel/dkms ) elogind? ( sys-auth/elogind ) entropy? ( sys-apps/haveged ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) amd64? ( splash? ( sys-boot/plymouth-openrc-plugin ) ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DEPEND=apparmor? ( sys-apps/apparmor sys-apps/apparmor-utils sec-policy/apparmor-profiles ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) dkms? ( sys-kernel/dkms ) elogind? ( sys-auth/elogind ) havege? ( sys-apps/haveged ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) settingsd? ( app-admin/openrc-settingsd ) amd64? ( splash? ( sys-boot/plymouth-openrc-plugin ) ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
 DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=7
 HOMEPAGE=https://github.com/openrc/openrc/
 INHERIT=flag-o-matic meson pam toolchain-funcs
-IUSE=+apparmor audit bash debug +dkms elogind +entropy ncurses pam newnet +netifrc selinux +splash sysv-utils unicode
+IUSE=+apparmor audit bash debug +dkms elogind +havege ncurses pam newnet +netifrc selinux +settingsd +splash sysv-utils unicode
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=apparmor? ( sys-apps/apparmor sys-apps/apparmor-utils sec-policy/apparmor-profiles ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) dkms? ( sys-kernel/dkms ) elogind? ( sys-auth/elogind ) entropy? ( sys-apps/haveged ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) amd64? ( splash? ( sys-boot/plymouth-openrc-plugin ) ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+RDEPEND=apparmor? ( sys-apps/apparmor sys-apps/apparmor-utils sec-policy/apparmor-profiles ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) dkms? ( sys-kernel/dkms ) elogind? ( sys-auth/elogind ) havege? ( sys-apps/haveged ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) settingsd? ( app-admin/openrc-settingsd ) amd64? ( splash? ( sys-boot/plymouth-openrc-plugin ) ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 SRC_URI=https://github.com/OpenRC/openrc/archive/0.44.10.tar.gz -> openrc-0.44.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b69c07121985eb4284103d228e03c695
+_md5_=a9906cb1bb91ce85ed45f5bc89db42f1
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 2f835b20..48176434 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -39,7 +39,7 @@ net-wireless/broadcom-sta 6.30.223.271-r3: Broadcom's IEEE 802.11a/b/g/n hybrid
 sys-apps/baselayout 2.7-r11: Filesystem baselayout and init scripts
 sys-apps/firetools 0.9.46-r1: Graphical user interface of app-emulation/firejail
 sys-apps/lsb-release 1.4-r12: LSB version query program
-sys-apps/openrc 0.44.10-r1: OpenRC manages the services, startup and shutdown of a host
+sys-apps/openrc 0.44.10-r2: OpenRC manages the services, startup and shutdown of a host
 sys-auth/elogind 246.10-r10: The systemd project's logind, extracted to a standalone package
 sys-auth/polkit-qt 0.113.0-r11: PolicyKit Qt API wrapper library (meta package)
 sys-auth/polkit-qt5 0.113.0-r10: Qt wrapper around polkit-1 client libraries
diff --git a/sys-apps/openrc/openrc-0.44.10-r1.ebuild b/sys-apps/openrc/openrc-0.44.10-r2.ebuild
index ca9c341e..9411236e 100644
--- a/sys-apps/openrc/openrc-0.44.10-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.44.10-r2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="+apparmor audit bash debug +dkms elogind +entropy ncurses pam newnet +netifrc selinux +splash sysv-utils unicode"
+IUSE="+apparmor audit bash debug +dkms elogind +havege ncurses pam newnet +netifrc selinux +settingsd +splash sysv-utils unicode"
 
 COMMON_DEPEND="
 	apparmor? (
@@ -31,13 +31,14 @@ COMMON_DEPEND="
 	audit? ( sys-process/audit )
 	dkms? ( sys-kernel/dkms )
 	elogind? ( sys-auth/elogind )
-	entropy? ( sys-apps/haveged )
+	havege? ( sys-apps/haveged )
 	sys-process/psmisc
 	!<sys-process/procps-3.3.9-r2
 	selinux? (
 		sys-apps/policycoreutils
 		>=sys-libs/libselinux-2.6
 	)
+	settingsd? ( app-admin/openrc-settingsd )
 	amd64? ( splash? ( sys-boot/plymouth-openrc-plugin ) )
 	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
@@ -149,6 +150,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# add dkms to boot runlevel
 	if [ -e "${ROOT}"/etc/init.d/dkms ] && use dkms; then
 		if [ "$(rc-config list boot | grep dkms)" != "" ]; then
 			einfo > /dev/null 2>&1
@@ -156,7 +158,7 @@ pkg_postinst() {
 			"${ROOT}"/sbin/rc-update add dkms boot > /dev/null 2>&1
 		fi
 	fi
-
+	# move dbus to boot runlevel
 	if [ -e "${ROOT}"/etc/init.d/dbus ] && use elogind; then
 		if [ "$(rc-config list boot | grep dbus)" != "" ]; then
 			einfo > /dev/null 2>&1
@@ -167,7 +169,7 @@ pkg_postinst() {
 			"${ROOT}"/sbin/rc-update add dbus boot > /dev/null 2>&1
 		fi
 	fi
-
+	# add elogind to boot runlevel, disable consolekit && cgmanager
 	if [ -e "${ROOT}"/etc/init.d/elogind ] && use elogind; then
 		if [ "$(rc-config list boot | grep elogind)" != "" ]; then
 			einfo > /dev/null 2>&1
@@ -183,7 +185,7 @@ pkg_postinst() {
 			"${ROOT}"/sbin/rc-update del cgmanager default > /dev/null 2>&1
 		fi
 	fi
-
+	# add apparmor to boot runlevel
 	if [ -e "${ROOT}"/etc/init.d/apparmor ] && use apparmor; then
 		if [ "$(rc-config list boot | grep apparmor)" != "" ]; then
 			einfo > /dev/null 2>&1
@@ -191,20 +193,25 @@ pkg_postinst() {
 			"${ROOT}"/sbin/rc-update add apparmor boot > /dev/null 2>&1
 		fi
 	fi
-
-	if [ -e "${ROOT}"/etc/init.d/haveged ] && use entropy; then
+	# add haveged to default runlevel
+	if [ -e "${ROOT}"/etc/init.d/haveged ] && use havege; then
 		if [ "$(rc-config list default | grep haveged)" != "" ]; then
 			einfo > /dev/null 2>&1
 		else
 			"${ROOT}"/sbin/rc-update add haveged default > /dev/null 2>&1
 		fi
 	fi
-
-	if [ -e "${ROOT}"/etc/init.d/openrc-settingsd ]; then
+	# add openrc-settingsd to default level, disable ntpd
+	# this allows time & date to be set to network time zone in various desktop environments
+	if [ -e "${ROOT}"/etc/init.d/openrc-settingsd ] && use settingsd; then
 		if [ "$(rc-config list default | grep openrc-settingsd)" != "" ]; then
-			"${ROOT}"/sbin/rc-update del openrc-settingsd default > /dev/null 2>&1
-		else
 			einfo > /dev/null 2>&1
+		else
+			"${ROOT}"/sbin/rc-update add openrc-settingsd default > /dev/null 2>&1
+		fi
+
+		if [ "$(rc-config list default | grep ntpd)" != "" ]; then
+			"${ROOT}"/sbin/rc-update del ntpd default > /dev/null 2>&1
 		fi
 	fi
 }