diff options
Diffstat (limited to 'net-misc/s6-networking')
-rw-r--r-- | net-misc/s6-networking/Manifest | 14 | ||||
-rw-r--r-- | net-misc/s6-networking/metadata.xml | 8 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.3.0.2.ebuild | 67 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.3.0.3.ebuild | 57 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.3.0.4.ebuild | 53 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.3.1.1.ebuild | 53 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.3.2.0.ebuild | 18 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.5.1.0.ebuild | 63 |
8 files changed, 87 insertions, 246 deletions
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest index ef8d3205c40e..1bbb53c3e36f 100644 --- a/net-misc/s6-networking/Manifest +++ b/net-misc/s6-networking/Manifest @@ -1,11 +1,5 @@ -DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256 -DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762 -DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3 -DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d -EBUILD s6-networking-2.3.0.2.ebuild 1745 BLAKE2B 360c99ab7eb421d065e8c491cc65b7092d4b3febf3fd04169b07513ee8ea562f4ad9e1d125bcbf2267601d27d212eb7d7217e516480bff6e80245077d3b480a9 SHA512 4d456947969d4d615bdd0ffc01ee22150d3b455eb65e24347dbbd7ddf9dd882331804cbe91f04dc537e7bd7e5df7edd33c6aa09fc625aec6b5e85f2afbffef48 -EBUILD s6-networking-2.3.0.3.ebuild 1517 BLAKE2B d2f75109ab0ed59d7473096b2df3edf7dbdaf900ae533a744cd1e7be56b40cba8043c6b7afc042123b7254168a7bddb11b563ed0790ad72a65119cbdaa7ede32 SHA512 353eea4f953dd62d4f6bc5dc054e79bd73d4f6183054a9a82c1bd8b8e532c0fce45dfb9fcfe200de6ad670b3918cb2bd74f9f81a485d7f83e86f4ab1ce4bf21e -EBUILD s6-networking-2.3.0.4.ebuild 1362 BLAKE2B 759df0f62ade011bcd98f24d0d8e032307d0e3a4f82089b5165539b04fd82682e9849f9a4674b077323833e9962d9b2a8088b44d6b9f9f85a6534b3f930b8689 SHA512 4660c4d013a5c0891a56a44b8e16c972b0a80ca9dea86faefe6c4e51d36a119fdc78122286733213a8a42f01db775705470b126e53e8c5454ac9830ad66cf997 -EBUILD s6-networking-2.3.1.1.ebuild 1362 BLAKE2B 2f31a5477ede89dacbb44d2611b0d2ca75c4f7a93b5347ac8715be8f2fc1bf5d1a43c2a867b27d9a9923c97a28d1256385f2fb3242957a43cf0c062b00f45f90 SHA512 cff2b6e074b3ad8dbcc2cbbd358603d235d2d40396fbdaf4d061c3f2423ec30bd1a5cc14e1d3b355a19cb9a042329cdb143d218b90458a5b3a6297fa016202da -EBUILD s6-networking-2.3.2.0.ebuild 1371 BLAKE2B ee3f5dc5c53fbdac7374abedc17e5ddd0e6f9190ebe31b150c0a21bca5a304dbfe7ffa951ff64e289b87922770ab9fe907980bb97768744b0db60f1231ee577f SHA512 e9cab5fa96b03aebf095c9dacdbaa220628653642dfad5618592e9cfbd9a739a2c3791424f39e91476c7d7656e37c8b3c0e2c84e2e498049d6369cc597bbc689 -MISC metadata.xml 556 BLAKE2B 53ea6bd22c3e4070fc6385b89a0f354d0653b261cd45b21c651ec27941c9336116b41756ca4909be9007690daf19c561018d959293b80a48407bfe6983837d6c SHA512 430f1d18c06bd8e943baabad1eebe043da8d0769daa93df3d2566795710930deaaf87914d08c922ea24c6069c4dfbc6b1127599ac4c8ff4ecedf8370372fcb9f +DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8 +EBUILD s6-networking-2.3.2.0.ebuild 1477 BLAKE2B 96d16dfe48d15634efc4a263166d313fda023ecadf16bb1ee699bb3c82da7f392b4e78e50433870a61532c39a30092e4bd0899e8791fea298382c0c0771c9a66 SHA512 f4801e7bd836a1813cf4c30c6cff479ecb1804a76a6f4149be5282643e53bd4ac9ae701c8981d1d30053ee22f9e983d8def1de2c5db8d8133a59fea7bd2c6a82 +EBUILD s6-networking-2.5.1.0.ebuild 1499 BLAKE2B 37e5180ff6def720c91084889bfa9611269ff101f1c35dc56e3be6a7b9c3021238918cd7f3c010787582a16d70a8c31717be662928a0ce6bce90b2a2f2d64800 SHA512 73cb9a9746d3e2e93a0a4d3cd8bb87c36aea727331878c64abb269df38a2b5562e1ece1ffe6a7a97e0a7bc6ef618ee842f2862f8fdf49264c0d783c24f183483 +MISC metadata.xml 807 BLAKE2B 3b0c32efb3bde7b1694f42e3210878e74b3b79d553cfde13815e4a3dee276540c8444191fdab060f3639ef8414ecc06c1efb3621a67b24a41c1fb3be01343a07 SHA512 a38d2ba464e4e6fa7da69fc2006e6110fcd5ab6e65d41676c4d8fc5ee06c5c9b4dc333ef83d1b607cd13927eb2a88d868aee92cd184bbc64d572a30900250833 diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml index ee2befa691d5..eee54e30c122 100644 --- a/net-misc/s6-networking/metadata.xml +++ b/net-misc/s6-networking/metadata.xml @@ -5,6 +5,14 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>arkamar@atlas.cz</email> + <name>Petr Vaněk</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription lang="en"> s6-networking is a suite of small networking utilities for Unix systems. It includes command-line client and server management, TCP access diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild deleted file mode 100644 index 6aa894cbc45a..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-lang/execline-2.3.0.2[static-libs] - >=dev-libs/skalibs-2.6.0.0[static-libs] - >=net-dns/s6-dns-2.2.0.1[static-libs] - >=sys-apps/s6-2.6.1.0[static-libs] - ) - !static? ( - >=dev-lang/execline-2.3.0.2[static=] - >=dev-libs/skalibs-2.6.0.0 - >=net-dns/s6-dns-2.2.0.1[static=] - >=sys-apps/s6-2.6.1.0[static=] - ) -" -RDEPEND=" - >=dev-lang/execline-2.3.0.2:=[!static?] - >=sys-apps/s6-2.6.1.0:=[!static?] - !static? ( - >=dev-libs/skalibs-2.6.0.0:= - >=net-dns/s6-dns-2.2.0.1:= - ) -" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --disable-ssl \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild deleted file mode 100644 index f800a625df77..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -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 )" - -DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?] - >=sys-apps/s6-2.7.2.0[static-libs?] - >=net-dns/s6-dns-2.3.0.1[static-libs?] - >=dev-libs/skalibs-2.7.0.0[static-libs?] -" -RDEPEND=">=dev-lang/execline-2.5.0.1:= - >=sys-apps/s6-2.7.2.0:= - !static? ( - >=net-dns/s6-dns-2.3.0.1:= - >=dev-libs/skalibs-2.7.0.0:= - ) -" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild deleted file mode 100644 index 7b2f39aa2ae6..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -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-lang/execline-2.5.1.0:=[static-libs?] - >=dev-libs/skalibs-2.8.0.0:=[static-libs?] - >=sys-apps/s6-2.8.0.0:=[static-libs?] - !static? ( - >=net-dns/s6-dns-2.3.0.2:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.0.2[static-libs?] -" - -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 -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild deleted file mode 100644 index bd50b35c8b36..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -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-lang/execline-2.5.3.0:=[static-libs?] - >=dev-libs/skalibs-2.9.1.0:=[static-libs?] - >=sys-apps/s6-2.9.0.1:=[static-libs?] - !static? ( - >=net-dns/s6-dns-2.3.1.1:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.1.1[static-libs?] -" - -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 -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild index 356302cf9f86..a0221c4ec4bf 100644 --- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild +++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Suite of small networking utilities for Unix systems" HOMEPAGE="https://www.skarnet.org/software/s6-networking/" SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" @@ -14,15 +16,15 @@ IUSE="static static-libs" REQUIRED_USE="static? ( static-libs )" -RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?] - >=dev-libs/skalibs-2.9.3.0:=[static-libs?] - >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] +RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?] + <dev-libs/skalibs-2.10.0.0:=[static-libs?] + <sys-apps/s6-2.10.0.0:=[execline,static-libs?] !static? ( - >=net-dns/s6-dns-2.3.3.0:= + <net-dns/s6-dns-2.3.4.0:= ) " DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.3.0[static-libs?] + <net-dns/s6-dns-2.3.4.0[static-libs?] " HTML_DOCS=( doc/. ) @@ -33,9 +35,13 @@ src_prepare() { # 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) \ diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild new file mode 100644 index 000000000000..47a1748d6605 --- /dev/null +++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Suite of small networking utilities for Unix systems" +HOMEPAGE="https://www.skarnet.org/software/s6-networking/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="ssl static static-libs" + +REQUIRED_USE="static? ( static-libs ) + ssl? ( !static !static-libs )" + +RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?] + >=dev-libs/skalibs-2.11.0.0:=[static-libs?] + >=sys-apps/s6-2.11.0.0:=[execline,static-libs?] + ssl? ( dev-libs/libretls ) + !static? ( + >=net-dns/s6-dns-2.3.5.2:= + ) +" +DEPEND="${RDEPEND} + >=net-dns/s6-dns-2.3.5.2[static-libs?] +" + +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)/s6 + --with-lib=/usr/$(get_libdir)/s6-dns + --with-lib=/usr/$(get_libdir)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + --enable-shared + $(use_enable ssl ssl libtls) + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} |