gentoo auto-resync : 24:12:2024 - 06:30:57

3 files changed, 46 insertions, 19 deletions

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 1836375da5ae..f03d58f652b9 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -3,6 +3,7 @@ AUX bootlogd.initd 276 BLAKE2B afc0ce0406b38d9d29398f054668f78f0d90994421b3a8a1b
 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-3.08-shutdown-single.patch 1341 BLAKE2B f0b2ac2e803a3521f0473ab50b18aec300ad0c4566c0f0a53924b32540e862437ee5d99c3f54fe453e84d9ebe8011f64e75f60ca1f73cc9606b30a867df68e7d SHA512 7b3ba5c8af1e25ecc59568e920446da66fd53284e2bca0eb4b8cae2f9b919552c254e74c7363bb3598f2a35a413dcb31008dd8cae57ceaf98f6bf8921918cce7
+AUX sysvinit-3.12-delete-moved-programs.patch 1522 BLAKE2B 1eafb58c0ac29b8b8ac38a7db1138d8e128d9908abbdcbc94bb29d5d08c1a520ccf9cbcdbec03175a699814c4922e64df63d0a52982cd5b0f3256dbb95aa2175 SHA512 2517d634417f87f5faa7382b25724528e2312d7866ebeb9c1220493ef5001b1ea0a552990b19ee5d7f473e36536cc9a01aeaa8f0fc0937bfcf240137a47edf4b
 DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 SHA512 a523e030e559ecc56391f9424e240fbe54a714bb3c522ca0bb410b649a1c08c5e9f03d298340a5586565f18d8640b1b418fa09294b41fb95a9cd2a686316b758
 DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d
 DIST sysvinit-3.09.tar.xz 239600 BLAKE2B 81c3e80dd66896110b1a2488415dd20fae03b4b7d8d4f40d175c195942e1c13367a7f1cf9efd1c79a37e16684bd12e1c76dbb1f8faab44e495e8de684fe744ef SHA512 ddd3681e24c699f9f0cf2cfc44488e32205a8fcf1723b79da47b95adef0c0edc1d9fd387d259dba15a2158fbd0b7920d789b46a9f3c7cd016a12bb1dc92f00d4
@@ -17,5 +18,5 @@ EBUILD sysvinit-3.08.ebuild 5740 BLAKE2B a57883b5b5c7f335d4ba63b0d1686261782e3c8
 EBUILD sysvinit-3.09.ebuild 5740 BLAKE2B a57883b5b5c7f335d4ba63b0d1686261782e3c8fdb248837998c9cb7c429b3e3cf00e5523e6a05c46e3e864077226462d6795698d657e9cad8c8dc67900d8b4a SHA512 e86e57c863841d0771ccf86653367c38e9a2bacda1a438895f48ce9268660bf4114eeb38db2dd18b22ef3724c16435dc7c9d9f8733c2412b337781f8f3cf685b
 EBUILD sysvinit-3.10.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
 EBUILD sysvinit-3.11.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
-EBUILD sysvinit-3.12.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
+EBUILD sysvinit-3.12-r1.ebuild 5243 BLAKE2B aeef9abef93eef0727192551cddfc7e47f28ca44640057ff775938aa4bb3acc2d5e4e798cb2995d7fe61b809744c3d9538529b9c429018ba5ab63ba0b5b7d2e7 SHA512 7935a5f296381f5dd39ec92638b0e68d380f1b3001835594151a32fc052ccb574c5a1cc476be1813464c61de7d79495c5c768cfc866db8e91eac3dcced533f7c
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
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
new file mode 100644
index 000000000000..0d601432f86c
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch
@@ -0,0 +1,43 @@
+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/sysvinit-3.12.ebuild b/sys-apps/sysvinit/sysvinit-3.12-r1.ebuild
index a7beec09b9b9..8d7a21844303 100644
--- a/sys-apps/sysvinit/sysvinit-3.12.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.12-r1.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 PATCHES=(
 	# bug #158615
 	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
+	"${FILESDIR}/${PN}-3.12-delete-moved-programs.patch"
 )
 
 src_prepare() {
@@ -66,24 +67,6 @@ 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"