[gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/

["William Hubbs" <williamh@gentoo.org>]

commit:     0bfec5b84e377c84e84b17301b5e1b3a7519c003
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  3 15:55:10 2025 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 15:56:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfec5b8

sys-apps/openrc: drop 0.60-r1

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/openrc/Manifest                        |   1 -
 sys-apps/openrc/files/openrc-0.60-rc-conf.patch |  14 --
 sys-apps/openrc/openrc-0.60-r1.ebuild           | 166 ------------------------
 3 files changed, 181 deletions(-)

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ac23b1ea011f..4ca9dca02854 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,4 +1,3 @@
 DIST openrc-0.55.1.tar.gz 249926 BLAKE2B 058c4105ee8198e854c6fd23a3074f6ca4470ffe1faf66ee948e088b859ca55d163e16390ad4dbdd97ff4c1e9bc829fe791e4d96c5ac31f30022dcf91d5179cf SHA512 a06018ef98870bf42f209cdbcb1c578864653929df3d5954ce27adb28fa11c8a2fe0374fe6e10b03a957f7f513b3d64a94800b40f5ab104695d1ed2bfc91615d
 DIST openrc-0.56.tar.gz 250196 BLAKE2B 929fa18e2248a432095167ad5b07161103cc5c51cf72b945a4267de22304a66538105e4083bf413f1ffb7136194ef676d4f5e98f52dbef2dfdd92dda65960ec2 SHA512 d3533a12b1f54494492a54f20ddf943c669bc7c8e35e16cd5496d9d1819393ddd47af6ed0ae25f9e70b9980ca0f0a3d58ec057caa26f0f02df282ac00929997b
 DIST openrc-0.60.1.tar.gz 254915 BLAKE2B 435f09da5b20515c2fd7e9230a53008259099aabb9d83bade3d01deb628fc5306b9f2c6752c0fc1fa9393a499fc198fd6368378094f48d12a14730d158231481 SHA512 aa0be312ff5b1dc02c09dded0c52e7819947f6169c79b102090794a242db921eebca505b005bfe746d807b473d61479a357db9c80b854fddaef48a93dab2c2bb
-DIST openrc-0.60.tar.gz 254863 BLAKE2B 7606708469d3801eacb5b88f5899b16ccc566ee1cb56cb57ff7f9ef8c25b4289552b5548a7642a7662fb53ff93373447d219e6af9cd12ac0f5141ec5a7f0e8d0 SHA512 fa063d1c0ed4110d6a48c5a9af0fde18e83be8b0796ca9ebc39d268f435df0d8084edc0ef0101389c7aff81bb4f0224454ec35eef056a2c727aece1f78c51da9

diff --git a/sys-apps/openrc/files/openrc-0.60-rc-conf.patch b/sys-apps/openrc/files/openrc-0.60-rc-conf.patch
deleted file mode 100644
index 28ed4a2a3d29..000000000000
--- a/sys-apps/openrc/files/openrc-0.60-rc-conf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# commit https://github.com/OpenRC/openrc/commit/01ba72b0b7f9b4c5ef7271ef05094f88ad0c96a8
-diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
-index b1b9da46..b309396c 100644
---- a/src/librc/librc-misc.c
-+++ b/src/librc/librc-misc.c
-@@ -418,7 +418,7 @@ rc_conf_value(const char *setting)
- 	}
- 
- 	xasprintf(&conf, "%s/%s", sysconfdir, "rc.conf");
--	rc_conf_append(sysconfdir);
-+	rc_conf_append(conf);
- 	free(conf);
- 
- 	/* Support old configs. */

diff --git a/sys-apps/openrc/openrc-0.60-r1.ebuild b/sys-apps/openrc/openrc-0.60-r1.ebuild
deleted file mode 100644
index 133fe4156b9c..000000000000
--- a/sys-apps/openrc/openrc-0.60-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit eapi9-ver meson pam
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
-
-COMMON_DEPEND="
-	sys-libs/libcap
-	sys-process/psmisc
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	sysv-utils? (
-		!sys-apps/systemd[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? (
-		sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		s6? ( sys-apps/s6-linux-init[sysv-utils(-)] )
-	)
-	virtual/tmpfiles
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rc-conf.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-		pamd_mimic system-local-login openrc-user session
-	fi
-
-	# install documentation
-	dodoc *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-
-	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
-	if ver_replacing -lt 0.45 && ! [[ -x $(type rc-update) ]]; then
-		if rc-update show boot | grep -q urandom; then
-			rc-update del urandom boot
-			rc-update add seedrng boot
-		fi
-	fi
-}