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

["Mike Gilbert" <floppym@gentoo.org>]

commit:     d04ef5c75e666a44efc62d8d72dc65ae9923aff0
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 13:50:43 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 13:51:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04ef5c7

sys-apps/sysvinit: drop 3.05, 3.06-r1

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/sysvinit/Manifest                         |   4 -
 .../files/sysvinit-3.05-fix-man-makefile.patch     |  19 ---
 sys-apps/sysvinit/sysvinit-3.05.ebuild             | 185 --------------------
 sys-apps/sysvinit/sysvinit-3.06-r1.ebuild          | 188 ---------------------
 4 files changed, 396 deletions(-)

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b3a8b37e7382..c2427f7b9e4c 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,6 +1,2 @@
-DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
-DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
-DIST sysvinit-3.06.tar.xz 252508 BLAKE2B 7fd2ba4bc0c8a15ddd7af2aaa1044e3bc8885a5e18a0a9c58c63897d0965d7430a9b529af4953618a9042cf13cca8a74a92ab02062c5de18d13fdf68328c11e7 SHA512 dc56ce12f18f7ecde6c9828e72dd8ab7afccd0f88ad4438d6a5b356a30b21e9ba9c796a4b2520a20a0c384f058be6bdb7b9b0df9786bbf65a80dff97c2be733b
-DIST sysvinit-3.06.tar.xz.sig 833 BLAKE2B 18a0af9a58ea10b1858a7d47867685e30749e335c0a88c6603fc78620d05579ff8fa1f6ccf9605140577793e4068dff50605d89b3e73e9d75b1f56c398fb5f7c SHA512 05101d4753daae73d67f1213c62b8be96c78418ce9a16f86cd23539ad124caecb8042de348aca4d752da8eb1a6b7f1bc1524489a4f0662db510c58e26ae8554c
 DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993 SHA512 57d8365ae9ab4e3b6ab948d1ac9a4f1fe86c4e86c06ea3b12fca7f7be88ef39b5e04787fbfec9417aaf06cff0db3a90e18e6a6135e205f7eb74a5e7c897491fd
 DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a

diff --git a/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch b/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
deleted file mode 100644
index e6079baca1f5..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/slicer69/sysvinit/commit/e7622b031dac56e1836d2c6e353da4b7f8367aab
-
-From: Adam Sampson <ats@offog.org>
-Date: Sun, 21 Aug 2022 22:13:09 +0100
-Subject: [PATCH] Use the .po files to work out which manpage dirs to create.
-
-The pattern being used here didn't match anything in a tarball release.
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -214,7 +214,7 @@ install:	all
- 		fi
- 		$(INSTALL_DIR) $(ROOT)/usr/include/
- 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
--		for lang in  '' $(subst ../man/,,$(wildcard ../man/po/??/)); do \
-+		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
-

diff --git a/sys-apps/sysvinit/sysvinit-3.05.ebuild b/sys-apps/sysvinit/sysvinit-3.05.ebuild
deleted file mode 100644
index c028b897abcd..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.05.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo 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="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-# https://github.com/slicer69/sysvinit/issues/12
-#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-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.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-
-	"${FILESDIR}"/${P}-fix-man-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		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
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 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' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/{po/,}${locale}.po || die
-		rm -rf "${S}"/man/${locale} || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-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 ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}

diff --git a/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
deleted file mode 100644
index 0a7ab706c4eb..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2023 Gentoo 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="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-# https://github.com/slicer69/sysvinit/issues/12
-#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	acct-group/root
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-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.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
-	default
-
-	# We already enforce F_S=2 as a minimum in our toolchain, and
-	# allow 3. Also, SSP doesn't always make sense for some platforms
-	# e.g. HPPA. It's default-on in our toolchain where it works.
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		-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"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/{po/,}${locale}.po || die
-		rm -rf "${S}"/man/${locale} || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-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 ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}