gentoo resync : 22.05.2021

8 files changed, 3 insertions, 259 deletions

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 03d72c688382..84c5b7738967 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,16 +1,9 @@
-AUX 1 175 BLAKE2B cbe26d170d3e736ac9d801d718269de54a7830fd39d4dc2d43067b4bbf8f5e1b426ebad4d2020febd50ca63f977c276dce0b2f95989120ea76a99e309b4f5797 SHA512 04fa0e61c3db9f85cafea61c77c11da79d6d7a261425874e610821c92ea74d2d79a7ff7c47dacf830faaa007d9d9c7048ade0c19470f7a8fd1c8f80964cdf9d1
 AUX 1-2.1.2 183 BLAKE2B 4b7dd07662e21d8ff7f898f36979237b2ee2b18d019fd31222dfb910107c196bb813ad7bc0cffb54f90b4796a4de26d9523bdb250b9cd41d3baf1a84838364a7 SHA512 813b83675fc71522a6469c9c391d87219da43896ecb702a957ad2a9a6f8c4d0d59e4ab784b50de288c7e98efd2a8fd26aa5a1fbb8376f7c24226a97fee49d87a
-AUX 2 551 BLAKE2B 36d705261f1b82d70c33adc04f8b72cf3f854a00717d40bc7984ee89f6c7a48b5b11aeeba13d67da3ada4e2c07533dfae898ca2f85be460e18bdc2e7b2aa4ce4 SHA512 0176a59c84e135df2f92546567bbc3b0ad5709734da7cd435bf117c2e4c359098584a7e30c89b7c0fa0fa796c49bbe3f59d52ebd6a510e71004e9415ca4bd89e
 AUX 2-2.1.2 554 BLAKE2B e3680bd4333c784054991209c2b9749daa8e56adf70b0bac29752c0e63883a0ecab5d5405f55dc2628522cc4b60c17232829c6150a65b7dc07b42d7a780019b1 SHA512 d21f6877f459b3c4b93049f6d342e48715ce7b762f6c5d858ad26ada07e66fe6f56ebb095083c7f153091fcb8ef877dc2b7c1738daeeacd6e04c70e3753682a5
-AUX 3 372 BLAKE2B 0b517155f11beb06cbac4470315fab62572965f27be7d9d86a68195d909f0a0efde8350734af60f8d50bd2b2262d811cc6a2ec0516feef62fe11f916132cb3a1 SHA512 8511045da385878f2ecc238b68d0c4317b5ac677028393b6ace7d575e0a1bceaf1e6ce639db01501461bcaa7521a5856a4e9a65097babf9a653a4747bddcd553
 AUX 3-2.1.2 388 BLAKE2B ee8d2db23ea43694a614f918d02af34db4bbe6a207eadead0cc668bf5ae113a7c49a351c8026326a773d2e4027caf89e2802494ccc68e734aa0223015175fcba SHA512 47256f52367c7f1af5d2b435550e5d4786e056c3a43138fd472d6bc48093a07c36a5e1bdafd4235e0c1299579c100f9d97190424cf2bd114ec29956f3c9991f5
 AUX ctrlaltdel 189 BLAKE2B 07b6936a7ae54a69227f794068cf41dfc2e54ba6ba032a7c1a58c5bcbf6567221e2e21afc5b8768742e63ce9e131841d8336c2cd081991c9e9d91f5d86f274c6 SHA512 a0980e1dbcd2c591997e62e3e1b8ab660c36f007d12f6dd3eb6607d286c0056eb96c40b997b2c9569a7e3a6bf9a2a39d8050c31aa09a9c0ba6eb931183049b1b
 AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b671e93dbf3e9cf233e92dd2c0a47fe4e0bec0fd13d994893f95914f19cb5f9dfa78b915857bc4 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d
-AUX run.getty 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
-DIST runit-2.1.1.tar.gz 109661 BLAKE2B 3962d3cb0d3d9f612bcef40939cba7d71f0bb338281578f4a2c3ec10a819e0d90c3d6cb6c3992226a5aaaa7e5f282a64abadac762422221f7abe0aedbffc2249 SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-EBUILD runit-2.1.1-r2.ebuild 1906 BLAKE2B bb133c2e34687aa75f74531d45c0cf725728e31c47a7e037536550d7ca8baf62541142be9d1f65ad1a308699232f4eb276e993d92667443062ca3f7be34d245a SHA512 22fb44d33b564fcb60b763975b7481a470ea279d49683f0a46de25dc1f573efe5460989982b2905fc1c0d89c00e9ad8917c0cafadfaf3423bc6e9e1dd7a98974
-EBUILD runit-2.1.2-r1.ebuild 4113 BLAKE2B 413506f7f4a524ff840a1608f4595572737b53b0668ebe3572cb573f8f66334706e849686c6d435f67972a14f8107701883e3ec70f1d9b66a0c5019864657b01 SHA512 6c7cb56b8c3b7e5d50ee9e85820829babbc0c11ea684c38e599879cbfdec7d1bff62aabd8bf16b1df8439d2f9888efceb332984d78fcfd1a1e50d23f92c4d5b0
-EBUILD runit-2.1.2.ebuild 3992 BLAKE2B 94c85c2cdd165361b5f8f1c29d94e3de32dd8609a20ecfd39a37ad8e03e41f80e902f8261187baea316dbf4b6b67766d889209a8e436188fb83d9f8cc1a43428 SHA512 6cd789bbb6871b58fbf511d03e0b1292c3f2331899bbbd4ef2e07060a22b9726018fda5990fdb1408da5b5d87247a8ccfd865eb1089ce58acc24afa509bbc4ee
+EBUILD runit-2.1.2-r1.ebuild 4106 BLAKE2B 947af0d8565487d6f3eb94e1fd9d6a07024ffcca68cb4d436911a4b2162e6f12946818c2700590103626811623bd57bb52fa8b81402d806d3255ea24e1f44e0c SHA512 02793eabd2ccd445f4fbbb503320f0a5779b72c147be33df292a82fe7c7db8e9df6f13f4e47a6a2db7b6f52385bb8c66e92ff6a786fa9efcf9e7c2250e6c5653
 MISC metadata.xml 330 BLAKE2B 5cff293985a925289e0508f19f64e72d0118eec36628f0c8ac436f382f430c617a352c42ae8df7551a6299d7a6afbfba3fb20096a6d134200ac4e5e923adb2e9 SHA512 fad9bdd34ed7305ef25a909651d5e37e9b77360a12f60b40d9aa73b890a1ede5676ab1f1be4013b67ffc6f91cc15005a2f5acf54a5b99d22fa762af914b94901
