commit: 0f82392adbc3c138928be2b028ef6b27f3ce5ba5 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Dec 16 17:19:13 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Dec 16 17:19:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f82392a
sys-apps/s6: drop versions Bug: https://bugs.gentoo.org/819246 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> sys-apps/s6/Manifest | 7 ----- sys-apps/s6/s6-2.1.3.0.ebuild | 62 ------------------------------------------- sys-apps/s6/s6-2.6.1.1.ebuild | 60 ----------------------------------------- sys-apps/s6/s6-2.7.0.0.ebuild | 60 ----------------------------------------- sys-apps/s6/s6-2.7.1.1.ebuild | 60 ----------------------------------------- sys-apps/s6/s6-2.7.2.1.ebuild | 50 ---------------------------------- sys-apps/s6/s6-2.8.0.1.ebuild | 45 ------------------------------- sys-apps/s6/s6-2.9.0.1.ebuild | 45 ------------------------------- 8 files changed, 389 deletions(-) diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest index c183811299c1..8357e682c2e5 100644 --- a/sys-apps/s6/Manifest +++ b/sys-apps/s6/Manifest @@ -1,8 +1 @@ -DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca -DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d -DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53 -DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79 -DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 -DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f -DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee diff --git a/sys-apps/s6/s6-2.1.3.0.ebuild b/sys-apps/s6/s6-2.1.3.0.ebuild deleted file mode 100644 index 125f5749978d..000000000000 --- a/sys-apps/s6/s6-2.1.3.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="http://www.skarnet.org/software/s6/"; -SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static" - -DEPEND=">=sys-devel/make-4.0 - static? ( - >=dev-lang/execline-2.1.1.0[static-libs] - >=dev-libs/skalibs-2.3.2.0[static-libs] - ) - !static? ( - >=dev-lang/execline-2.1.1.0 - >=dev-libs/skalibs-2.3.2.0 - ) -" -RDEPEND=" - !static? ( - >=dev-lang/execline-2.1.1.0 - >=dev-libs/skalibs-2.3.2.0 - ) -" - -src_prepare() { - # Remove QA warning about LDFLAGS addition - sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static) \ - --bindir=/bin \ - --sbindir=/sbin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --datadir=/etc \ - --sysdepdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-sysdeps=/usr/$(get_libdir)/skalibs -} - -src_compile() { - emake DESTDIR="${D}" -} - -src_install() { - default - dodoc -r examples - dohtml -r doc/* -} diff --git a/sys-apps/s6/s6-2.6.1.1.ebuild b/sys-apps/s6/s6-2.6.1.1.ebuild deleted file mode 100644 index c638efeca0aa..000000000000 --- a/sys-apps/s6/s6-2.6.1.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-lang/execline-2.3.0.3[static-libs] - >=dev-libs/skalibs-2.6.0.1[static-libs] - ) - !static? ( - >=dev-lang/execline-2.3.0.3[static=] - >=dev-libs/skalibs-2.6.0.1 - ) -" -RDEPEND=" - >=dev-lang/execline-2.3.0.3:=[!static?] - !static? ( - >=dev-libs/skalibs-2.6.0.1:= - ) -" - -DOCS="AUTHORS examples README*" -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 -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)/execline \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/sys-apps/s6/s6-2.7.0.0.ebuild b/sys-apps/s6/s6-2.7.0.0.ebuild deleted file mode 100644 index f413b96bcaca..000000000000 --- a/sys-apps/s6/s6-2.7.0.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-lang/execline-2.3.0.4[static-libs] - >=dev-libs/skalibs-2.6.3.0[static-libs] - ) - !static? ( - >=dev-lang/execline-2.3.0.4[static=] - >=dev-libs/skalibs-2.6.3.0 - ) -" -RDEPEND=" - >=dev-lang/execline-2.3.0.4:=[!static?] - !static? ( - >=dev-libs/skalibs-2.6.3.0:= - ) -" - -DOCS="AUTHORS examples README*" -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 -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)/execline \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/sys-apps/s6/s6-2.7.1.1.ebuild b/sys-apps/s6/s6-2.7.1.1.ebuild deleted file mode 100644 index df566e620d64..000000000000 --- a/sys-apps/s6/s6-2.7.1.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-lang/execline-2.3.0.4[static-libs] - >=dev-libs/skalibs-2.6.4.0[static-libs] - ) - !static? ( - >=dev-lang/execline-2.3.0.4[static=] - >=dev-libs/skalibs-2.6.4.0 - ) -" -RDEPEND=" - >=dev-lang/execline-2.3.0.4:=[!static?] - !static? ( - >=dev-libs/skalibs-2.6.4.0:= - ) -" - -DOCS="AUTHORS examples README*" -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 -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)/execline \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/sys-apps/s6/s6-2.7.2.1.ebuild b/sys-apps/s6/s6-2.7.2.1.ebuild deleted file mode 100644 index d91e04cfffd3..000000000000 --- a/sys-apps/s6/s6-2.7.2.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?] - >=dev-libs/skalibs-2.7.0.0[static-libs?] -" -RDEPEND=">=dev-lang/execline-2.5.0.1:= - !static? ( >=dev-libs/skalibs-2.7.0.0:= ) -" - -DOCS="AUTHORS examples README*" -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 -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)/execline \ - --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/sys-apps/s6/s6-2.8.0.1.ebuild b/sys-apps/s6/s6-2.8.0.1.ebuild deleted file mode 100644 index 844ca391029d..000000000000 --- a/sys-apps/s6/s6-2.8.0.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~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.1.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 -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/execline \ - --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/sys-apps/s6/s6-2.9.0.1.ebuild b/sys-apps/s6/s6-2.9.0.1.ebuild deleted file mode 100644 index 154f800e40b6..000000000000 --- a/sys-apps/s6/s6-2.9.0.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/"; -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~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?] -" -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 -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/execline \ - --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) -}
