gentoo auto-resync : 20:12:2023 - 19:51:59

5 files changed, 6 insertions, 78 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bd6d1390f995..591c98aaa32c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index e439e9694858..3f99a81e0e77 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -3,5 +3,5 @@ AUX groff-1.22.4-skip-broken-diffutils-test.patch 1657 BLAKE2B 62a8b41cd02abf273
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 DIST groff-1.23.0.tar.gz 7433031 BLAKE2B 9fc5a2302f034761a17f0639a04b82c536ba8a7db15b062dd736e0011fc5a27fddcaf035af128d09f06762825d9bb965e8f5561e4be7a9fea3fe86ca5f6cb2dd SHA512 eff473fd1d0e6b27527318452ef2b7c6c7aba0b1c27fc529036496eccba5717f3639df0b81a297a57f700e27543196d7086b15e43d7e3c7bf075f95feb7f4089
 EBUILD groff-1.22.4.ebuild 2913 BLAKE2B a2d0e8e3bd3a1283f319a535a98caaccfdc0599f5deae5e3bae88f230c4cb25401dc893f5f810651720e73832b19f7dad2e2fdca7fb4f2c9d55f6a204a7f0162 SHA512 614fde97891d74ad3f56ef2267705075bc5efaf389f09d9d7a270aa21b36ad15f18d29f5f338ef120bc6e17018f204b249987590c96290a4fdb45230dd046f1d
-EBUILD groff-1.23.0.ebuild 2662 BLAKE2B 09ffa8e91c9d8855d33ce92069d41c05ae4c94d37bfa37a07de275c689eeb4a446804830e95ee09f2e06bd72878c14e04491bbdbc50f04c2347cd13d5bde99db SHA512 1bae9b67379c9ca61df41f98614a6a7879c3d6b15a96928b9f2d4906bd73a5f0247a904eba920c72428ea40fc297da40e03fa06ea235c6a7065b954c905c3a59
+EBUILD groff-1.23.0.ebuild 2777 BLAKE2B 5601634bdee5bd9eb1e3c888085c3e43b082c720905ba8bf385a4c53a314e5a892141a85a6a5dba6f889a4afa95840449682b8eb9e9f0d614e6e5f886c14a617 SHA512 8f9ec1f6003d2c6c74b23a400988207727aab003bf347e3cdba62ea070ec9dd9cbc5ec07709704be9bd55fce54ebedfb8132ffa163997b52e93cf83df146106c
 MISC metadata.xml 514 BLAKE2B 56bd1f6ff4a0082fd0148d0ba9c9fffb13e665f7550661b6625bc7b8589a9ebf1f37957d55ecb379f3e38b820574d068789ec5e8f2e1743e02acfe2f91abea2f SHA512 90796d8d5e32de1c47de855a1cfaad250c47a686f79586af0d79f9a3d2a4c2c64b589ea8f7ffe7f7473a10d9d11ecb43245e54714fcb18bebb73abd1db767d37
diff --git a/sys-apps/groff/groff-1.23.0.ebuild b/sys-apps/groff/groff-1.23.0.ebuild
index d92b232013f6..38f1316c870e 100644
--- a/sys-apps/groff/groff-1.23.0.ebuild
+++ b/sys-apps/groff/groff-1.23.0.ebuild
@@ -41,6 +41,11 @@ BDEPEND="
 
 DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# False positive with older autoconf, will be fixed w/ autoconf-2.72
+	static_assert
+)
+
 PATCHES=(
 	# bug #16108, bug #17580, bug #121502
 	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index bb63416d7385..7678fff19962 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,7 +1,5 @@
-DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566 SHA512 7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e SHA512 76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786
-EBUILD s6-linux-init-1.1.0.0-r1.ebuild 1631 BLAKE2B c7b23a7f080f26a7dd07f575e89f5a277b287cae52212513f83ca4597b6cc4c1f20dc67cd8c36a7d271a491733679af384b07bd347f64759d72fb36e93e5ba8a SHA512 1922616ab86b822d0a54ea71de1666a31855ab6f86f2707aa2623f627e3b20c5e10a138b87e8bfb103e85e6dcbb7b8f6a8c497099c39a3a559c0a8cc1772320d
 EBUILD s6-linux-init-1.1.1.1-r1.ebuild 1631 BLAKE2B c7b23a7f080f26a7dd07f575e89f5a277b287cae52212513f83ca4597b6cc4c1f20dc67cd8c36a7d271a491733679af384b07bd347f64759d72fb36e93e5ba8a SHA512 1922616ab86b822d0a54ea71de1666a31855ab6f86f2707aa2623f627e3b20c5e10a138b87e8bfb103e85e6dcbb7b8f6a8c497099c39a3a559c0a8cc1772320d
 EBUILD s6-linux-init-1.1.2.0.ebuild 1768 BLAKE2B e0f9e8feed3a200df23ec56aad4274b48205413578768cc4f22608046f59665f5893804e4f34efebaa59baf11ec33e58f3c1ec7fbf61b7f1ad61900c4cb1e4a9 SHA512 b9012664b61796e246acd37b2534605c3b76f109d9d2a03ce26da9f486a7a9e9789930a51d8f3c33f85134348570a6e041ca6383a2764c72a6eb0d2e6830c508
 MISC metadata.xml 750 BLAKE2B b0b1508188b05b09ab4c8ea338d7db19a41ee23bb0ae69916add81ddd0cd9a6a6591c4b53c9fb92ea88510e9b93fa1cdcfa2d89be51acaa6e3260465311d1c10 SHA512 c2cae5bd406eb008667b178636e96fd44707e1468140fc7c088afdf0fcb9fdcaab6c02a791409985c0425c13cdaa12a222d135a6406aef432b1b3bf2d83da1e6
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
deleted file mode 100644
index 90102a4af725..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="
-	dev-lang/execline:=
-	dev-libs/skalibs:0/2.13
-	sys-apps/s6:=[execline]
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--skeldir=/etc/s6-linux-init/skel
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--libexecdir=/lib/s6
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/s6"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}