net-misc/s6-networking: Bump to 2.3.0.3

Bump EAPI to 7, always compile shared libs, fix bug with USE="static
-static-libs", simplify dependency syntax.

Closes: https://github.com/gentoo/gentoo/pull/9675
Signed-off-by: Luis Ressel <aranea@aixah.de>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 282bd55c289090713840815b711b0c13163c3721..01ee0ebe105553590ca4359b56c64fec7745c574 100644 (file)
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1 +1,2 @@
 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

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
new file mode 100644 (file)
index 0000000..337a4b5
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
@@ -0,0 +1,59 @@
+# 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="ssl 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?]
+       ssl? ( >=dev-libs/libressl-2.6.5[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:=
+               ssl? ( >=dev-libs/libressl-2.6.5:= )
+       )
+"
+
+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 \
+               $(use_enable ssl ssl libressl) \
+               $(use_enable static allstatic) \
+               $(use_enable static static-libc) \
+               $(use_enable static-libs static)
+}