* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc-navi/, profiles/arch/sparc/, profiles/arch/s390/, ...
@ 2025-04-22 9:54 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2025-04-22 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 57a9abf8f3fac5abc16f4d4268633f8f6900e54f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 09:47:18 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 09:49:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a9abf8
sys-apps/openrc-navi: Remove last-rited pkg
Bug: https://bugs.gentoo.org/950367
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
profiles/arch/arm64/package.use.mask | 1 -
profiles/arch/hppa/package.use.mask | 1 -
profiles/arch/loong/package.use.mask | 1 -
profiles/arch/powerpc/package.use.mask | 1 -
profiles/arch/riscv/package.use.mask | 1 -
profiles/arch/s390/package.use.mask | 1 -
profiles/arch/sparc/package.use.mask | 1 -
profiles/package.mask | 6 -
sys-apps/openrc-navi/Manifest | 1 -
sys-apps/openrc-navi/files/openrc.logrotate | 4 -
sys-apps/openrc-navi/files/start-stop-daemon.pam | 2 -
sys-apps/openrc-navi/metadata.xml | 27 ----
sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild | 161 ---------------------
sys-apps/openrc-navi/openrc-navi-9999.ebuild | 161 ---------------------
14 files changed, 369 deletions(-)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 34dd3f84e60d..1535562641dd 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -159,7 +159,6 @@ dev-libs/botan -cpu_flags_arm_neon
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Jon Janzen <jon@jonjanzen.com> (2023-09-11)
# librttopo has not been tested on this arch
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index fd362400da0a..3b95e5e65b3e 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -130,7 +130,6 @@ dev-qt/qtgui vulkan
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Sam James <sam@gentoo.org> (2023-09-24)
# Qt not keyworded here.
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index f6a87459b08e..9503e6ceaeb0 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -155,7 +155,6 @@ dev-db/postgresql llvm
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# WANG Xuerui <xen0n@gentoo.org> (2023-09-29)
# no luajit for now
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2857d3098b37..5c4dd1a83031 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -79,7 +79,6 @@ media-libs/libaom cpu_flags_ppc_vsx
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Georgy Yakovlev <gyakovlev@gentoo.org> (2023-09-21)
# dtrace/systemtap not availabie on ppc platform for jdk
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index b8a99c53c838..8f849d38a0ad 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -72,7 +72,6 @@ sys-kernel/installkernel -grub
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Nowa Ammerlaan <nowa@gentoo.org> (2023-08-30)
# Avoid keywording more Qt stuff
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index b973d3b56cb4..91a57fc8057c 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -114,7 +114,6 @@ app-alternatives/ninja samurai
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Sam James <sam@gentoo.org> (2023-09-24)
# Qt not keyworded here.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 891c1c544ef1..0d70fa841970 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -186,7 +186,6 @@ app-alternatives/ninja samurai
# Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
# sys-apps/s6-linux-init has not been tested on this arch
sys-apps/openrc s6
-sys-apps/openrc-navi s6
# Sam James <sam@gentoo.org> (2023-07-21)
# Requires app-emulation/qemu.
diff --git a/profiles/package.mask b/profiles/package.mask
index 50fee1913302..67d7f2162842 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -328,12 +328,6 @@ dev-lang/gnat-gpl
# Removal on 2025-04-07.
app-portage/pgo
-# Anna (navi) Figueiredo Gomes <navi@vlhl.dev> (2025-03-08)
-# User services is merged and released in openrc-0.60, this fork
-# is now unmaintained and superseded.
-# Removal on 2025-04-08. Bug #950367
-sys-apps/openrc-navi
-
# Sam James <sam@gentoo.org> (2025-03-07)
# May cause emerge to hang (bug #950707). Tests hang on one machine
# and another strange report upstream: https://github.com/pkgconf/pkgconf/issues/383.
diff --git a/sys-apps/openrc-navi/Manifest b/sys-apps/openrc-navi/Manifest
deleted file mode 100644
index babc96f61bff..000000000000
--- a/sys-apps/openrc-navi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openrc-navi-0.60_beta4.tar.gz 255190 BLAKE2B 7a48892c6ba9f17bbf1c329f5af645293fc16d2bc973f74679d527bb36b82bd5ef613ddcb4548ef7501cb57afcadcd76ad402ccff1a46f604b39161a302becbb SHA512 d309fa2cf0251793593384d37674fad2cb4892a987c7c09ae4957145885010d4010d36f3f205783a2112d5b7764049971db4872c4c414e638a8ea552cd09e74d
diff --git a/sys-apps/openrc-navi/files/openrc.logrotate b/sys-apps/openrc-navi/files/openrc.logrotate
deleted file mode 100644
index 5e5e64b9b191..000000000000
--- a/sys-apps/openrc-navi/files/openrc.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/rc.log {
- missingok
- notifempty
-}
diff --git a/sys-apps/openrc-navi/files/start-stop-daemon.pam b/sys-apps/openrc-navi/files/start-stop-daemon.pam
deleted file mode 100644
index 2127f6a70d57..000000000000
--- a/sys-apps/openrc-navi/files/start-stop-daemon.pam
+++ /dev/null
@@ -1,2 +0,0 @@
-account required pam_permit.so
-session include system-services
diff --git a/sys-apps/openrc-navi/metadata.xml b/sys-apps/openrc-navi/metadata.xml
deleted file mode 100644
index 1496e79219d4..000000000000
--- a/sys-apps/openrc-navi/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>navi@vlhl.dev</email>
- <name>Anna (navi) Figueiredo Gomes</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="bash">
- enable the use of bash in service scripts (experimental)
- </flag>
- <flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
- <flag name="newnet">enable the new network stack (experimental)</flag>
- <flag name="s6">install s6-linux-init</flag>
- <flag name="sysv-utils">Install sysvinit compatibility scripts for halt, init, poweroff, reboot and shutdown</flag>
- <flag name="sysvinit">
- control the dependency on sysvinit (experimental)
- </flag>
- </use>
- <upstream>
- <remote-id type="github">navi-desu/openrc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild b/sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild
deleted file mode 100644
index 891c9f0d0dfd..000000000000
--- a/sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson pam
-
-DESCRIPTION="OpenRC fork with user services support"
-HOMEPAGE="https://github.com/navi-desu/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
- EGIT_REPO_URI="https://github.com/navi-desu/openrc.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/navi-desu/openrc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- S="${WORKDIR}/openrc-${PV/_/-}"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash caps debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
-
-COMMON_DEPEND="
- pam? ( sys-libs/pam )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- sys-process/psmisc
- selinux? (
- sys-apps/policycoreutils
- >=sys-libs/libselinux-2.6
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/os-headers"
-RDEPEND="${COMMON_DEPEND}
- !sys-apps/openrc
- 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 )"
-
-src_configure() {
- local emesonargs=(
- $(meson_feature audit)
- "-Dbranding=\"Gentoo Linux\""
- $(meson_feature caps capabilities)
- $(meson_use newnet)
- -Dos=Linux
- $(meson_use pam)
- $(meson_feature selinux)
- -Drootprefix="${EPREFIX}"
- -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
- 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
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- ewarn "To support starting user services automatically, please append"
- ewarn "'-session optional pam_openrc.so' to /etc/pam.d/system-login"
- ewarn
- fi
-}
diff --git a/sys-apps/openrc-navi/openrc-navi-9999.ebuild b/sys-apps/openrc-navi/openrc-navi-9999.ebuild
deleted file mode 100644
index 891c9f0d0dfd..000000000000
--- a/sys-apps/openrc-navi/openrc-navi-9999.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson pam
-
-DESCRIPTION="OpenRC fork with user services support"
-HOMEPAGE="https://github.com/navi-desu/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
- EGIT_REPO_URI="https://github.com/navi-desu/openrc.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/navi-desu/openrc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- S="${WORKDIR}/openrc-${PV/_/-}"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash caps debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
-
-COMMON_DEPEND="
- pam? ( sys-libs/pam )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- sys-process/psmisc
- selinux? (
- sys-apps/policycoreutils
- >=sys-libs/libselinux-2.6
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/os-headers"
-RDEPEND="${COMMON_DEPEND}
- !sys-apps/openrc
- 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 )"
-
-src_configure() {
- local emesonargs=(
- $(meson_feature audit)
- "-Dbranding=\"Gentoo Linux\""
- $(meson_feature caps capabilities)
- $(meson_use newnet)
- -Dos=Linux
- $(meson_use pam)
- $(meson_feature selinux)
- -Drootprefix="${EPREFIX}"
- -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
- 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
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- ewarn "To support starting user services automatically, please append"
- ewarn "'-session optional pam_openrc.so' to /etc/pam.d/system-login"
- ewarn
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-22 9:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-22 9:54 [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc-navi/, profiles/arch/sparc/, profiles/arch/s390/, Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox