gentoo auto-resync : 07:03:2023 - 11:57:00

5 files changed, 48 insertions, 30 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 23da283bf4a1..5c0f0c1530c8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 92ca5b83d1df..cea8afbbc1cc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,4 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
-AUX portage-3.0.45.1-qa-notice-configure-func-decl.patch 1098 BLAKE2B 482e2f8557f15baba683302ad0eafaede08a8c1c42f265a2279c6d8074256bba04a769f99363f5946b4e037a7c49e58e905a9efe504af280185d166f3770a0a8 SHA512 96ebbd7181f6ae9b68e172bf5a511c4ef43762647ad46502a4db13d15ea82d55f0d963676b753f597412f15c8bdd32839e3a907126f0003afa49dcdc672b8eba
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691
diff --git a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
deleted file mode 100644
index a621ab65d719..000000000000
--- a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eca90b6049a9ce42ec6868f64abcab403c9f4190 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 28 Feb 2023 03:10:26 +0000
-Subject: [PATCH] install-qa-check.d/90config-impl-decl: prefix warning with
- 'QA Notice'
-
-... so tinderboxes can pick it up more easily.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/install-qa-check.d/90config-impl-decl
-+++ b/bin/install-qa-check.d/90config-impl-decl
-@@ -92,12 +92,13 @@ config_impl_decl_check() {
- 	# Drop out early if no impl decls found (all the arrays are the same size)
- 	[[ ${#files[@]} -eq 0 ]] && return
- 
--	eqawarn 'Found the following implicit function declarations in configure logs:'
-+	eqawarn 'QA Notice: Found the following implicit function declarations in configure logs:'
- 	for l in "${!files[@]}"; do
- 		eqawarn "  ${files[l]}:${lines[l]} - ${funcs[l]}"
- 		eqatag 'config.log-impl-decl' "line=${lines[l]}" "func=${funcs[l]}" "${files[l]}"
- 	done
- 	eqawarn 'Check that no features were accidentally disabled.'
-+	eqawarn 'See https://wiki.gentoo.org/wiki/Modern_C_porting.'
- }
- 
- config_impl_decl_check
--- 
-2.39.2
-
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 3f7c09601935..4431d30c3f3d 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -2,8 +2,10 @@ DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd1
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39 SHA512 52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b SHA512 a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
 DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955 SHA512 da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
+DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159 SHA512 7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
 EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
 EBUILD s6-linux-utils-2.6.1.0.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 EBUILD s6-linux-utils-2.6.1.1.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
+EBUILD s6-linux-utils-2.6.1.2.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
new file mode 100644
index 000000000000..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+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)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}