diff --git a/sys-process/runit/files/1 b/sys-process/runit/files/1
deleted file mode 100644
index d6a5b4f64eeb..000000000000
--- a/sys-process/runit/files/1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# system one time tasks
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-RUNLEVEL=S /sbin/rc sysinit
-RUNLEVEL=S /sbin/rc boot
-
-touch /etc/runit/stopit
-chmod 0 /etc/runit/stopit
diff --git a/sys-process/runit/files/2 b/sys-process/runit/files/2
deleted file mode 100644
index 233ad006aac3..000000000000
--- a/sys-process/runit/files/2
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
-
-exec env - PATH=$PATH \
-runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3
deleted file mode 100644
index f143f5f46011..000000000000
--- a/sys-process/runit/files/3
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-exec >/dev/console 2>&1
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-echo 'Waiting for getties to stop...'
-sv shutdown -w 10 /var/service/getty-*
-
-echo 'Waiting for services to stop...'
-sv shutdown -w 300 /var/service/*
-
-echo 'Shutdown...'
-test -x /etc/runit/reboot && LAST=6    || LAST=0
-test -x /etc/runit/reboot && RC=reboot || RC=shutdown
-RUNLEVEL=$LAST /sbin/rc $RC
diff --git a/sys-process/runit/files/run.getty b/sys-process/runit/files/run.getty
deleted file mode 100644
index ab6f9543fe97..000000000000
--- a/sys-process/runit/files/run.getty
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /sbin/agetty 38400 TTY linux
diff --git a/sys-process/runit/runit-2.1.1-r2.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
deleted file mode 100644
index d556c6541a80..000000000000
--- a/sys-process/runit/runit-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-SRC_URI="http://smarden.org/runit/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
-	default
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile || die "sed of Makefile failed"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die "setting cflags"
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die "setting ldflags failed"
-}
-
-src_install() {
-	keepdir /etc/runit{,/runsvdir{,/default,/all}}
-	dosym default /etc/runit/runsvdir/current
-	dosym ../etc/runit/runsvdir/current /var/service
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-
-	cd "${S}"/..
-	dodoc package/{CHANGES,README,THANKS,TODO}
-	dohtml doc/*.html
-	doman man/*.[18]
-
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel}
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/runit/runsvdir/all/getty-$tty/
-		for script in run finish; do
-			newexe "${FILESDIR}"/$script.getty $script
-			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/runit/runsvdir/all/getty-$tty/$script
-		done
-		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
-	done
-
-	# make sv command work
-	cd "${S}"
-	insinto /etc/env.d
-	cat <<-EOF > env.d
-		#/etc/env.d/20runit
-		SVDIR="/var/service/"
-	EOF
-	newins env.d 20runit
-}
-
-pkg_postinst() {
-	ewarn "/etc/profile was updated. Please run:"
-	ewarn "source /etc/profile"
-	ewarn "to make 'sv' work correctly on your currently open shells"
-}
diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 9647df0a33f1..a920443a3f97 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"
diff --git a/sys-process/runit/runit-2.1.2.ebuild b/sys-process/runit/runit-2.1.2.ebuild
deleted file mode 100644
index afd458efc6c1..000000000000
--- a/sys-process/runit/runit-2.1.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-SRC_URI="http://smarden.org/runit/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
-
-	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
-	[[ ${COMPILER} == "diet" ]] &&
-		use ppc &&
-		filter-flags "-mpowerpc-gpopt"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	into /
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-	into /usr
-
-	cd ..
-	dodoc package/{CHANGES,README,THANKS,TODO}
-	dohtml doc/*.html
-	doman man/*.[18]
-
-dodir /etc/runit
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,ctrlaltdel}
-	newexe "${FILESDIR}"/2-${PV} 2
-	newexe "${FILESDIR}"/3-${PV} 3
-
-	dodir /etc/sv
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/sv/getty-$tty/
-		newexe "${FILESDIR}"/finish.getty finish
-		newexe "${FILESDIR}"/run.getty-${PV} run
-		for script in finish run; do
-			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
-		done
-	done
-
-	# make sv command work
-	cat <<-EOF > "${T}"/env.d
-		#/etc/env.d/20runit
-		SVDIR="/etc/service/"
-	EOF
-	insinto /etc/env.d
-	newins "${T}"/env.d 20runit
-}
-
-pkg_preinst() {
-	if has_version 'sys-process/runit' &&
-		has_version '<sys-process/runit-2.1.2' &&
-		[ -d "${EROOT}"etc/runit/runsvdir/all ]; then
-		if [ -e "${EROOT}"etc/sv ]; then
-			mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
-			ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
-		fi
-		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
-		ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
-		cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
-		touch "${T}"/make_var_service || die
-	fi
-}
-
-default_config() {
-	local sv="${EROOT}"etc/sv
-	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
-	done
-	einfo "The links to services runit will supervise are installed"
-	einfo "in $service."
-	einfo "If you need multiple runlevels, please see the documentation"
-	einfo "for how to set them up."
-	einfo
-}
-
-migrate_from_211() {
-	# Create /etc/service and /var/service if requested
-	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
-		cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		default_config
-	elif [ ! version_is_at_least 2.1.2 $REPLACING_VERSIONS ]; then
-		migrate_from_211
-	fi
-
-	ewarn "To make sure sv works correctly in your currently open"
-	ewarn "shells, please run the following command:"
-	ewarn
-	ewarn "source /etc/profile"
-	ewarn
-
-	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
-		ewarn "${EROOT}etc/runit/runsvdir/all has moved to"
-		iewarn "${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."
-		ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be"
-		ewarn "removed."
-		ewarn
-	fi
-}