4 files changed, 19 insertions, 39 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 41249fa486ed..51dc9b14a62d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 7f61f526c750..21d4db3bc145 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -5,6 +5,5 @@ AUX ctrlaltdel 189 BLAKE2B 07b6936a7ae54a69227f794068cf41dfc2e54ba6ba032a7c1a58c
 AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b671e93dbf3e9cf233e92dd2c0a47fe4e0bec0fd13d994893f95914f19cb5f9dfa78b915857bc4 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2
-EBUILD runit-2.1.2-r3.ebuild 3910 BLAKE2B db6d053c30b8867180ec8c483f32df2b7a936e2fd8489ad5e0692b8e27cbb2500e9bc7a1cf9854c781a5d1721209b69868fa90e41a1940745805e84115b2fd33 SHA512 b278c3e33f02d04948bbcf0c2e7bdf4bb2da6846f3f38fe24636ea794a4cbc6e3b4268196f4aa3d78aeb91f99cb2d87dcf1af67f80daacabf09285a706d530f1
-MISC metadata.xml 331 BLAKE2B bdd00a86fff3c8a1d5d1bbe0c02c3b8ff3744cbaa2418005f2874a8996993a9adb114827bbd2f508f7df43ce8746c4528366d12e02c429cd5515c3b27de07972 SHA512 31b1e624cd18692713a25780237cb492a9541b61f18fae9522c39c5e0e6f292acf4534ce63135c20ea4f8bf9f29e15533ff5692e012732c1ab9d839277677b94
+EBUILD runit-2.1.2-r4.ebuild 3567 BLAKE2B 5fcc63ee09bd6ca41a66e5bae28754e31c957d64ddb2b79c6bce6f29af472b8d653320032007f2e9d64fca60ef2f20169ee45b95edd8a7784f67b691a945f468 SHA512 93de0993bca8c8d0da6672bfe39f51e26ae8a3c618d239a0aefaed58541e107840e827e7f421fd6d421bfee5af114fe743da1d75e1e06dce2d4aa5573b952a1f
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 70953e9fd813..115e9d64a669 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-process/runit/runit-2.1.2-r3.ebuild b/sys-process/runit/runit-2.1.2-r4.ebuild
index 4da7236850c6..2254657370c9 100644
--- a/sys-process/runit/runit-2.1.2-r3.ebuild
+++ b/sys-process/runit/runit-2.1.2-r4.ebuild
@@ -6,16 +6,8 @@ EAPI=8
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-UBUNTU_PR="59ubuntu1"
-UBUNTU_A="${PN}_${PV}-${UBUNTU_PR}.debian.tar.xz"
-SRC_URI="
-	http://smarden.org/runit/${P}.tar.gz
-	http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A}
-	"
-
-	RDEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
-
+HOMEPAGE="https://smarden.org/runit/"
+SRC_URI="https://smarden.org/runit/${P}.tar.gz"
 S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
@@ -23,14 +15,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
+RDEPEND="sys-apps/openrc"
+
 src_prepare() {
 	default
-	cd "${WORKDIR}/admin/"
-	eapply -p1 "${WORKDIR}/debian/patches"
-	cd "${S}"
 
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
+	# We either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile || die
 
 	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
 	[[ ${COMPILER} == "diet" ]] &&
@@ -41,12 +32,8 @@ src_prepare() {
 src_configure() {
 	use static && append-ldflags -static
 
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	sed -i \
-		-e "/echo.*ar.*cr/s,\<ar\>,$(tc-getAR)," \
-		-e "/echo.*ranlib/s,\<ranlib\>,$(tc-getRANLIB)," \
-		print-ar.sh || die
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
@@ -89,7 +76,7 @@ default_config() {
 	local service="${EROOT}"/etc/service
 	mkdir -p "${service}" || die
 	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
+		ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
 	done
 	einfo "The links to services runit will supervise are installed"
 	einfo "in $service."
@@ -100,11 +87,11 @@ default_config() {
 
 migrate_from_211() {
 	# Create /etc/service and /var/service if requested
-	if [ -e "${T}"/make_var_service ]; then
+	if [[ -e "${T}"/make_var_service ]]; then
 		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/etc/service || die
 		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/var/service || die
 	fi
-	if [ -d "${T}"/runsvdir ]; then
+	if [[ -d "${T}"/runsvdir ]]; then
 		cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die
 	fi
 	return 0
@@ -117,9 +104,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		default_config
-	elif [[ -n $pre_212 ]]; then
+	elif [[ -n ${pre_212} ]]; then
 		migrate_from_211
 	fi
 
@@ -129,16 +116,16 @@ pkg_postinst() {
 	ewarn "source /etc/profile"
 	ewarn
 
-	if [ -L "${EROOT}"/var/service ]; then
+	if [[ -L "${EROOT}"/var/service ]]; then
 		ewarn "Once this version of runit is active, please remove the"
 		ewarn "compatibility symbolic link at ${EROOT}/var/service"
 		ewarn "The correct path now is ${EROOT}/etc/service"
 		ewarn
 	fi
 
-	if [ -L "${EROOT}"/etc/runit/runsvdir/all ]; then
+	if [[ -L "${EROOT}"/etc/runit/runsvdir/all ]]; then
 		ewarn "${EROOT}/etc/runit/runsvdir/all has moved to"
-		iewarn "${EROOT}/etc/sv."
+		ewarn "${EROOT}/etc/sv."
 		ewarn "Any symbolic links under ${EROOT}/etc/runit/runsvdir"
 		ewarn "which point to services through ../all should be updated to"
 		ewarn "point to them through ${EROOT}/etc/sv."