gentoo resync : 29.12.2022

4 files changed, 50 insertions, 52 deletions

diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 65fa719008f6..d6e883c38e3c 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,5 +1,5 @@
-DIST s6-dns-2.3.3.0.tar.gz 83398 BLAKE2B dc4408a608324bdecd363c8a7a92d878983075e93af66905e4315e34e8d1fb1fdecc78fcd7e56fabdfdcbdcda81cc39bc93044730a0bafed26df40ca70110a71 SHA512 f711ff3f7ea7ae2eecf46b6742f61e970aed8776fcaa4f7902da0864c97f71296bc1651c08ff6f98d6474ccb0ee904c2d7497d7a1d28d48db8df78865b2a9e79
 DIST s6-dns-2.3.5.3.tar.gz 84916 BLAKE2B b315e2319c4b15401a6e41847faefc1798c3a945fc78f1601b06ce13ef0a55ddde270549e0585cac0356f9b1558a1433675dc4c636d1cc58aee434b86bd81627 SHA512 f3984913df65823c4edbeddc2f8c534926e74c5b06c357c394b05b25943ac8c6b4154859c93e182c60228f018522eb6173ece0bd2dbeffe8e1cc6fcbe33f6a76
-EBUILD s6-dns-2.3.3.0.ebuild 1205 BLAKE2B c85a1b8d5f963f99a1592e08734dfac0bcda8a18f3b42f68c647b019bf816744ccbd40c5556408e69a51bf24c00a894c07c8773010aea7236dd02684adf444b1 SHA512 afce7fbfe786207d4e660794308e52ae8356630014dd4fb35756d49601a05318bb4308eb42031fef4073487a62c83a0219e71838ae71da64cff52b9cd64b4f41
-EBUILD s6-dns-2.3.5.3.ebuild 1151 BLAKE2B dc59b11074660d9f94810d6cf55c9e9c585efa32ff67e896ca61c5e508651a2d1b3be0fb395d9940a6a7fd3f655818b35bac59782d953a2c3622c1d4085d8679 SHA512 9c41b5133bd3ba89493767434341fb6e4f69553a84402762129d5de2ecc72a77192d0c38975d225811778b50e4cf63a6d89325f475bcc5ed8f32a0ff320444f6
+DIST s6-dns-2.3.5.4.tar.gz 84892 BLAKE2B 3bba411b297b85fdf5da7caf251b3c093d0e7108fdf16321e510a485e750ef37c6ec1a923e627a81a9719f211e2e284c9b8d3bcf60a4e18738d0886f931e380d SHA512 04c8fd40c71c9517f4e8d847a0ddf7d60a7759b4d7075035c2e00b4eb34e81edf4608df562929042c294ed671ab953e613374b577210ff49841ceb27dd563ae5
+EBUILD s6-dns-2.3.5.3-r1.ebuild 1147 BLAKE2B 2e5a2ae10d27e1a9c8bd634b093bb54c6dc37563d5b2630ee8b7c71e901e0ff7ee85d3171cc8fd7569a55e9161e555ee4448b105829e8163985af0f31dc780e5 SHA512 ce7d2efb6c447560eb472e9742c716a30f71a63944517eacd4863a8954557f0dbef01856a9f24b356f5c9b6884b72ff6949ef9aec6e324bc9d46e6aacf4e8620
+EBUILD s6-dns-2.3.5.4.ebuild 1014 BLAKE2B 40840e755b2bf53fb55a8d70d00b520e64e19bb0bdd85514ada7460e8c5011e2b6c50a505c1c563f76a7091296d7952e97435d9865bd26ed14e877d3c8422774 SHA512 e7be913613bec07d380608008b3db82e9a62866b60ecb9e2e833e4c3a094dcbe243873c69a0dd0b51aa08b2cdbcd65d970231a5d699853059a0335515f2e6be2
 MISC metadata.xml 686 BLAKE2B d6722be73cbf714c108651660f94f7b7a5d376bc3d670ae45b791521f89b1cbb6036d7753051de6a223fb5137bb905f1ad2f6704d092f0f40545fc80df14b85f SHA512 98586190f430b166bc03334b8a5a6f6bf04b2efd7f5df19b206fbe71411300f6c52ea60e120a41c8ea3a6bf08718d9a87edc7519656e85ef51e05cd42a582ddd
diff --git a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
deleted file mode 100644
index 3d1928213ef2..000000000000
--- a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="<dev-libs/skalibs-2.10.0.0:=[static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
index 14abc3c2c212..f5cabf08e349 100644
--- a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
+++ b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.11.1.0:=[static-libs?]"
+RDEPEND="=dev-libs/skalibs-2.11*:=[static-libs?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
new file mode 100644
index 000000000000..3540fb714148
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}