commit: 0f9d50a8bf19668fe2ea84bcc31ced392adf500e Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Sun Jan 23 14:46:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 28 07:59:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9d50a8
net-dns/s6-dns: drop 2.2.0.1, 2.3.0.0, 2.3.0.1, 2.3.0.2, 2.3.1.1 Bug #782409 affects only 2.2.0.1 and 2.3.0.0 versions because they are not compatible with dev-libs/skalibs-2.7.0.0 and newer, where skalibs/mininetstring.h was removed. Closes: https://bugs.gentoo.org/782409 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/s6-dns/Manifest | 5 ---- net-dns/s6-dns/s6-dns-2.2.0.1.ebuild | 55 ------------------------------------ net-dns/s6-dns/s6-dns-2.3.0.0.ebuild | 55 ------------------------------------ net-dns/s6-dns/s6-dns-2.3.0.1.ebuild | 44 ----------------------------- net-dns/s6-dns/s6-dns-2.3.0.2.ebuild | 42 --------------------------- net-dns/s6-dns/s6-dns-2.3.1.1.ebuild | 42 --------------------------- 6 files changed, 243 deletions(-) diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest index abff7a95dd2b..7893fa209ad5 100644 --- a/net-dns/s6-dns/Manifest +++ b/net-dns/s6-dns/Manifest @@ -1,6 +1 @@ -DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd0260f4676c5ef6078097a62c43d75b18977e31187008b9fb90bebefc9ffb8d999395b012d85bdef9a4220aa7a6d SHA512 9b62ddec94be86d186520f0240dafda95861c54345f92a1fac3251f8560e70932bc5915cca4136d428ed02d0718e8082ad382bffd0c707ae867f1896d93ecaed -DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454 -DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157 -DIST s6-dns-2.3.0.2.tar.gz 77885 BLAKE2B 354a44d47f4fbc964c41999a442f730a738be361bc9633502c3c54f38d25060c58ef2ecfea764f1f5d3243a2e24f92e8b54abfaf61f76f7d155f93a53de2d1db SHA512 fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33 -DIST s6-dns-2.3.1.1.tar.gz 78171 BLAKE2B 0949a48a0c48a8c3ffa27794309efa4489cd15102b3a7c29a6dfbbe22cebd0d207417fbe687160266fcda6ff04174b538d7844ef7811e06f8c8bd9a91e4d013e SHA512 e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9 DIST s6-dns-2.3.3.0.tar.gz 83398 BLAKE2B dc4408a608324bdecd363c8a7a92d878983075e93af66905e4315e34e8d1fb1fdecc78fcd7e56fabdfdcbdcda81cc39bc93044730a0bafed26df40ca70110a71 SHA512 f711ff3f7ea7ae2eecf46b6742f61e970aed8776fcaa4f7902da0864c97f71296bc1651c08ff6f98d6474ccb0ee904c2d7497d7a1d28d48db8df78865b2a9e79 diff --git a/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild b/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild deleted file mode 100644 index 1c86a6a85661..000000000000 --- a/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild +++ /dev/null @@ -1,55 +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 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/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-libs/skalibs-2.6.0.0[static-libs] - ) - !static? ( - >=dev-libs/skalibs-2.6.0.0 - ) -" -RDEPEND=" - !static? ( - >=dev-libs/skalibs-2.6.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)/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/net-dns/s6-dns/s6-dns-2.3.0.0.ebuild b/net-dns/s6-dns/s6-dns-2.3.0.0.ebuild deleted file mode 100644 index eb1e9438ecd0..000000000000 --- a/net-dns/s6-dns/s6-dns-2.3.0.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -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/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-libs/skalibs-2.6.3.0[static-libs] - ) - !static? ( - >=dev-libs/skalibs-2.6.3.0 - ) -" -RDEPEND=" - !static? ( - >=dev-libs/skalibs-2.6.3.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)/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/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild deleted file mode 100644 index de60beb85347..000000000000 --- a/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 )" - -DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]" -RDEPEND="!static? ( >=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)/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.0.2.ebuild b/net-dns/s6-dns/s6-dns-2.3.0.2.ebuild deleted file mode 100644 index b65a0a030c34..000000000000 --- a/net-dns/s6-dns/s6-dns-2.3.0.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.8.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 -} - -src_configure() { - 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.1.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild deleted file mode 100644 index 55879080c237..000000000000 --- a/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.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)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -}
