commit: 8d1afa41f9a96061d46e32e9035d7e839086d962 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Tue Jun 7 23:39:41 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Jun 7 23:40:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1afa41
sys-apps/openrc: sync live Signed-off-by: William Hubbs <williamh <AT> gentoo.org> sys-apps/openrc/openrc-9999.ebuild | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 4c8638a6543e..0be02cfdbdbb 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic meson pam toolchain-funcs +inherit meson pam DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" HOMEPAGE="https://github.com/openrc/openrc/"; @@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then inherit git-r3 else SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="BSD-2" @@ -25,13 +25,10 @@ COMMON_DEPEND=" pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc - !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" + )" DEPEND="${COMMON_DEPEND} virtual/os-headers ncurses? ( virtual/pkgconfig )" @@ -49,8 +46,6 @@ RDEPEND="${COMMON_DEPEND} >=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 " PDEPEND="netifrc? ( net-misc/netifrc )" @@ -112,7 +107,7 @@ src_install() { fi # install documentation - dodoc ChangeLog *.md + dodoc *.md } pkg_preinst() { @@ -155,4 +150,21 @@ pkg_postinst() { ewarn "without networking." ewarn fi + + # added for 0.45 to handle seedrng/urandom switching (2022-06-07) + for v in ${REPLACING_VERSIONS}; do + [[ -x $(type rc-update) ]] || continue + if ver_test $v -lt 0.45; then + if rc-update show boot | grep -q urandom; then + rc-update del urandom boot + rc-update add seedrng boot + fi + fi + if ver_test $v -gt 0.45; then + if rc-update show boot | grep -q seedrng; then + rc-update del seedrng boot + rc-update add urandom boot + fi + fi + done }
