Adding metadata

author: BaldEagleOS Migration <dev@baldeagleos.com> 2026-06-02 04:16:02 -0500
committer: BaldEagleOS Migration <dev@baldeagleos.com> 2026-06-02 04:16:02 -0500
commit: 8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d (patch)
tree: 3571897c3923e21b62afb85bc3e04c0deec99fd4 /sys-apps
parent: 33688726a8da4889a96b2a2b60cf8693bb388f96 (diff)
download: baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.tar.gz
baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.tar.xz
baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.zip
57 files changed, 626 insertions, 3014 deletions
diff --git a/sys-apps/apparmor/apparmor-4.1.7.ebuild b/sys-apps/apparmor/apparmor-4.1.7.ebuild
index c67679beef91..18c2b9eb351e 100644
--- a/sys-apps/apparmor/apparmor-4.1.7.ebuild
+++ b/sys-apps/apparmor/apparmor-4.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2026 BaldEagleOS Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/apparmor/apparmor-5.0.0.ebuild b/sys-apps/apparmor/apparmor-5.0.0.ebuild
index c430ae1ac4b6..56ca9da244cd 100644
--- a/sys-apps/apparmor/apparmor-5.0.0.ebuild
+++ b/sys-apps/apparmor/apparmor-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2026 BaldEagleOS Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index e18c2a3ef28f..cd2fb11e635a 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@baldeagleos.com</email>
+  <email>dev@liguros.net</email>
   <name>Development</name>
  </maintainer>
  <maintainer type="person">
diff --git a/sys-apps/hexyl/hexyl-0.17.0.ebuild b/sys-apps/hexyl/hexyl-0.17.0.ebuild
index 0225cbb7eace..ac667b6697fb 100644
--- a/sys-apps/hexyl/hexyl-0.17.0.ebuild
+++ b/sys-apps/hexyl/hexyl-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2026 Gentoo Authors
+# Copyright 2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -75,12 +75,12 @@ CRATES="
 	yansi@1.0.1
 "
 
-inherit cargo shell-completion
+inherit cargo
 
 DESCRIPTION="A command-line hex viewer"
 HOMEPAGE="https://github.com/sharkdp/hexyl"
 SRC_URI="
-	https://github.com/sharkdp/hexyl/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${CARGO_CRATE_URIS}
 "
 
@@ -89,28 +89,10 @@ LICENSE="|| ( Apache-2.0 MIT )"
 LICENSE+=" Apache-2.0 ISC MIT Unicode-DFS-2016 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-QA_FLAGS_IGNORED="usr/bin/hexyl"
 
-RESTRICT="mirror"
-
-BDEPEND="
-	virtual/pandoc
-"
-
-src_compile() {
-	cargo_src_compile
-	pandoc -s -f markdown -t man -o "doc/${PN}.1" "doc/${PN}.1.md"
-}
+DOCS=( README.md CHANGELOG.md )
 
 src_install() {
 	cargo_src_install
 	einstalldocs
-	doman "doc/${PN}.1"
-
-	"target/release/${PN}" --completion bash > "${PN}"
-	dobashcomp "${PN}"
-	"target/release/${PN}" --completion zsh  > "_${PN}"
-	dozshcomp "_${PN}"
-	"target/release/${PN}" --completion fish > "${PN}.fish"
-	dofishcomp "${PN}.fish"
 }
diff --git a/sys-apps/hexyl/metadata.xml b/sys-apps/hexyl/metadata.xml
index b18cf0a9a253..8a6c08190a71 100644
--- a/sys-apps/hexyl/metadata.xml
+++ b/sys-apps/hexyl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <email>Wuzy01@qq.com</email>
-                <name>Wu, Zhenyu</name>
-        </maintainer>
-        <upstream>
-                <remote-id type="github">sharkdp/hexyl</remote-id>
-        </upstream>
+	<maintainer type="person">
+		<email>thomas@binaryden.de</email>
+		<name>Thomas Kemmer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sharkdp/hexyl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r3.ebuild
index ad764029adf0..76352d38dc83 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r3.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 BaldEagleOS Authors
+# Copyright 2021-2024 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild
index 735df8cf9cac..882dfd5fbe41 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 BaldEagleOS Authors
+# Copyright 2021-2024 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index 7c7c116e0393..43bba9fd188a 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@baldeagleos.com</email>
+  <email>dev@liguros.net</email>
   <name>Development</name>
  </maintainer>
  <maintainer type="project">
diff --git a/sys-apps/kmod/kmod-34.1.ebuild b/sys-apps/kmod/kmod-34.1.ebuild
index db423fc3dadd..937a25c21e75 100644
--- a/sys-apps/kmod/kmod-34.1.ebuild
+++ b/sys-apps/kmod/kmod-34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2025 BaldEagleOS Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/kmod/kmod-34.2.ebuild b/sys-apps/kmod/kmod-34.2.ebuild
index db423fc3dadd..937a25c21e75 100644
--- a/sys-apps/kmod/kmod-34.2.ebuild
+++ b/sys-apps/kmod/kmod-34.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2025 BaldEagleOS Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index bd6d4628bea0..efd7cba75494 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@baldeagleos.com</email>
+  <email>dev@liguros.net</email>
   <name>Development</name>
  </maintainer>
  <maintainer type="project">
diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
index 2dc95d2f5a36..dc7aa71c8f9e 100644
--- a/sys-apps/nix/metadata.xml
+++ b/sys-apps/nix/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@baldeagleos.com</email>
+  <email>dev@liguros.net</email>
   <name>Development</name>
  </maintainer>
  <maintainer type="person">
diff --git a/sys-apps/nix/nix-2.34.6.ebuild b/sys-apps/nix/nix-2.34.6.ebuild
index 890399fcc99d..afed3789c196 100644
--- a/sys-apps/nix/nix-2.34.6.ebuild
+++ b/sys-apps/nix/nix-2.34.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2026 BaldEagleOS Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/nix/nix-2.34.7.ebuild b/sys-apps/nix/nix-2.34.7.ebuild
index 6c35a6705646..d1ec39c8c80c 100644
--- a/sys-apps/nix/nix-2.34.7.ebuild
+++ b/sys-apps/nix/nix-2.34.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2026 BaldEagleOS Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9a7a6ad26001..b57eed2f967f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,2 @@
-DIST openrc-0.56.tar.gz 250196 BLAKE2B 929fa18e2248a432095167ad5b07161103cc5c51cf72b945a4267de22304a66538105e4083bf413f1ffb7136194ef676d4f5e98f52dbef2dfdd92dda65960ec2 SHA512 d3533a12b1f54494492a54f20ddf943c669bc7c8e35e16cd5496d9d1819393ddd47af6ed0ae25f9e70b9980ca0f0a3d58ec057caa26f0f02df282ac00929997b
-DIST openrc-0.62.10.tar.gz 262376 BLAKE2B 7326a59b90f82ae031e478934ca589c8a3aa0d554aa117d95eb4835554146111e0b2ee3e9d9d5f3ada3edb3d22114e9d2c49f5950a3c52002a12381cebbad7e0 SHA512 d67bd55378b3e0577c7843d015bc3f1eea3218141920bb7945bfdbce27c3e495063452a17bc148f783ad8c792a6cffcc7d7c70d756bf9a3cadce8e2e9dd25063
-DIST openrc-0.62.2.tar.gz 262191 BLAKE2B ba93e925416f1b5c2e5aa3cf46cbfa8f524534792958fd97c26f7fe793a0a481846a64f142eaee8ef8086770544fda9ae5917e9f29f67770af2c7c1b41c72e89 SHA512 f5c3f59519a2c2a4db47bb9ef05d52661945944b6538915326bebfc8fe3d6c58059a2192c4c2613ed7832c97b3bba031afa6ed90d224155bf8892828015cbced
-DIST openrc-0.62.3.tar.gz 262256 BLAKE2B 947a465d71e9f5853c031720b82eb419192c04b3682bff877c082bc30341b0f92db1796331cb3b899a1e3204006d3b528c5447a542cc86baf68e45155639b298 SHA512 e9ba0a61f2a031773ee23042a06d5d266cd2ea3bc12c6f86760a4137014a5bcde1762174db99a3484772caa0db40c7f872001231a26f5feaf8460a5d6d56d01c
-DIST openrc-0.62.4.tar.gz 262322 BLAKE2B 1e18e354f5d1e668d65590853589b382acd24fd3b925a400083dee34b9cef03c9bbb83dc3275eedea7d2e3877e588ee280f9c0e0305b83e8cb8c95c2ad92b1a5 SHA512 840607d2c2d79f4d5b0e1162eda0cb77a6acf6e8a61e51a6d828a880a447f8c8f9bdb10dfb650eff40110425a86f1e1e1a1d36621e493ab4df26f259536b4306
-DIST openrc-0.62.5.tar.gz 262369 BLAKE2B f6847fcf7ecd9287a066d15ed686e73475288548bae27833b70422aad1ecd6e323f3405f8e9bc34f95aa175319d53964df4e4fa057de6c2fc9e186ab6e5d44e4 SHA512 66fbe66041b6b070a20d8909e42c12a02af1c557fbe95f2712f47a182a7ae95cfc8ba9ef5dc7ea7a9919e09936e332c0c3cfceb543b03ddd89cd3ffaefaabb46
-DIST openrc-0.62.6.tar.gz 262187 BLAKE2B 6be099ae7a9e22b7c7f6bfdf1576569f657483616879500515063f06da0526d9e79b1b08b0c5c5371b769edb483dfe0122f6b2296ea7d0382fe4bc39ed6bd91b SHA512 1405fcf87fd46c0a527f3e837f7669ae66f3ada29fb741dafb75c919a246144b33559a07a65722b16d7997086dcc040b56e0d81b9551c0889837cc0604c9accc
 DIST openrc-0.63.1.tar.gz 267423 BLAKE2B 43f088dddb804005b7f6badee5fc4aa172d729ded582b5f8d5db9cf197638dea2845791941c98c587cfb7f0041cd0246773716b4af478a429f94f31d09af60ba SHA512 d1746909275bd2552ccc4a1786eb5f80ac79ba911ce08ffc12dd550f2965f3bea09ac7c4b638f17f495f92238b833ca1886782c9c7bbba868e1c905e82639a2e
 DIST openrc-0.63.tar.gz 265741 BLAKE2B 70800a0115966ca20ec2fb245e0039cff33696a5ae0fdc314b032f29fbd54c5b246e01890d752daaefd41d3ba08ce2f91adb02d327d595c3fcb3d71d59357ed5 SHA512 c3e5f5442ac7e04667894e315e451910425930bf6da2f8775197fa63d4bb631ef3fd7a350d85829fcbc62844ddfa107749c92bff2880a27b8ed254540251ab45
