[gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/

[William Hubbs]

commit:     d1be483df5e68e68c3750f93a399a109cb557ee9
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Thu Nov 16 01:18:15 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 13:24:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1be483d

net-misc/s6-networking: Clean up old versions

 net-misc/s6-networking/Manifest                    |  3 -
 .../s6-networking/s6-networking-2.2.1.0.ebuild     | 67 ---------------------
 .../s6-networking/s6-networking-2.3.0.0.ebuild     | 67 ---------------------
 .../s6-networking/s6-networking-2.3.0.1.ebuild     | 70 ----------------------
 4 files changed, 207 deletions(-)

diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index eb7c262be1e..282bd55c289 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,4 +1 @@
-DIST s6-networking-2.2.1.0.tar.gz 85242 BLAKE2B f1f680a8a4301c4f3a27019bfccbe520802944609ad8a48a1b336fb9a48eb0226ae5a11509c6a3ea54ebf154f50b92db03a694db1b447924f8f7ae1120fbbf65 SHA512 33085e2a855079ab046b6f851b4dc15801012dc1a353a1254508c6c9da9e45da4f7e2b62e16ab1d0a41d42b424bebe7b362860f68f3be0f9eba37b7a15817633
-DIST s6-networking-2.3.0.0.tar.gz 86538 BLAKE2B c35e69074697f632ecd7c606a31c8f7d232bb4fb60b24fb08e1341a3e39df3236d3d5b8920dec3ab9a4ef7287190a6b49bb04ae5368363035370e175fb0ffca7 SHA512 ca247f3926d790e388347c610ae10fdb3e7be48d8381b9178223c470258b264315997f627b6ddcc508f08ba83e9212f386041b92dbaa3ad576c4e37f205a0c91
-DIST s6-networking-2.3.0.1.tar.gz 86602 BLAKE2B c8891bd384fdd3d99a8cdda96bc97dd90490a7e89ce3d2b43a57c625ba0cd5e5d29d12f464e14ff6578308a3255c1fab409718db2a19a60110a923ba9297f283 SHA512 d0f2367a916d578e02ed8b482c73e62c59eed60cf08f98d6294b12fd7aa046b2fe18294b0243a59a05a9ec1a082e8e9398d6e89145edcb2b1022fa90e7197da2
 DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256

diff --git a/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild
deleted file mode 100644
index 9a34540a55a..00000000000
--- a/net-misc/s6-networking/s6-networking-2.2.1.0.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="http://www.skarnet.org/software/s6-networking/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.2.0.0[static-libs]
-		>=dev-libs/skalibs-2.4.0.2[static-libs]
-		>=net-dns/s6-dns-2.1.0.0[static-libs]
-		>=sys-apps/s6-2.4.0.0[static-libs]
-		ssl? ( >=dev-libs/libressl-2.4.4[static-libs] )
-	)
-	!static? (
-		>=dev-lang/execline-2.2.0.0[static=]
-		>=dev-libs/skalibs-2.4.0.2
-		>=net-dns/s6-dns-2.1.0.0[static=]
-		>=sys-apps/s6-2.4.0.0[static=]
-		ssl? ( >=dev-libs/libressl-2.4.4 )
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.2.0.0:=[!static?]
-	>=sys-apps/s6-2.4.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.4.0.2:=
-		>=net-dns/s6-dns-2.1.0.0:=
-		ssl? ( >=dev-libs/libressl-2.4.4:= )
-	)
-"
-
-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
-}
-
-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 \
-		$(use_enable ssl ssl libressl) \
-		$(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.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.0.ebuild
deleted file mode 100644
index 5418be09f4a..00000000000
--- a/net-misc/s6-networking/s6-networking-2.3.0.0.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="ssl static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.0[static-libs]
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-		>=net-dns/s6-dns-2.2.0.0[static-libs]
-		>=sys-apps/s6-2.5.0.0[static-libs]
-		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.0[static=]
-		>=dev-libs/skalibs-2.5.0.0
-		>=net-dns/s6-dns-2.2.0.0[static=]
-		>=sys-apps/s6-2.5.0.0[static=]
-		ssl? ( >=dev-libs/libressl-2.4.5 )
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0:=[!static?]
-	>=sys-apps/s6-2.5.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-		>=net-dns/s6-dns-2.2.0.0:=
-		ssl? ( >=dev-libs/libressl-2.4.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
-}
-
-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 \
-		$(use_enable ssl ssl libressl) \
-		$(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.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.1.ebuild
deleted file mode 100644
index ce24c644ece..00000000000
--- a/net-misc/s6-networking/s6-networking-2.3.0.1.ebuild
+++ /dev/null
@@ -1,70 +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="ssl static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.1[static-libs]
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-		>=net-dns/s6-dns-2.2.0.0[static-libs]
-		>=sys-apps/s6-2.5.1.0[static-libs]
-		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.1[static=]
-		>=dev-libs/skalibs-2.5.1.0
-		>=net-dns/s6-dns-2.2.0.0[static=]
-		>=sys-apps/s6-2.5.1.0[static=]
-		ssl? ( >=dev-libs/libressl-2.4.5 )
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.1:=[!static?]
-	>=sys-apps/s6-2.5.1.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-		>=net-dns/s6-dns-2.2.0.0:=
-		ssl? ( >=dev-libs/libressl-2.4.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 \
-		$(use_enable ssl ssl libressl) \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}