diff --git a/sys-apps/openrc/files/openrc-systemd-cgroups.patch b/sys-apps/openrc/files/openrc-systemd-cgroups.patch
new file mode 100644
index 000000000000..5805c4d44017
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-systemd-cgroups.patch
@@ -0,0 +1,24 @@
+diff -Nuar openrc-0.40.2/init.d/cgroups.in openrc-0.40.2-fixed/init.d/cgroups.in
+--- openrc-0.40.2/init.d/cgroups.in	2018-12-07 01:40:06.000000000 +0200
++++ openrc-0.40.2-fixed/init.d/cgroups.in	2019-01-14 20:31:00.733976313 +0200
+@@ -95,12 +95,21 @@
+ 	return 0
+ }
+ 
++# Funtoo change. Mount systemd's cgroups, even when OpenRC used. required for systemd-based lxd containers
++cgroups_systemd() {
++	if ! mountinfo -q /sys/fs/cgroup/systemd; then
++		mkdir -p /sys/fs/cgroup/systemd
++		mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
++	fi
++}
++
+ cgroups_hybrid()
+ {
+ 	cgroup1_base
+ 	cgroup2_base
+ 	cgroup2_controllers
+ 	cgroup1_controllers
++	cgroups_systemd
+ 	return 0
+ }
diff --git a/sys-apps/openrc/files/openrc.logrotate b/sys-apps/openrc/files/openrc.logrotate
index 5e5e64b9b191..a168f2361b38 100644
--- a/sys-apps/openrc/files/openrc.logrotate
+++ b/sys-apps/openrc/files/openrc.logrotate
@@ -1,4 +1,7 @@
 /var/log/rc.log {
+	compress
+	rotate 4
+	weekly
 	missingok
 	notifempty
 }
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index 7a15688d5ece..6a3a81219b97 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>openrc@gentoo.org</email>
-		<name>Gentoo OpenRC Project</name>
-	</maintainer>
-	<use>
-		<flag name="bash">
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:openrc_project:openrc</remote-id>
+ </upstream>
+ <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">openrc/openrc</remote-id>
-	</upstream>
-</pkgmetadata>
+  <flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
+  <flag name="newnet">enable the new network stack (experimental)</flag>
+  <flag name="sysv-utils">Install sysvinit compatibility scripts for halt, init, poweroff, reboot and shutdown</flag>
+ </use>
+ <origin>ports</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sys-apps/openrc/openrc-0.62.10-r1.ebuild b/sys-apps/openrc/openrc-0.62.10-r1.ebuild
deleted file mode 100644
index 02b511050797..000000000000
--- a/sys-apps/openrc/openrc-0.62.10-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
-		$(meson_feature selinux)
-		-Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/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
-}
diff --git a/sys-apps/openrc/openrc-0.62.2-r1.ebuild b/sys-apps/openrc/openrc-0.62.2-r1.ebuild
deleted file mode 100644
index 5bc5c2652ebf..000000000000
--- a/sys-apps/openrc/openrc-0.62.2-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="$(getpam_mod_dir)"
-		$(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
-}
diff --git a/sys-apps/openrc/openrc-0.62.3-r1.ebuild b/sys-apps/openrc/openrc-0.62.3-r1.ebuild
deleted file mode 100644
index 5bc5c2652ebf..000000000000
--- a/sys-apps/openrc/openrc-0.62.3-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="$(getpam_mod_dir)"
-		$(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
-}
diff --git a/sys-apps/openrc/openrc-0.62.4-r1.ebuild b/sys-apps/openrc/openrc-0.62.4-r1.ebuild
deleted file mode 100644
index 5bc5c2652ebf..000000000000
--- a/sys-apps/openrc/openrc-0.62.4-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="$(getpam_mod_dir)"
-		$(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
-}
diff --git a/sys-apps/openrc/openrc-0.62.5-r1.ebuild b/sys-apps/openrc/openrc-0.62.5-r1.ebuild
deleted file mode 100644
index 5bc5c2652ebf..000000000000
--- a/sys-apps/openrc/openrc-0.62.5-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="$(getpam_mod_dir)"
-		$(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
-}
diff --git a/sys-apps/openrc/openrc-0.62.6-r1.ebuild b/sys-apps/openrc/openrc-0.62.6-r1.ebuild
deleted file mode 100644
index 4d89de5edffe..000000000000
--- a/sys-apps/openrc/openrc-0.62.6-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 )"
-
-src_configure() {
-	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		-Dpam_libdir="$(getpam_mod_dir)"
-		$(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
-}
diff --git a/sys-apps/openrc/openrc-0.63-r1.ebuild b/sys-apps/openrc/openrc-0.63-r1.ebuild
deleted file mode 100644
index 7d135106d3e3..000000000000
--- a/sys-apps/openrc/openrc-0.63-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2026 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="
-	kernel_linux? ( 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 )"
-
-src_configure() {
-	local emesonargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		$(meson_use pam)
-		-Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
-		$(meson_feature selinux)
-		-Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
-		$(meson_use sysv-utils sysvinit)
-	)
-
-	# XXX: hurd hack
-	if use kernel_Hurd ; then
-		# Avoid collision with sys-kernel/hurd's own /usr/libexec/rc
-		emesonargs+=(
-			-Dlibexecdir="${EPREFIX}/usr/libexec/openrc"
-		)
-	fi
-
-	# 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
-}
diff --git a/sys-apps/openrc/openrc-0.63-r2.ebuild b/sys-apps/openrc/openrc-0.63-r2.ebuild
deleted file mode 100644
index 5dda4ffdaf69..000000000000
--- a/sys-apps/openrc/openrc-0.63-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit branding 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="
-	kernel_linux? ( 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 )"
-
-src_configure() {
-	local emesonargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		$(meson_feature audit)
-		-Dbranding="\"${BRANDING_OS_PRETTY_NAME}\""
-		$(meson_use newnet)
-		$(meson_use pam)
-		-Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
-		$(meson_feature selinux)
-		-Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
-		$(meson_use sysv-utils sysvinit)
-	)
-
-	# XXX: hurd hack
-	if use kernel_Hurd ; then
-		# Avoid collision with sys-kernel/hurd's own /usr/libexec/rc
-		emesonargs+=(
-			-Dlibexecdir="${EPREFIX}/usr/libexec/openrc"
-		)
-	fi
-
-	# 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
-}
diff --git a/sys-apps/openrc/openrc-0.63.1.ebuild b/sys-apps/openrc/openrc-0.63.1.ebuild
index 31596041babe..ecf13e0131db 100644
--- a/sys-apps/openrc/openrc-0.63.1.ebuild
+++ b/sys-apps/openrc/openrc-0.63.1.ebuild
@@ -1,24 +1,17 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2020-2026 LiGurOs Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit branding eapi9-ver meson pam
+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
+SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
+IUSE="audit bash corenetwork debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
 
 COMMON_DEPEND="
 	kernel_linux? ( sys-libs/libcap )
@@ -32,6 +25,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	virtual/os-headers"
 RDEPEND="${COMMON_DEPEND}
+	corenetwork? ( sys-apps/corenetwork )
 	bash? ( app-shells/bash )
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils(+)]
@@ -50,14 +44,25 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-systemd-cgroups.patch #FL-6105
+)
+
+src_prepare() {
+	default
+	# remove lxc keyword from devfs
+	sed -i -e 's/-\lxc\+ //g' init.d/devfs.in || die "sed failed"
+}
+
 src_configure() {
 	local emesonargs=(
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
 		$(meson_feature audit)
-		-Dbranding="\"${BRANDING_OS_PRETTY_NAME}\""
+		"-Dbranding=\"LiGurOS Linux\""
 		$(meson_use newnet)
 		$(meson_use pam)
+		-Dpkg_prefix="${EPREFIX}"
 		-Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
 		$(meson_feature selinux)
 		-Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
@@ -66,13 +71,11 @@ src_configure() {
 
 	# XXX: hurd hack
 	if use kernel_Hurd ; then
-		# Avoid collision with sys-kernel/hurd's own /usr/libexec/rc
-		emesonargs+=(
-			-Dlibexecdir="${EPREFIX}/usr/libexec/openrc"
-		)
-	fi
-
-	# export DEBUG=$(usev debug)
+ 		# Avoid collision with sys-kernel/hurd's own /usr/libexec/rc
+ 		emesonargs+=(
+ 			-Dlibexecdir="${EPREFIX}/usr/libexec/openrc"
+ 		)
+ 	fi
 	meson_src_configure
 }
 
@@ -97,6 +100,10 @@ src_install() {
 	# Setup unicode defaults for silly unicode users
 	set_config_yes_no /etc/rc.conf unicode use unicode
 
+	# Some tweaks
+	set_config_yes_no /etc/rc.conf rc_send_sigkill true
+	set_config /etc/rc.conf rc_timeout_stopsec 5
+
 	# Cater to the norm
 	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
 
@@ -143,8 +150,15 @@ pkg_postinst() {
 		elog "# rc-update add consolefont boot"
 	fi
 
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRC without network support. This"
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc && ! use corenetwork; 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."
diff --git a/sys-apps/openrc/openrc-0.56-r1.ebuild b/sys-apps/openrc/openrc-0.63.ebuild
index 7531b7f1bf61..fd33e7ed66ed 100644
--- a/sys-apps/openrc/openrc-0.56-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.63.ebuild
@@ -1,24 +1,17 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2020-2025 LiGurOs 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
+SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
+IUSE="audit bash corenetwork debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
 
 COMMON_DEPEND="
 	sys-libs/libcap
@@ -32,9 +25,10 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	virtual/os-headers"
 RDEPEND="${COMMON_DEPEND}
+	corenetwork? ( sys-apps/corenetwork )
 	bash? ( app-shells/bash )
 	sysv-utils? (
-		!sys-apps/systemd[sysv-utils(+)]
+		!sys-apps/systemd[sysv-utils(-)]
 		!sys-apps/sysvinit
 	)
 	!sysv-utils? (
@@ -50,20 +44,27 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-systemd-cgroups.patch #FL-6105
+)
+
+src_prepare() {
+	default
+	# remove lxc keyword from devfs
+	sed -i -e 's/-\lxc\+ //g' init.d/devfs.in || die "sed failed"
+}
+
 src_configure() {
 	local emesonargs=(
-	--bindir=/bin
-	--sbindir=/sbin
 		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
+		"-Dbranding=\"LiGurOS Linux\""
 		$(meson_use newnet)
-		-Dos=Linux
 		$(meson_use pam)
+		-Dpkg_prefix="${EPREFIX}"
 		$(meson_feature selinux)
 		-Dshell=$(usex bash /bin/bash /bin/sh)
 		$(meson_use sysv-utils sysvinit)
 	)
-	# export DEBUG=$(usev debug)
 	meson_src_configure
 }
 
@@ -88,6 +89,10 @@ src_install() {
 	# Setup unicode defaults for silly unicode users
 	set_config_yes_no /etc/rc.conf unicode use unicode
 
+	# Some tweaks
+	set_config_yes_no /etc/rc.conf rc_send_sigkill true
+	set_config /etc/rc.conf rc_timeout_stopsec 5
+
 	# Cater to the norm
 	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
 
@@ -133,7 +138,14 @@ pkg_postinst() {
 		elog "# rc-update add consolefont boot"
 	fi
 
-	if ! use newnet && ! use netifrc; then
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc && ! use corenetwork; 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,"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
deleted file mode 100644
index 5dda4ffdaf69..000000000000
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit branding 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="
-	kernel_linux? ( 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 )"
-
-src_configure() {
-	local emesonargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		$(meson_feature audit)
-		-Dbranding="\"${BRANDING_OS_PRETTY_NAME}\""
-		$(meson_use newnet)
-		$(meson_use pam)
-		-Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
-		$(meson_feature selinux)
-		-Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
-		$(meson_use sysv-utils sysvinit)
-	)
-
-	# XXX: hurd hack
-	if use kernel_Hurd ; then
-		# Avoid collision with sys-kernel/hurd's own /usr/libexec/rc
-		emesonargs+=(
-			-Dlibexecdir="${EPREFIX}/usr/libexec/openrc"
-		)
-	fi
-
-	# 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
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c66feb0bcac5..80239a5261ae 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
-DIST portage-3.0.77.tar.bz2 1222765 BLAKE2B 062b99059582caf323001b14e74d5ad762aeb4ece9750dcd548b4eddacabea60044dbb8006911c458c2550b7f1f86a5e91c5f0f67b37a3c839a1d7bac751376c SHA512 bae4d30d53473402a90c21923c71e81463e0f1afc1300f194d67b1af109eca71bd52ca82a1c17881871b9c30a64d584eb0392daab81b38c622cb2384afd195b7
 DIST portage-3.0.78.tar.bz2 1234503 BLAKE2B fecc7def9d2b3cbeb022a1807f9f3db643b4000b1c9674bf2306f6a7b13ef163f7243c9f62e035ef1c0ee5d49f2fdd25b63ff6ae100c9adf59fd3c9352e80410 SHA512 38243d05ad6d253275f19e7c90bc527fe63f6c26a82e7135c603f853612af42c1038ae3269637049ba7212e9caebfe80004d735c02c84882a35fdbc48d3777de
 DIST portage-3.0.79.tar.bz2 1235108 BLAKE2B 279b874be40f3ba610d8dc439683a388dc926cabe236dc4426a64fcd1267484312e84b15fb44c80ecb0ddce50cace4c9fc3f29886b6911d4199ed611fbecf28d SHA512 63df73d0fb2fd5ff7e6f0cacd8999aca0c99b91fbe2a2be0204a597e8230ecc1e60dcad0f24d9200b5948dec2c7e1e417853805d19beaf748c1f16490e64036c
diff --git a/sys-apps/portage/files/0001-Workaround-import-problem-after-Python-upgrade.patch b/sys-apps/portage/files/0001-Workaround-import-problem-after-Python-upgrade.patch
deleted file mode 100644
index 0e0eef3f894d..000000000000
--- a/sys-apps/portage/files/0001-Workaround-import-problem-after-Python-upgrade.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e7cf51fd6a504b2ab9d887c562c2ca3ace12d033 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 31 May 2026 17:30:41 +0200
-Subject: [PATCH] Workaround import problem after Python upgrade
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To: gentoo-portage-dev@lists.gentoo.org
-
-Make `SyncfsProcess` import non-lazy to ensure that it is imported
-before the old-Python version of Portage is removed, and therefore fix
-a crash when Portage is being rebuilt for a new Python version.
-
-Bug: https://bugs.gentoo.org/970375
-Closes: https://github.com/gentoo/portage/pull/1586
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- lib/portage/dbapi/vartree.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
-index 87d4f3453238..7f392588ef9a 100644
---- a/lib/portage/dbapi/vartree.py
-+++ b/lib/portage/dbapi/vartree.py
-@@ -43,6 +43,10 @@ from portage import _unicode_encode
- from portage.util.futures.executor.fork import ForkExecutor
- from ._VdbMetadataDelta import VdbMetadataDelta
- 
-+# Made global to fix importing on Python version upgrade:
-+# https://bugs.gentoo.org/970375
-+from ._SyncfsProcess import SyncfsProcess
-+
- from _emerge.EbuildBuildDir import EbuildBuildDir
- from _emerge.EbuildPhase import EbuildPhase
- from _emerge.emergelog import emergelog
-@@ -6128,7 +6132,6 @@ class dblink:
-         does nothing if FEATURES=merge-sync is disabled.
-         """
-         import subprocess
--        from portage.dbapi._SyncfsProcess import SyncfsProcess
- 
-         if not self._device_path_map or "merge-sync" not in self.settings.features:
-             return
--- 
-2.54.0
-
diff --git a/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch b/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
deleted file mode 100644
index 5afac81af8f8..000000000000
--- a/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 71dd5e89eaa5868418e13da6605fe3873939c60b Mon Sep 17 00:00:00 2001
-Message-ID: <71dd5e89eaa5868418e13da6605fe3873939c60b.1771041192.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Sat, 14 Feb 2026 03:44:08 +0000
-Subject: [PATCH] estrip: silence noise from objcopy if build ID section
- doesn't exist
-
-This is a tiny fix suitable for backporting into the ebuild until
-the refactoring for estrip lands.
-
-It avoids noise when there's no build ID section to update w/ a salted
-replacement.
-
-Bug: https://bugs.gentoo.org/968220
-Signed-off-by: Sam James <sam@gentoo.org>
----
- bin/estrip | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/estrip b/bin/estrip
-index 6e2a5b623..54c5a6e33 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -171,7 +171,7 @@ save_elf_debug() {
- 
- 					# We need to process the splitdebug file too
- 					# if we're doing it at this late juncture (bug #968220)
--					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" \
-+					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" 2>/dev/null \
- 						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}"
- 					rm -f "${inode_link}_buildid"
- 				elif ! contains_word buildid "${warned_for[debugedit]}"; then
--- 
-2.53.0
-
-From e87494699b30eb9458cb0fb9e05479389904dcb3 Mon Sep 17 00:00:00 2001
-Message-ID: <e87494699b30eb9458cb0fb9e05479389904dcb3.1771352319.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Sun, 15 Feb 2026 14:46:34 +0000
-Subject: [PATCH] estrip: silence (further) noise from objcopy if build ID
- section doesn't exist
-
-Followup to 71dd5e89eaa5868418e13da6605fe3873939c60b.
-
-Bug: https://bugs.gentoo.org/968220
-Signed-off-by: Sam James <sam@gentoo.org>
----
- bin/estrip | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/estrip b/bin/estrip
-index 54c5a6e33..526a1f203 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -172,7 +172,7 @@ save_elf_debug() {
- 					# We need to process the splitdebug file too
- 					# if we're doing it at this late juncture (bug #968220)
- 					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" 2>/dev/null \
--						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}"
-+						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}" 2>/dev/null
- 					rm -f "${inode_link}_buildid"
- 				elif ! contains_word buildid "${warned_for[debugedit]}"; then
- 					warned_for[debugedit]+=" buildid"
--- 
-2.53.0
-
diff --git a/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch b/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
deleted file mode 100644
index 9e6a9fcfcfce..000000000000
--- a/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From e1322d74de41e989f709e0129ac41e5469b9cc4c Mon Sep 17 00:00:00 2001
-Message-ID: <e1322d74de41e989f709e0129ac41e5469b9cc4c.1775418696.git.sam@gentoo.org>
-From: Zac Medico <zmedico@gentoo.org>
-Date: Fri, 20 Feb 2026 19:05:12 -0800
-Subject: [PATCH] Revert "depgraph: earlier slot operator backtracking"
-
-This reverts commit 8ddd35e04bb4c50a85d7cc61edb85d91dd10ce4b.
-
-Bug: https://bugs.gentoo.org/969654
-Bug: https://bugs.gentoo.org/964705
-Bug: https://bugs.gentoo.org/968228
-Signed-off-by: Zac Medico <zmedico@gentoo.org>
----
- lib/_emerge/depgraph.py                       | 152 +++++++++---------
- .../test_binpackage_downgrades_slot_dep.py    |   3 +
- .../tests/resolver/test_missed_update.py      |   3 +
- 3 files changed, 86 insertions(+), 72 deletions(-)
-
-diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
-index 7ac07ad5e..5d9888229 100644
---- a/lib/_emerge/depgraph.py
-+++ b/lib/_emerge/depgraph.py
-@@ -1937,9 +1937,16 @@ class depgraph:
-             # conflicts (or by blind luck).
-             raise self._unknown_internal_error()
- 
-+        # Both _process_slot_conflict and _slot_operator_trigger_reinstalls
-+        # can call _slot_operator_update_probe, which requires that
-+        # self._dynamic_config._blocked_pkgs has been initialized by a
-+        # call to the _validate_blockers method.
-         for conflict in self._dynamic_config._package_tracker.slot_conflicts():
-             self._process_slot_conflict(conflict)
- 
-+        if self._dynamic_config._allow_backtracking:
-+            self._slot_operator_trigger_reinstalls()
-+
-     def _process_slot_conflict(self, conflict):
-         """
-         Process slot conflict data to identify specific atoms which
-@@ -2895,50 +2902,50 @@ class depgraph:
- 
-         return None
- 
--    def _slot_operator_trigger_backtracking(self, dep: Dependency) -> bool:
-+    def _slot_operator_trigger_reinstalls(self):
-         """
--        Trigger backtracking for slot operator issues if needed.
--        Return True if this triggers backtracking, and False otherwise.
-+        Search for packages with slot-operator deps on older slots, and schedule
-+        rebuilds if they can link to a newer slot that's in the graph.
-         """
--        if not self._dynamic_config._allow_backtracking:
--            return False
--
--        atom = dep.atom
--
--        if not (atom.soname or atom.slot_operator_built):
--            new_child_slot = self._slot_change_probe(dep)
--            if new_child_slot is not None:
--                self._slot_change_backtrack(dep, new_child_slot)
--                return True
--
--        if not (dep.parent and isinstance(dep.parent, Package) and dep.parent.built):
--            return False
- 
-         rebuild_if_new_slot = (
-             self._dynamic_config.myparams.get("rebuild_if_new_slot", "y") == "y"
-         )
- 
--        # If the parent is not installed, check if it needs to be
--        # rebuilt against an installed instance, since otherwise
--        # it could trigger downgrade of an installed instance as
--        # in bug #652938.
--        want_update_probe = dep.want_update or not dep.parent.installed
--
--        # Check for slot update first, since we don't want to
--        # trigger reinstall of the child package when a newer
--        # slot will be used instead.
--        if rebuild_if_new_slot and want_update_probe:
--            new_dep = self._slot_operator_update_probe(dep, new_child_slot=True)
--            if new_dep is not None:
--                self._slot_operator_update_backtrack(dep, new_child_slot=new_dep.child)
--                return True
-+        for slot_key, slot_info in self._dynamic_config._slot_operator_deps.items():
-+            for dep in slot_info:
-+                atom = dep.atom
- 
--        if want_update_probe:
--            if self._slot_operator_update_probe(dep):
--                self._slot_operator_update_backtrack(dep)
--                return True
-+                if not (atom.soname or atom.slot_operator_built):
-+                    new_child_slot = self._slot_change_probe(dep)
-+                    if new_child_slot is not None:
-+                        self._slot_change_backtrack(dep, new_child_slot)
-+                    continue
- 
--        return False
-+                if not (
-+                    dep.parent and isinstance(dep.parent, Package) and dep.parent.built
-+                ):
-+                    continue
-+
-+                # If the parent is not installed, check if it needs to be
-+                # rebuilt against an installed instance, since otherwise
-+                # it could trigger downgrade of an installed instance as
-+                # in bug #652938.
-+                want_update_probe = dep.want_update or not dep.parent.installed
-+
-+                # Check for slot update first, since we don't want to
-+                # trigger reinstall of the child package when a newer
-+                # slot will be used instead.
-+                if rebuild_if_new_slot and want_update_probe:
-+                    new_dep = self._slot_operator_update_probe(dep, new_child_slot=True)
-+                    if new_dep is not None:
-+                        self._slot_operator_update_backtrack(
-+                            dep, new_child_slot=new_dep.child
-+                        )
-+
-+                if want_update_probe:
-+                    if self._slot_operator_update_probe(dep):
-+                        self._slot_operator_update_backtrack(dep)
- 
-     def _reinstall_for_flags(
-         self, pkg, forced_flags, orig_use, orig_iuse, cur_use, cur_iuse
-@@ -3429,6 +3436,44 @@ class depgraph:
-                     raise
-                 del e
- 
-+        # NOTE: REQUIRED_USE checks are delayed until after
-+        # package selection, since we want to prompt the user
-+        # for USE adjustment rather than have REQUIRED_USE
-+        # affect package selection and || dep choices.
-+        if (
-+            not pkg.built
-+            and pkg._metadata.get("REQUIRED_USE")
-+            and eapi_has_required_use(pkg.eapi)
-+        ):
-+            required_use_is_sat = check_required_use(
-+                pkg._metadata["REQUIRED_USE"],
-+                self._pkg_use_enabled(pkg),
-+                pkg.iuse.is_valid_flag,
-+                eapi=pkg.eapi,
-+            )
-+            if not required_use_is_sat:
-+                if dep.atom is not None and dep.parent is not None:
-+                    self._add_parent_atom(pkg, (dep.parent, dep.atom))
-+
-+                if arg_atoms:
-+                    for parent_atom in arg_atoms:
-+                        parent, atom = parent_atom
-+                        self._add_parent_atom(pkg, parent_atom)
-+
-+                atom = dep.atom
-+                if atom is None:
-+                    atom = Atom("=" + pkg.cpv)
-+                self._dynamic_config._unsatisfied_deps_for_display.append(
-+                    ((pkg.root, atom), {"myparent": dep.parent, "show_req_use": pkg})
-+                )
-+                self._dynamic_config._required_use_unsatisfied = True
-+                self._dynamic_config._skip_restart = True
-+                # Add pkg to digraph in order to enable autounmask messages
-+                # for this package, which is useful when autounmask USE
-+                # changes have violated REQUIRED_USE.
-+                self._dynamic_config.digraph.add(pkg, dep.parent, priority=priority)
-+                return 0
-+
-         if not pkg.onlydeps:
-             existing_node, existing_node_matches = self._check_slot_conflict(
-                 pkg, dep.atom
-@@ -3587,43 +3632,6 @@ class depgraph:
-             and (dep.atom.soname or dep.atom.slot_operator == "=")
-         ):
-             self._add_slot_operator_dep(dep)
--            if self._slot_operator_trigger_backtracking(dep):
--                # Drop slot operator deps that trigger backtracking, since
--                # they may be irrelevant and therefore we don't want to
--                # enforce the REQUIRED_USE check that comes below (bug 964705).
--                # Since backtracking has been triggered, the _need_restart flag
--                # is set and this depgraph is only useful for collecting
--                # backtracking parameters at this point, so it is acceptable to
--                # drop dependencies as needed. It would not be acceptable to
--                # abort depgraph creation here, since that would not scale well
--                # for large numbers of slot operator rebuilds.
--                return 1
--
--        # NOTE: REQUIRED_USE checks are delayed until after
--        # package selection, since we want to prompt the user
--        # for USE adjustment rather than have REQUIRED_USE
--        # affect package selection and || dep choices.
--        if (
--            not pkg.built
--            and pkg._metadata.get("REQUIRED_USE")
--            and eapi_has_required_use(pkg.eapi)
--        ):
--            required_use_is_sat = check_required_use(
--                pkg._metadata["REQUIRED_USE"],
--                self._pkg_use_enabled(pkg),
--                pkg.iuse.is_valid_flag,
--                eapi=pkg.eapi,
--            )
--            if not required_use_is_sat:
--                atom = dep.atom
--                if atom is None:
--                    atom = Atom("=" + pkg.cpv)
--                self._dynamic_config._unsatisfied_deps_for_display.append(
--                    ((pkg.root, atom), {"myparent": dep.parent, "show_req_use": pkg})
--                )
--                self._dynamic_config._required_use_unsatisfied = True
--                self._dynamic_config._skip_restart = True
--                return 0
- 
-         recurse = deep is True or not self._too_deep(self._depth_increment(depth, n=1))
-         dep_stack = self._dynamic_config._dep_stack
-diff --git a/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py b/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-index b47f73dcb..699cd1c46 100644
---- a/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-+++ b/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-@@ -1,6 +1,8 @@
- # Copyright 2025 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import pytest
-+
- from portage.tests import TestCase
- from portage.tests.resolver.ResolverPlayground import (
-     ResolverPlayground,
-@@ -9,6 +11,7 @@ from portage.tests.resolver.ResolverPlayground import (
- 
- 
- class BinpackageDowngradesSlotDepTestCase(TestCase):
-+    @pytest.mark.xfail()
-     def testBinpackageDowngradesSlotDep(self):
-         python_use = "python_targets_python3_12 +python_targets_python3_13"
-         python_usedep = "python_targets_python3_12(-)?,python_targets_python3_13(-)?"
-diff --git a/lib/portage/tests/resolver/test_missed_update.py b/lib/portage/tests/resolver/test_missed_update.py
-index 6813a9172..2c15a16c8 100644
---- a/lib/portage/tests/resolver/test_missed_update.py
-+++ b/lib/portage/tests/resolver/test_missed_update.py
-@@ -1,6 +1,8 @@
- # Copyright 2026 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import pytest
-+
- from portage.tests import TestCase
- from portage.tests.resolver.ResolverPlayground import (
-     ResolverPlayground,
-@@ -9,6 +11,7 @@ from portage.tests.resolver.ResolverPlayground import (
- 
- 
- class MissedQtUpdateTestCase(TestCase):
-+    @pytest.mark.xfail()
-     def testMissedQtUpdate(self):
-         """
-         Testcase where Portage was unable to upgrade from
--- 
-2.53.0
-
diff --git a/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch b/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
deleted file mode 100644
index 2ee28b9b49ed..000000000000
--- a/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c568ef909922c307dd99acfebc1214e6ea88e075 Mon Sep 17 00:00:00 2001
-Message-ID: <c568ef909922c307dd99acfebc1214e6ea88e075.1775418711.git.sam@gentoo.org>
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 27 Mar 2026 18:34:43 +0000
-Subject: [PATCH] estrip: Don't break the debuglink CRC with the salted build
- ID
-
-Closes: https://bugs.gentoo.org/971641
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-Part-of: https://github.com/gentoo/portage/pull/1568
-Closes: https://github.com/gentoo/portage/pull/1568
----
- NEWS       | 2 ++
- bin/estrip | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 923c99a74..94b2f8b98 100644
---- a/NEWS
-+++ b/NEWS
-@@ -70,6 +70,8 @@ Bug fixes:
- 
- * estrip: Silence noise from objcopy when no build ID section exists (bug #968220).
- 
-+* estrip: Don't break the debuglink CRC with the salted build ID (bug #971641).
-+
- portage-3.0.77 (2026-01-23)
- --------------
- 
-diff --git a/bin/estrip b/bin/estrip
-index 526a1f203..166f68087 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -143,8 +143,7 @@ save_elf_debug() {
- 			if (( has_feature[compressdebug] )); then
- 				objcopy_flags+=( --compress-debug-sections )
- 			fi
--			"${name_of[objcopy]}" "${objcopy_flags[@]}" "${src}" "${dst}" \
--			&& "${name_of[objcopy]}" --add-gnu-debuglink="${dst}" "${src}"
-+			"${name_of[objcopy]}" "${objcopy_flags[@]}" "${src}" "${dst}"
- 		fi
- 
- 		# Only do the following if the debug file was
-@@ -199,6 +198,11 @@ save_elf_debug() {
- 				__try_symlink "${src_buildid_rel}" "${buildid_file}"
- 			fi
- 		fi
-+
-+		if [[ -z ${splitdebug} ]] ; then
-+			# Add debuglink last to avoid the salted build ID breaking the CRC.
-+			"${name_of[objcopy]}" --add-gnu-debuglink="${dst}" "${src}"
-+		fi
- 	fi
- }
- 
--- 
-2.53.0
-
diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
index e8f3932ac214..70c494ebb81b 100644
--- a/sys-apps/portage/files/README.RESCUE
+++ b/sys-apps/portage/files/README.RESCUE
@@ -1,2 +1,2 @@
-Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
+Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
 for a recovery guide for a broken portage installation.
diff --git a/sys-apps/portage/files/portage-2.3.68-change-global-paths.patch b/sys-apps/portage/files/portage-2.3.68-change-global-paths.patch
new file mode 100644
index 000000000000..5f862724b20d
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.3.68-change-global-paths.patch
@@ -0,0 +1,18 @@
+diff -urN portage-2.3.68/cnf/make.globals portage-2.3.68-fixed/cnf/make.globals
+--- portage-2.3.68/cnf/make.globals	2019-07-08 22:38:58.177027829 -0600
++++ portage-2.3.68-fixed/cnf/make.globals	2019-07-08 22:41:33.090556025 -0600
+@@ -27,10 +27,10 @@
+ ACCEPT_RESTRICT="*"
+ 
+ # Miscellaneous paths
+-DISTDIR="/var/cache/distfiles"
+-PKGDIR="/var/cache/binpkgs"
+-RPMDIR="/var/cache/rpm"
+-
++DISTDIR="/var/cache/portage/distfiles"
++PKGDIR="/var/cache/portage/packages"
++RPMDIR="/var/cache/portage/rpm"
++ 
+ # Temporary build directory
+ PORTAGE_TMPDIR="/var/tmp"
+ 
diff --git a/sys-apps/portage/files/portage-3.0.78-remove-gentoo-repos-conf.patch b/sys-apps/portage/files/portage-3.0.78-remove-gentoo-repos-conf.patch
new file mode 100644
index 000000000000..c6bc96acfeb5
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.78-remove-gentoo-repos-conf.patch
@@ -0,0 +1,12 @@
+diff -urN portage-3.0.50.orig/cnf/meson.build portage-3.0.50/cnf/meson.build
+--- portage-3.0.50.orig/cnf/meson.build	2023-08-09 19:05:11.901514207 +0200
++++ portage-3.0.50/cnf/meson.build	2023-08-09 19:05:29.987515509 +0200
+@@ -113,8 +113,7 @@
+     [
+         make_conf_example,
+         make_globals,
+-        repos_conf,
+         binrepos_conf,
+     ],
+     install_dir : portage_datadir / 'config'
+ )
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index a568cd381330..85bbfb0f33f6 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>dev-portage@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
-		<flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
-		<flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
-		<flag name="native-extensions">
-		Compiles native "C" extensions (speedups, instead of using python
-		backup code).  Currently includes libc-locales.
-		This should only be temporarily disabled for some bootstrapping
-		operations.  Cross-compilation is not supported.
-		</flag>
-		<flag name="rsync-verify">
-		Enable full-tree cryptographic verification of Gentoo repository
-		git or rsync checkouts using <pkg>app-portage/gemato</pkg>.
-		</flag>
-		<flag name="xattr">
-		Preserve extended attributes (filesystem-stored metadata)
-		when installing files. Usually only required for hardened systems.
-		</flag>
-	</use>
-	<upstream>
-		<bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
-		<changelog>https://gitweb.gentoo.org/proj/portage.git/plain/NEWS</changelog>
-		<doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
-		<remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
-		<remote-id type="gentoo">proj/portage</remote-id>
-		<remote-id type="github">gentoo/portage</remote-id>
-		<remote-id type="pypi">portage</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
+  <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
+  <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
+  <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
+ </upstream>
+ <use>
+  <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
+  <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
+  <flag name="ipc">Use inter-process communication between portage and
+        running ebuilds.
+    </flag>
+  <flag name="native-extensions">
+        Compiles native "C" extensions (speedups, instead of using python
+        backup code).  Currently includes libc-locales.
+        This should only be temporarily disabled for some bootstrapping
+        operations.  Cross-compilation is not supported.
+    </flag>
+  <flag name="rsync-verify">
+        Enable full-tree cryptographic verification of Gentoo repository
+        rsync checkouts using <pkg>app-portage/gemato</pkg>.
+    </flag>
+  <flag name="xattr">Preserve extended attributes (filesystem-stored metadata)
+        when installing files. Usually only required for hardened systems.
+    </flag>
+ </use>
+ <origin>ports</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sys-apps/portage/portage-3.0.77-r4.ebuild b/sys-apps/portage/portage-3.0.77-r4.ebuild
deleted file mode 100644
index 0526c5d364ff..000000000000
--- a/sys-apps/portage/portage-3.0.77-r4.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.27
-	>=dev-build/meson-1.3.0-r1
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-	doc? (
-		~app-text/docbook-xml-dtd-4.4
-		app-text/xmlto
-	)
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/aerie
-	>=acct-user/portage-0-r4
-	>=app-arch/tar-1.27
-	app-arch/zstd
-	>=app-misc/pax-utils-0.1.17
-	dev-lang/python-exec:2
-	>=sys-apps/baselayout-2.9
-	>=sys-apps/findutils-4.9
-	!build? (
-		>=app-admin/eselect-1.2
-		app-portage/getuto
-		>=app-shells/bash-5.3:0
-		dev-util/debugedit
-		>=sec-keys/openpgp-keys-gentoo-release-20240703
-		>=sys-apps/sed-4.0.5
-		rsync-verify? (
-			app-alternatives/gpg[ssl(-)]
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-		)
-	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/coreutils-6.4
-		>=sys-apps/file-5.44-r3
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
-	"${FILESDIR}"/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
-	"${FILESDIR}"/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	if use prefix-guest; then
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-}
-
-src_configure() {
-	local code_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Dcode-only=${code_only}
-		-Deprefix="${EPREFIX}"
-		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc)
-		$(meson_use apidoc)
-		$(meson_use gentoo-dev)
-		$(meson_use ipc)
-		$(meson_use xattr)
-	)
-
-	if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then
-		emesonargs+=( -Dnative-extensions=true )
-	else
-		emesonargs+=( -Dnative-extensions=false )
-	fi
-
-	if use build; then
-		emesonargs+=( -Drsync-verify=false )
-	else
-		emesonargs+=( $(meson_use rsync-verify) )
-	fi
-
-	meson_src_configure
-	code_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local EPYTEST_XDIST=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
-	python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-		"${ED}/usr/lib/portage/${EPYTHON}"
-	)
-
-	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
-	python_optimize "${pydirs[@]}"
-}
-
-pkg_preinst() {
-	if ! use build && [[ -z ${ROOT} ]]; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-		env -u BINPKG_FORMAT \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.78.ebuild b/sys-apps/portage/portage-3.0.78.ebuild
index b129d6d7cddb..5080618a8680 100644
--- a/sys-apps/portage/portage-3.0.78.ebuild
+++ b/sys-apps/portage/portage-3.0.78.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2020-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-PYTHON_COMPAT=( python3_{12..14} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
@@ -11,17 +10,8 @@ inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,6 +21,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
+	app-admin/ego
 	>=app-arch/tar-1.27
 	>=dev-build/meson-1.3.0-r1
 	>=sys-apps/sed-4.0.5
@@ -54,7 +45,7 @@ BDEPEND="
 RDEPEND="
 	${PYTHON_DEPS}
 	app-admin/aerie
-	>=acct-user/portage-0-r4
+	acct-user/portage
 	>=app-arch/tar-1.27
 	app-arch/zstd
 	>=app-misc/pax-utils-0.1.17
@@ -65,7 +56,6 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		app-portage/getuto
 		>=app-shells/bash-5.3:0
-		dev-util/debugedit
 		>=sec-keys/openpgp-keys-gentoo-release-20240703
 		>=sys-apps/sed-4.0.5
 		rsync-verify? (
@@ -73,11 +63,9 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
@@ -93,6 +81,11 @@ PDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.68-change-global-paths.patch"
+ 	"${FILESDIR}/portage-3.0.78-remove-gentoo-repos-conf.patch"
+)
+
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 
diff --git a/sys-apps/portage/portage-3.0.79-r1.ebuild b/sys-apps/portage/portage-3.0.79-r1.ebuild
deleted file mode 100644
index 466ca9069823..000000000000
--- a/sys-apps/portage/portage-3.0.79-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.27
-	>=dev-build/meson-1.3.0-r1
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-	doc? (
-		~app-text/docbook-xml-dtd-4.4
-		app-text/xmlto
-	)
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/aerie
-	>=acct-user/portage-0-r4
-	>=app-arch/tar-1.27
-	app-arch/zstd
-	>=app-misc/pax-utils-0.1.17
-	dev-lang/python-exec:2
-	>=sys-apps/baselayout-2.9
-	>=sys-apps/findutils-4.9
-	!build? (
-		>=app-admin/eselect-1.2
-		app-portage/getuto
-		>=app-shells/bash-5.3:0
-		dev-util/debugedit
-		>=sec-keys/openpgp-keys-gentoo-release-20240703
-		>=sys-apps/sed-4.0.5
-		rsync-verify? (
-			app-alternatives/gpg[ssl(-)]
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-		)
-	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/coreutils-6.4
-		>=sys-apps/file-5.44-r3
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-Workaround-import-problem-after-Python-upgrade.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	if use prefix-guest; then
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-}
-
-src_configure() {
-	local code_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Dcode-only=${code_only}
-		-Deprefix="${EPREFIX}"
-		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc)
-		$(meson_use apidoc)
-		$(meson_use gentoo-dev)
-		$(meson_use ipc)
-		$(meson_use xattr)
-	)
-
-	if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then
-		emesonargs+=( -Dnative-extensions=true )
-	else
-		emesonargs+=( -Dnative-extensions=false )
-	fi
-
-	if use build; then
-		emesonargs+=( -Drsync-verify=false )
-	else
-		emesonargs+=( $(meson_use rsync-verify) )
-	fi
-
-	meson_src_configure
-	code_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local EPYTEST_XDIST=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
-	python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-		"${ED}/usr/lib/portage/${EPYTHON}"
-	)
-
-	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
-	python_optimize "${pydirs[@]}"
-}
-
-pkg_preinst() {
-	if ! use build && [[ -z ${ROOT} ]]; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-		env -u BINPKG_FORMAT \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-3.0.79.ebuild
index b129d6d7cddb..5080618a8680 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-3.0.79.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2020-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-PYTHON_COMPAT=( python3_{12..14} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
@@ -11,17 +10,8 @@ inherit meson linux-info python-r1 tmpfiles
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,6 +21,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
+	app-admin/ego
 	>=app-arch/tar-1.27
 	>=dev-build/meson-1.3.0-r1
 	>=sys-apps/sed-4.0.5
@@ -54,7 +45,7 @@ BDEPEND="
 RDEPEND="
 	${PYTHON_DEPS}
 	app-admin/aerie
-	>=acct-user/portage-0-r4
+	acct-user/portage
 	>=app-arch/tar-1.27
 	app-arch/zstd
 	>=app-misc/pax-utils-0.1.17
@@ -65,7 +56,6 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		app-portage/getuto
 		>=app-shells/bash-5.3:0
-		dev-util/debugedit
 		>=sec-keys/openpgp-keys-gentoo-release-20240703
 		>=sys-apps/sed-4.0.5
 		rsync-verify? (
@@ -73,11 +63,9 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
@@ -93,6 +81,11 @@ PDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.68-change-global-paths.patch"
+ 	"${FILESDIR}/portage-3.0.78-remove-gentoo-repos-conf.patch"
+)
+
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index e73e0ea2aad6..cf755cd16547 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@baldeagleos.com</email>
+  <email>dev@liguros.net</email>
   <name>Development</name>
  </maintainer>
  <maintainer type="person">
diff --git a/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild
index 7602b69ccd0d..7b91bc7485ea 100644
--- a/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 BaldEagleOS Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/rng-tools/rng-tools-6.17.ebuild b/sys-apps/rng-tools/rng-tools-6.17.ebuild
index aa4fc974221d..2d10ec705e29 100644
--- a/sys-apps/rng-tools/rng-tools-6.17.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 BaldEagleOS Authors
+# Copyright 2021-2024 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index ccd85158f0a6..5cc7181704da 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,4 +1,2 @@
-DIST shadow-4.19.3.tar.xz 2347720 BLAKE2B 8c9f6faa37bba130364086635c91562bfc786740a0276366d9771aaa289dcbba5cd7550437596e43f91348ab29bab77e9894232feffc8498c4cc1bbd48bec3d3 SHA512 f2b41f8186681eb98dae0da87ed1a1f03327c5005c9d4bf9500801352e318de6f5954dc5b8f30ab9aece728b1efb74b4ff8fb2720acc4c2aaef701331a4a5a05
-DIST shadow-4.19.3.tar.xz.asc 833 BLAKE2B 936a9103b65c3564b1d5f00259965921e7aa1615714b04e783441f2fa79e78c386cf9056758cba4f8c36f740490dedb8acd68d88979cc153bb78d2a800d01156 SHA512 295a6bffefd333a9ea84fa59b368f5c48d0ac5224199624b768087098110b0f0c19bef37f5c474c45277980758dcb6728e8bb17eb7ab1a57603cad41f1dd00ab
-DIST shadow-4.19.4.tar.xz 2332684 BLAKE2B 4acebcf93be2b6700b33f466e8ada8799ae479a9db0892c2c3d9279acda539ecbce7d0f0c940fc22ae44f6ae9ee9aa91a3bf6e5f22ce2132a464fb13f3c61987 SHA512 6be382087e85566c5c14023decd6edd3b9f0c768a6b00c8389b31cb73fecaaa1b8b9b105374d582c8054e60e158fa3e34acf616a64dca04613bdf06cb08ab664
-DIST shadow-4.19.4.tar.xz.asc 833 BLAKE2B 4daf863f4187819adb9bb9c7c6c6939451c0a341c9aa4d63161d8090120b58d3a094939be7788c1c362a2b74ec411b1cc7dd2a208cf9cb49e0dbea529f2ddd84 SHA512 accd3755d15f8b37f0140b6c09a06368570ec88bd1bf590c9a01bd7e9497c52af4d71ff93717208aedb24229667d72cf65a5ba4f924e1b1fd65783904601fbdb
+DIST shadow-4.19.3.tar.gz 3873890 BLAKE2B 4e775d02d7b5040615009f791db6fc4fd2eb158edd7477f85f6aeef69138a6e90c0662ef247cf2475fa7cbbfd5e66f80fff07a0c71d51b5ff11d8858f29807d5 SHA512 909f9858ef897984f1b8e3fa726f7c53603d480be439f338422ce54491bf2ed653ee755cad2c25fba967b126707716fffe7fdfb4c927c4874d57237fb9b3e119
+DIST shadow-4.19.4.tar.gz 3874200 BLAKE2B 013e894b00eb2a1505ef0300bfd0a67ec2dc82c46fcbdfd9c8b51745f903ecf67531b7f2570f6fbd44ede6f13fd55dcbef17fc6590ef7d7538ddc9caf24c490f SHA512 9ea6618737be4b19cde29aa0360df6339fb16ca0e20dc0f2538d64d4bfb7ee6ecf6ced044b738c429dc6f9d75a125279e9bfb9e1a31e94b4064edd96e31b1b55
diff --git a/sys-apps/shadow/files/shadow-4.7-disable-subids-useradd.patch b/sys-apps/shadow/files/shadow-4.7-disable-subids-useradd.patch
new file mode 100644
index 000000000000..a3cebedab8b4
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.7-disable-subids-useradd.patch
@@ -0,0 +1,14 @@
+diff -urN shadow-4.7/src/useradd.c shadow-4.7-fixed/src/useradd.c
+--- shadow-4.7/src/useradd.c	2019-05-03 23:38:23.000000000 -0600
++++ shadow-4.7-fixed/src/useradd.c	2019-10-28 18:56:29.966359651 -0600
+@@ -131,6 +131,10 @@
+ static bool is_shadow_grp;
+ static bool sgr_locked = false;
+ #endif
++
++/* shadow is set up weird. This keeps shadow building but disables subid support in useradd. */
++
++#undef ENABLE_SUBIDS
+ #ifdef ENABLE_SUBIDS
+ static bool is_sub_uid = false;
+ static bool is_sub_gid = false;
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index dcb8aecd00b4..0b5fd749493a 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<use>
-		<flag name="su">build the su program</flag>
-	</use>
-	<slots>
-		<subslots>Reflect ABI of libsubids.so</subslots>
-	</slots>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
-		<remote-id type="github">shadow-maint/shadow</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
+ </upstream>
+ <use>
+  <flag name="bcrypt">build the bcrypt password encryption algorithm</flag>
+  <flag name="su">build the su program</flag>
+  <flag name="libbsd">use libbsd support</flag>
+ </use>
+ <origin>ports</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sys-apps/shadow/shadow-4.19.3.ebuild b/sys-apps/shadow/shadow-4.19.3.ebuild
index 0783a8679cb5..bb4e49b52fe9 100644
--- a/sys-apps/shadow/shadow-4.19.3.ebuild
+++ b/sys-apps/shadow/shadow-4.19.3.ebuild
@@ -1,160 +1,125 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-# Upstream sometimes pushes releases as pre-releases before marking them
-# official. Don't keyword the pre-releases!
-# Check https://github.com/shadow-maint/shadow/releases.
-
-inherit libtool pam user-info verify-sig
+inherit autotools libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://github.com/shadow-maint/shadow/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="acl audit nls pam selinux skey split-usr su systemd test xattr"
-RESTRICT="!test? ( test )"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+# su now is provided by util-linux
+IUSE="acl audit bcrypt cracklib libbsd nls pam selinux skey split-usr su systemd xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
 
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
 COMMON_DEPEND="
 	virtual/libcrypt:=
-	acl? ( sys-apps/acl:= )
-	audit? ( >=sys-process/audit-2.6:= )
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
 	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:= )
-	skey? ( sys-auth/skey:= )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
 	selinux? (
-		>=sys-libs/libselinux-1.28:=
-		sys-libs/libsemanage:=
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
 	)
 	systemd? ( sys-apps/systemd:= )
-	xattr? ( sys-apps/attr:= )
-	!<sys-libs/glibc-2.38
+	xattr? ( sys-apps/attr:0= )
+	libbsd? ( dev-libs/libbsd )
+	!libbsd? ( >=sys-libs/glibc-2.38 )
 "
-DEPEND="
-	${COMMON_DEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+	dev-util/itstool
+	dev-libs/libxslt
+	>=app-text/docbook-xml-dtd-4.5-r2
 "
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/shadow
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
 	pam? ( >=sys-auth/pambase-20150213 )
 	su? ( !sys-apps/util-linux[su(-)] )
 "
-BDEPEND="
-	acct-group/shadow
-	app-arch/xz-utils
-	sys-devel/gettext
-	test? ( dev-util/cmocka )
-"
 
-BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-disable-subids-useradd.patch"
+)
 
 src_prepare() {
 	default
-	elibtoolize
-}
 
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			etc/login.defs || die
-	fi
-	local res=$(grep "^${comment}${opt}\>" etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in etc/login.defs}"
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		# Negate new upstream default of disabling for now
-		--enable-lastlog
 		--disable-account-tools-setuid
 		--disable-static
-		$(use_with kernel_linux btrfs)
-		# Use bundled replacements for readpassphrase and freezero
-		--without-libbsd
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
-		--with-bcrypt
-		--with-yescrypt
+		--enable-man
 		$(use_enable nls)
-		# TODO: wire up upstream for elogind too (bug #931119)
 		$(use_enable systemd logind)
 		$(use_with acl)
 		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
 		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
 		$(use_with selinux)
 		$(use_with skey)
+		$(use_with libbsd)
 		$(use_with su)
 		$(use_with xattr attr)
 	)
-
 	econf "${myeconfargs[@]}"
 
-	set_login_opt CREATE_HOME yes
-	if use pam; then
-		# Comment out login.defs options that pam hates
-		local opts=(
-			CHFN_AUTH
-			CONSOLE
-			ENV_HZ
-			ENVIRON_FILE
-			FAILLOG_ENAB
-			FTMP_FILE
-			LASTLOG_ENAB
-			MAIL_CHECK_ENAB
-			MOTD_FILE
-			NOLOGINS_FILE
-			OBSCURE_CHECKS_ENAB
-			PASS_ALWAYS_WARN
-			PASS_CHANGE_TRIES
-			PASS_MIN_LEN
-			PORTTIME_CHECKS_ENAB
-			QUOTAS_ENAB
-			SU_WHEEL_ONLY
-		)
-		local opt sed_args=()
-		for opt in "${opts[@]}"; do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
 		done
-		sed_args+=(
-			-e 'b exit'
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.'
-			-e ': exit'
-		)
-		sed -i "${sed_args[@]}" etc/login.defs || die
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
 	else
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD YESCRYPT
-		set_login_opt CONSOLE
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
 	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" suidperms=4755 install
-
-	fowners :shadow /usr/bin/{chage,expiry}
-	fperms u-s,g+s /usr/bin/{chage,expiry}
+	emake DESTDIR="${D}" suidperms=4711 install
 
 	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
 	emake DESTDIR="${D}" -C man install
@@ -162,17 +127,16 @@ src_install() {
 	find "${ED}" -name '*.la' -type f -delete || die
 
 	insinto /etc
-	doins etc/login.defs
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
 
 	# needed for 'useradd -D'
-	insopts -m0600
 	insinto /etc/default
+	insopts -m0600
 	doins "${FILESDIR}"/default/useradd
 
-	if ! use pam ; then
-		doins etc/login.access etc/limits
-	fi
-
 	if use split-usr ; then
 		# move passwd to / to help recover broke systems #64441
 		# We cannot simply remove this or else net-misc/scponly
@@ -183,10 +147,23 @@ src_install() {
 		dosym ../../bin/passwd /usr/bin/passwd
 	fi
 
-	if use pam; then
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
 		dopamd "${FILESDIR}"/pam.d-include/shadow
 
-		for x in chsh chfn ; do
+		for x in chsh shfn ; do
 			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
 		done
 
@@ -196,6 +173,37 @@ src_install() {
 
 		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
+		# Comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
 		# Remove manpages that pam will install for us
 		# and/or don't apply when using pam
 		find "${ED}"/usr/share/man -type f \
@@ -210,22 +218,24 @@ src_install() {
 	fi
 
 	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f -name getspnam.3 -delete || die
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete || die
 
 	if ! use su ; then
 		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
 	fi
 
-	dodoc README doc/HOWTO doc/README.limits
-
-	if use elibc_musl; then
-		QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
-	fi
+	cd "${S}" || die
+	dodoc ChangeLog NEWS
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README*
+}
 
-	if use kernel_Hurd ; then
-		# sys-kernel/hurd provides this instead
-		rm "${ED}"/bin/login || die
-	fi
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
 }
 
 pkg_postinst() {
@@ -235,25 +245,10 @@ pkg_postinst() {
 		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
 	fi
 
-	local group=shadow
-
-	if [[ -n ${ROOT} ]]; then
-		# Resolve to a group id using ${ROOT}/etc/passwd
-		group=$(egetent group shadow | cut -d: -f3)
-		if [[ -n ${group} ]]; then
-			chgrp "${group}" "${EROOT}"/usr/bin/{chage,expiry} &&
-			chmod g+s "${EROOT}"/usr/bin/{chage,expiry}
-		fi
-	fi
-
 	# Enable shadow groups.
 	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
 		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
 			grpconv -R "${EROOT:-/}"
-			if [[ -n ${group} ]]; then
-				chgrp "${group}" "${EROOT}"/etc/gshadow &&
-				chmod g+r "${EROOT}"/etc/gshadow
-			fi
 		else
 			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
 			ewarn "run 'grpconv' afterwards!"
@@ -264,4 +259,6 @@ pkg_postinst() {
 		touch "${EROOT}"/etc/subgid
 	[[ ! -f "${EROOT}"/etc/subuid ]] &&
 		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
 }
diff --git a/sys-apps/shadow/shadow-4.19.4.ebuild b/sys-apps/shadow/shadow-4.19.4.ebuild
index 05dc4a2390b9..bb4e49b52fe9 100644
--- a/sys-apps/shadow/shadow-4.19.4.ebuild
+++ b/sys-apps/shadow/shadow-4.19.4.ebuild
@@ -1,160 +1,125 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-# Upstream sometimes pushes releases as pre-releases before marking them
-# official. Don't keyword the pre-releases!
-# Check https://github.com/shadow-maint/shadow/releases.
-
-inherit libtool pam user-info verify-sig
+inherit autotools libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://github.com/shadow-maint/shadow/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="acl audit nls pam selinux skey split-usr su systemd test xattr"
-RESTRICT="!test? ( test )"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+# su now is provided by util-linux
+IUSE="acl audit bcrypt cracklib libbsd nls pam selinux skey split-usr su systemd xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
 
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
 COMMON_DEPEND="
 	virtual/libcrypt:=
-	acl? ( sys-apps/acl:= )
-	audit? ( >=sys-process/audit-2.6:= )
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
 	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:= )
-	skey? ( sys-auth/skey:= )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
 	selinux? (
-		>=sys-libs/libselinux-1.28:=
-		sys-libs/libsemanage:=
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
 	)
 	systemd? ( sys-apps/systemd:= )
-	xattr? ( sys-apps/attr:= )
-	!<sys-libs/glibc-2.38
+	xattr? ( sys-apps/attr:0= )
+	libbsd? ( dev-libs/libbsd )
+	!libbsd? ( >=sys-libs/glibc-2.38 )
 "
-DEPEND="
-	${COMMON_DEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+	dev-util/itstool
+	dev-libs/libxslt
+	>=app-text/docbook-xml-dtd-4.5-r2
 "
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/shadow
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
 	pam? ( >=sys-auth/pambase-20150213 )
 	su? ( !sys-apps/util-linux[su(-)] )
 "
-BDEPEND="
-	acct-group/shadow
-	app-arch/xz-utils
-	sys-devel/gettext
-	test? ( dev-util/cmocka )
-"
 
-BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-disable-subids-useradd.patch"
+)
 
 src_prepare() {
 	default
-	elibtoolize
-}
 
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			etc/login.defs || die
-	fi
-	local res=$(grep "^${comment}${opt}\>" etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in etc/login.defs}"
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		# Negate new upstream default of disabling for now
-		--enable-lastlog
 		--disable-account-tools-setuid
 		--disable-static
-		$(use_with kernel_linux btrfs)
-		# Use bundled replacements for readpassphrase and freezero
-		--without-libbsd
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
-		--with-bcrypt
-		--with-yescrypt
+		--enable-man
 		$(use_enable nls)
-		# TODO: wire up upstream for elogind too (bug #931119)
 		$(use_enable systemd logind)
 		$(use_with acl)
 		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
 		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
 		$(use_with selinux)
 		$(use_with skey)
+		$(use_with libbsd)
 		$(use_with su)
 		$(use_with xattr attr)
 	)
-
 	econf "${myeconfargs[@]}"
 
-	set_login_opt CREATE_HOME yes
-	if use pam; then
-		# Comment out login.defs options that pam hates
-		local opts=(
-			CHFN_AUTH
-			CONSOLE
-			ENV_HZ
-			ENVIRON_FILE
-			FAILLOG_ENAB
-			FTMP_FILE
-			LASTLOG_ENAB
-			MAIL_CHECK_ENAB
-			MOTD_FILE
-			NOLOGINS_FILE
-			OBSCURE_CHECKS_ENAB
-			PASS_ALWAYS_WARN
-			PASS_CHANGE_TRIES
-			PASS_MIN_LEN
-			PORTTIME_CHECKS_ENAB
-			QUOTAS_ENAB
-			SU_WHEEL_ONLY
-		)
-		local opt sed_args=()
-		for opt in "${opts[@]}"; do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
 		done
-		sed_args+=(
-			-e 'b exit'
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.'
-			-e ': exit'
-		)
-		sed -i "${sed_args[@]}" etc/login.defs || die
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
 	else
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD YESCRYPT
-		set_login_opt CONSOLE
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
 	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" suidperms=4755 install
-
-	fowners :shadow /usr/bin/{chage,expiry}
-	fperms u-s,g+s /usr/bin/{chage,expiry}
+	emake DESTDIR="${D}" suidperms=4711 install
 
 	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
 	emake DESTDIR="${D}" -C man install
@@ -162,17 +127,16 @@ src_install() {
 	find "${ED}" -name '*.la' -type f -delete || die
 
 	insinto /etc
-	doins etc/login.defs
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
 
 	# needed for 'useradd -D'
-	insopts -m0600
 	insinto /etc/default
+	insopts -m0600
 	doins "${FILESDIR}"/default/useradd
 
-	if ! use pam ; then
-		doins etc/login.access etc/limits
-	fi
-
 	if use split-usr ; then
 		# move passwd to / to help recover broke systems #64441
 		# We cannot simply remove this or else net-misc/scponly
@@ -183,10 +147,23 @@ src_install() {
 		dosym ../../bin/passwd /usr/bin/passwd
 	fi
 
-	if use pam; then
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
 		dopamd "${FILESDIR}"/pam.d-include/shadow
 
-		for x in chsh chfn ; do
+		for x in chsh shfn ; do
 			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
 		done
 
@@ -196,6 +173,37 @@ src_install() {
 
 		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
+		# Comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
 		# Remove manpages that pam will install for us
 		# and/or don't apply when using pam
 		find "${ED}"/usr/share/man -type f \
@@ -210,22 +218,24 @@ src_install() {
 	fi
 
 	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f -name getspnam.3 -delete || die
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete || die
 
 	if ! use su ; then
 		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
 	fi
 
-	dodoc README doc/HOWTO doc/README.limits
-
-	if use elibc_musl; then
-		QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
-	fi
+	cd "${S}" || die
+	dodoc ChangeLog NEWS
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README*
+}
 
-	if use kernel_Hurd ; then
-		# sys-kernel/hurd provides this instead
-		mv "${ED}"/bin/login "${ED}"/bin/login.shadow || die
-	fi
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
 }
 
 pkg_postinst() {
@@ -235,25 +245,10 @@ pkg_postinst() {
 		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
 	fi
 
-	local group=shadow
-
-	if [[ -n ${ROOT} ]]; then
-		# Resolve to a group id using ${ROOT}/etc/passwd
-		group=$(egetent group shadow | cut -d: -f3)
-		if [[ -n ${group} ]]; then
-			chgrp "${group}" "${EROOT}"/usr/bin/{chage,expiry} &&
-			chmod g+s "${EROOT}"/usr/bin/{chage,expiry}
-		fi
-	fi
-
 	# Enable shadow groups.
 	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
 		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
 			grpconv -R "${EROOT:-/}"
-			if [[ -n ${group} ]]; then
-				chgrp "${group}" "${EROOT}"/etc/gshadow &&
-				chmod g+r "${EROOT}"/etc/gshadow
-			fi
 		else
 			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
 			ewarn "run 'grpconv' afterwards!"
@@ -264,4 +259,6 @@ pkg_postinst() {
 		touch "${EROOT}"/etc/subgid
 	[[ ! -f "${EROOT}"/etc/subuid ]] &&
 		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
 }
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index f7b8933691b4..d8e540c988b0 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,4 +1,2 @@
-DIST sysvinit-3.15.tar.xz 241584 BLAKE2B 1afbbf46da17dd1a8eff5750d1fdbb6dc308882691cb9776c762b48911c0ecda16d3eb320b79a5cf45f8ae3ac7d9eb45fc02f4bd48c17b2ed2a9192aab43b6b1 SHA512 43431d25c941260176d80fdc8b9426dcfc83e4b29cc064e9978d2e3cd94cba5800e14ca4ff05e67fe89f025fe3b9dc3df0c68b45c5bd11ec01442e737f26d407
-DIST sysvinit-3.15.tar.xz.sig 833 BLAKE2B f0e990c67e57f2ab5565c0e665feed89cf9dfba31c829ab82d1c2374c564cba08775e16270060c3c64ec5e63c8a4eb01161c6fcccd6860de13e3b60741f44715 SHA512 f7cd8efd306fe34efcda39983143c4078467d2ecffa9ccc6944b42b1a70b285a1fd93efc87ba3d9138a7d87575c9926ff4c8666f6ff9e3f7211277a837d74a70
-DIST sysvinit-3.18.tar.xz 237776 BLAKE2B d921d8511321657cc1e23fa7cdf5b2dacc0fd79573d10d9fff1797577028e266a940a193c91a1226279f11831c0345e344a3ef5523c2b3ed2c87bd14d2c6a407 SHA512 766a04a00fb73f95421d7a7e092c6eb96bd5481c5ce5bbc7bbad713d172dcc65c74ad69ebc622474032f85449bc7034f2780d72cc80d80224fd4357802406302
-DIST sysvinit-3.18.tar.xz.sig 833 BLAKE2B 48592efd7ff7d7ad8e5a629ae72a9fd6aad2cbee2150b6a6ff6cb073a05b4f1398c8d2c625f06719a181df7993706048529d24cbfeabb8f2be8a4b93267b0d8b SHA512 1d4d93ee51d0f5f0fec2d0d0b155544a2fcf3576422f7ff73444add58051bf30ba9c96afbd53560f849933d46cd3d8b3f5cd026d811735753b8254e2e4d92ba4
+DIST sysvinit-3.16.tar.gz 522936 BLAKE2B 36e9e61042419e60416ae5be25842967aaa66676d1fbe1191abb2e9c3d07630556f7ccbf3d189c02b48f3bd65b3bb5d974dfd5ab93cdb8e9d2f6870ae5a747ce SHA512 c9aa22a7aa102b9c07e683f26afad97256f4db8ca350f98ffa18b972169bae646c03d73924e92bb047b8e15ddfa9a7f28c75a5a755a7da6584e219bbadc81287
+DIST sysvinit-3.18.tar.gz 512421 BLAKE2B 8a792386904ae5e1484a99eff3ceaa87ef4d188021b80fbc2699ed0f995b6370e6946abd7cff1ba8a81a6b38a56246877629bcf2052617cbe0d36fb64fc82585 SHA512 3e8fa2a178341b019e956ec4d3e6fda53984675ef65db96ea166481fbe663cff49a47e0318849d57e38a30161f16480ae26c4f8b96e6c7076ade4413c3cba39a
diff --git a/sys-apps/sysvinit/files/bootlogd.initd b/sys-apps/sysvinit/files/bootlogd.initd
index ef238c13922b..a42219271a80 100644
--- a/sys-apps/sysvinit/files/bootlogd.initd
+++ b/sys-apps/sysvinit/files/bootlogd.initd
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="bootlogd - record boot messages (sysvinit)"
 pidfile="/run/bootlogd"
 command="/sbin/bootlogd"
-command_args="-p ${pidfile} ${BOOTLOGD_ARGS}"
+command_args="-p ${pidfile}"
diff --git a/sys-apps/sysvinit/files/inittab-2.98-r1 b/sys-apps/sysvinit/files/inittab-2.98-r2
index 5434b681d9fb..de17b2a6f348 100644
--- a/sys-apps/sysvinit/files/inittab-2.98-r1
+++ b/sys-apps/sysvinit/files/inittab-2.98-r2
@@ -55,13 +55,13 @@ c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now
 
+# Halt system on power failures
+# This is needed for lxc containers - otherwise they won't stop
+pf:12345:powerwait:/sbin/halt
+
 # Used by /etc/init.d/display-manager to control DM startup.
 # Read the comments in /etc/init.d/display-manager for more
 # info. Do NOT remove, as this will start nothing
 # extra at boot if /etc/init.d/display-manager is not added
 # to the "default" runlevel.
 x:a:once:/usr/bin/startDM
-
-# Halt system on power failures
-# This is needed for lxc containers - otherwise they won't stop
-pf:12345:powerwait:/sbin/halt
diff --git a/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch b/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch
deleted file mode 100644
index 0d601432f86c..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-pidof has moved to >=procps-3.3.9
-logsave is already in e2fsprogs
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -22,19 +22,17 @@ MNTPOINT=
- 
- # For some known distributions we do not build all programs, otherwise we do.
- BIN	=
--SBIN	= init halt shutdown runlevel killall5 fstab-decode logsave
--USRBIN	= last mesg readbootlog
-+SBIN	= init halt shutdown runlevel killall5 fstab-decode
-+USRBIN	= readbootlog
- 
--MAN1	= last.1 lastb.1 mesg.1 readbootlog.1
-+MAN1	= readbootlog.1
- MAN5	= initscript.5 inittab.5 initctl.5
--MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
--MAN8	+= shutdown.8 telinit.8 fstab-decode.8 logsave.8
-+MAN8	= halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8
-+MAN8	+= shutdown.8 telinit.8 fstab-decode.8
- 
- ifeq ($(DISTRO),)
--SBIN	+= sulogin bootlogd
--USRBIN	+= utmpdump wall
--MAN1	+= utmpdump.1 wall.1
--MAN8	+= sulogin.8 bootlogd.8
-+SBIN	+= bootlogd
-+MAN8	+= bootlogd.8
- endif
- 
- ifeq ($(DISTRO),Debian)
-@@ -215,10 +213,6 @@ install:	all
- 		ln -sf halt $(ROOT)$(base_sbindir)/reboot
- 		ln -sf halt $(ROOT)$(base_sbindir)/poweroff
- 		ln -sf init $(ROOT)$(base_sbindir)/telinit
--		ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
--		if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
--			ln -sf last $(ROOT)$(bindir)/lastb; \
--		fi
- 		$(INSTALL_DIR) $(ROOT)$(includedir)/
- 		$(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
- 		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 1efdf935f7c9..082e41e2ca4f 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="savannah-nongnu">sysvinit</remote-id>
-		<remote-id type="github">slicer69/sysvinit</remote-id>
-		<remote-id type="codeberg">thejessesmith/sysvinit</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+  <name>William Hubbs</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+ </maintainer>
+ 
+ <origin>ports</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sys-apps/sysvinit/sysvinit-3.15.ebuild b/sys-apps/sysvinit/sysvinit-3.16.ebuild
index a3433ce3e1de..8819cd056d73 100644
--- a/sys-apps/sysvinit/sysvinit-3.15.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.16.ebuild
@@ -1,27 +1,18 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-# Dropped these because blank as of 3.02
-#PLOCALES="de es fi fr hu id pl"
 PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig eapi9-ver
+inherit toolchain-funcs flag-o-matic plocale
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="
-	https://codeberg.org/thejessesmith/sysvinit/releases/download/${PV}/${P}.tar.xz
-	verify-sig? ( https://codeberg.org/thejessesmith/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )
-"
-S="${WORKDIR}/${P/_*}"
+SRC_URI="https://codeberg.org/thejessesmith/sysvinit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
+[[ "${PV}" == *beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux ibm nls static"
 
 COMMON_DEPEND="
@@ -34,8 +25,6 @@ DEPEND="
 	${COMMON_DEPEND}
 	virtual/os-headers
 "
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
 RDEPEND="
 	${COMMON_DEPEND}
 	!<app-i18n/man-pages-l10n-4.18.1-r1
@@ -45,13 +34,13 @@ RDEPEND="
 # po4a is for man page translations
 BDEPEND="
 	nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )
 "
 
+S="${WORKDIR}/${PN}"
+
 PATCHES=(
 	# bug #158615
 	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
-	"${FILESDIR}/${PN}-3.12-delete-moved-programs.patch"
 )
 
 src_prepare() {
@@ -66,9 +55,27 @@ src_prepare() {
 		-e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
 		src/Makefile || die
 
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
 	# Munge inittab for specific architectures
 	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+	cp "${FILESDIR}"/inittab-2.98-r2 inittab || die "cp inittab"
 	local insert=()
 	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
 	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
@@ -123,7 +130,7 @@ src_compile() {
 }
 
 src_install() {
-	emake -C src install ROOT="${ED}"
+	emake -C src install ROOT="${D}"
 	dodoc README doc/*
 
 	insinto /etc
@@ -149,19 +156,13 @@ src_install() {
 	find "${ED}" -xtype l -delete || die
 
 	find "${ED}" -type d -empty -delete || die
-
-	if use kernel_Hurd ; then
-		# Avoid clash with sys-kernel/hurd
-		mv "${ED}"/sbin/halt "${ED}"/sbin/sysvinit-halt || die
-		mv "${ED}"/sbin/reboot "${ED}"/sbin/sysvinit-reboot || die
-	fi
 }
 
 pkg_postinst() {
 	# Reload init to fix unmounting problems of / on next reboot.
 	# This is really needed, as without the new version of init cause init
 	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${EROOT} ]] ; then
+	if [[ -z ${ROOT} ]] ; then
 		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
 			ln -s /dev/initctl /run/initctl \
 				|| ewarn "Failed to set /run/initctl symlink!"
@@ -178,9 +179,12 @@ pkg_postinst() {
 		touch "${EROOT}/var/log/boot"
 	fi
 
-	if ver_replacing -lt 3.07-r2; then
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test ${ver} -ge 3.07-r2 && continue
 		ewarn "Previously, the 'halt' command caused the system to power off"
 		ewarn "even if option -p was not given. This long-standing bug has"
 		ewarn "been fixed, and the command now behaves as documented."
-	fi
+		break
+	done
 }
diff --git a/sys-apps/sysvinit/sysvinit-3.18.ebuild b/sys-apps/sysvinit/sysvinit-3.18.ebuild
index 573d9de19aa7..8819cd056d73 100644
--- a/sys-apps/sysvinit/sysvinit-3.18.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.18.ebuild
@@ -1,27 +1,18 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-# Dropped these because blank as of 3.02
-#PLOCALES="de es fi fr hu id pl"
 PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig eapi9-ver
+inherit toolchain-funcs flag-o-matic plocale
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="
-	https://codeberg.org/thejessesmith/sysvinit/releases/download/${PV}/${P}.tar.xz
-	verify-sig? ( https://codeberg.org/thejessesmith/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )
-"
-S="${WORKDIR}/${P/_*}"
+SRC_URI="https://codeberg.org/thejessesmith/sysvinit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
+[[ "${PV}" == *beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux ibm nls static"
 
 COMMON_DEPEND="
@@ -34,8 +25,6 @@ DEPEND="
 	${COMMON_DEPEND}
 	virtual/os-headers
 "
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
 RDEPEND="
 	${COMMON_DEPEND}
 	!<app-i18n/man-pages-l10n-4.18.1-r1
@@ -45,13 +34,13 @@ RDEPEND="
 # po4a is for man page translations
 BDEPEND="
 	nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )
 "
 
+S="${WORKDIR}/${PN}"
+
 PATCHES=(
 	# bug #158615
 	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
-	"${FILESDIR}/${PN}-3.12-delete-moved-programs.patch"
 )
 
 src_prepare() {
@@ -66,9 +55,27 @@ src_prepare() {
 		-e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
 		src/Makefile || die
 
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
 	# Munge inittab for specific architectures
 	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+	cp "${FILESDIR}"/inittab-2.98-r2 inittab || die "cp inittab"
 	local insert=()
 	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
 	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
@@ -123,7 +130,7 @@ src_compile() {
 }
 
 src_install() {
-	emake -C src install ROOT="${ED}"
+	emake -C src install ROOT="${D}"
 	dodoc README doc/*
 
 	insinto /etc
@@ -149,19 +156,13 @@ src_install() {
 	find "${ED}" -xtype l -delete || die
 
 	find "${ED}" -type d -empty -delete || die
-
-	if use kernel_Hurd ; then
-		# Avoid clash with sys-kernel/hurd
-		mv "${ED}"/sbin/halt "${ED}"/sbin/sysvinit-halt || die
-		mv "${ED}"/sbin/reboot "${ED}"/sbin/sysvinit-reboot || die
-	fi
 }
 
 pkg_postinst() {
 	# Reload init to fix unmounting problems of / on next reboot.
 	# This is really needed, as without the new version of init cause init
 	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${EROOT} ]] ; then
+	if [[ -z ${ROOT} ]] ; then
 		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
 			ln -s /dev/initctl /run/initctl \
 				|| ewarn "Failed to set /run/initctl symlink!"
@@ -178,9 +179,12 @@ pkg_postinst() {
 		touch "${EROOT}/var/log/boot"
 	fi
 
-	if ver_replacing -lt 3.07-r2; then
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test ${ver} -ge 3.07-r2 && continue
 		ewarn "Previously, the 'halt' command caused the system to power off"
 		ewarn "even if option -p was not given. This long-standing bug has"
 		ewarn "been fixed, and the command now behaves as documented."
-	fi
+		break
+	done
 }
author	BaldEagleOS Migration <dev@baldeagleos.com>	2026-06-02 04:16:02 -0500
committer	BaldEagleOS Migration <dev@baldeagleos.com>	2026-06-02 04:16:02 -0500
commit	8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d (patch)
tree	3571897c3923e21b62afb85bc3e04c0deec99fd4 /sys-apps
parent	33688726a8da4889a96b2a2b60cf8693bb388f96 (diff)
download	baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.tar.gz baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.tar.xz baldeagleos-repo-8e4635a2e09776ebdc002fe8d05f56e47ee3ac6d.zip