Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/s6-dns/
Date: Fri, 28 Jan 2022 08:00:22
Message-Id: 1643356757.0f9d50a8bf19668fe2ea84bcc31ced392adf500e.sam@gentoo
1 commit: 0f9d50a8bf19668fe2ea84bcc31ced392adf500e
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Sun Jan 23 14:46:07 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 28 07:59:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9d50a8
7
8 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
9
10 Bug #782409 affects only 2.2.0.1 and 2.3.0.0 versions because they are
11 not compatible with dev-libs/skalibs-2.7.0.0 and newer, where
12 skalibs/mininetstring.h was removed.
13
14 Closes: https://bugs.gentoo.org/782409
15 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 net-dns/s6-dns/Manifest | 5 ----
19 net-dns/s6-dns/s6-dns-2.2.0.1.ebuild | 55 ------------------------------------
20 net-dns/s6-dns/s6-dns-2.3.0.0.ebuild | 55 ------------------------------------
21 net-dns/s6-dns/s6-dns-2.3.0.1.ebuild | 44 -----------------------------
22 net-dns/s6-dns/s6-dns-2.3.0.2.ebuild | 42 ---------------------------
23 net-dns/s6-dns/s6-dns-2.3.1.1.ebuild | 42 ---------------------------
24 6 files changed, 243 deletions(-)
25
26 diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
27 index abff7a95dd2b..7893fa209ad5 100644
28 --- a/net-dns/s6-dns/Manifest
29 +++ b/net-dns/s6-dns/Manifest
30 @@ -1,6 +1 @@
31 -DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd0260f4676c5ef6078097a62c43d75b18977e31187008b9fb90bebefc9ffb8d999395b012d85bdef9a4220aa7a6d SHA512 9b62ddec94be86d186520f0240dafda95861c54345f92a1fac3251f8560e70932bc5915cca4136d428ed02d0718e8082ad382bffd0c707ae867f1896d93ecaed
32 -DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
33 -DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
34 -DIST s6-dns-2.3.0.2.tar.gz 77885 BLAKE2B 354a44d47f4fbc964c41999a442f730a738be361bc9633502c3c54f38d25060c58ef2ecfea764f1f5d3243a2e24f92e8b54abfaf61f76f7d155f93a53de2d1db SHA512 fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33
35 -DIST s6-dns-2.3.1.1.tar.gz 78171 BLAKE2B 0949a48a0c48a8c3ffa27794309efa4489cd15102b3a7c29a6dfbbe22cebd0d207417fbe687160266fcda6ff04174b538d7844ef7811e06f8c8bd9a91e4d013e SHA512 e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9
36 DIST s6-dns-2.3.3.0.tar.gz 83398 BLAKE2B dc4408a608324bdecd363c8a7a92d878983075e93af66905e4315e34e8d1fb1fdecc78fcd7e56fabdfdcbdcda81cc39bc93044730a0bafed26df40ca70110a71 SHA512 f711ff3f7ea7ae2eecf46b6742f61e970aed8776fcaa4f7902da0864c97f71296bc1651c08ff6f98d6474ccb0ee904c2d7497d7a1d28d48db8df78865b2a9e79
37
38 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
39 deleted file mode 100644
40 index 1c86a6a85661..000000000000
41 --- a/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild
42 +++ /dev/null
43 @@ -1,55 +0,0 @@
44 -# Copyright 1999-2017 Gentoo Foundation
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=6
48 -
49 -inherit versionator
50 -
51 -DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
52 -HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
53 -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
54 -
55 -LICENSE="ISC"
56 -SLOT="0/$(get_version_component_range 1-2)"
57 -KEYWORDS="~amd64 ~x86"
58 -IUSE="static static-libs"
59 -
60 -DEPEND=">=sys-devel/make-3.81
61 - static? (
62 - >=dev-libs/skalibs-2.6.0.0[static-libs]
63 - )
64 - !static? (
65 - >=dev-libs/skalibs-2.6.0.0
66 - )
67 -"
68 -RDEPEND="
69 - !static? (
70 - >=dev-libs/skalibs-2.6.0.0:=
71 - )
72 -"
73 -
74 -HTML_DOCS="doc/*"
75 -
76 -src_prepare() {
77 - default
78 -
79 - # Remove QA warning about LDFLAGS addition
80 - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
81 -
82 - # configure overrides gentoo's -fstack-protector default
83 - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
84 -}
85 -
86 -src_configure() {
87 - econf \
88 - --bindir=/bin \
89 - --dynlibdir=/$(get_libdir) \
90 - --libdir=/usr/$(get_libdir)/${PN} \
91 - --with-dynlib=/$(get_libdir) \
92 - --with-lib=/usr/$(get_libdir)/skalibs \
93 - --with-sysdeps=/usr/$(get_libdir)/skalibs \
94 - $(use_enable !static shared) \
95 - $(use_enable static allstatic) \
96 - $(use_enable static static-libc) \
97 - $(use_enable static-libs static)
98 -}
99
100 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
101 deleted file mode 100644
102 index eb1e9438ecd0..000000000000
103 --- a/net-dns/s6-dns/s6-dns-2.3.0.0.ebuild
104 +++ /dev/null
105 @@ -1,55 +0,0 @@
106 -# Copyright 1999-2018 Gentoo Foundation
107 -# Distributed under the terms of the GNU General Public License v2
108 -
109 -EAPI=6
110 -
111 -inherit versionator
112 -
113 -DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
114 -HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
115 -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
116 -
117 -LICENSE="ISC"
118 -SLOT="0/$(get_version_component_range 1-2)"
119 -KEYWORDS="~amd64 ~x86"
120 -IUSE="static static-libs"
121 -
122 -DEPEND=">=sys-devel/make-3.81
123 - static? (
124 - >=dev-libs/skalibs-2.6.3.0[static-libs]
125 - )
126 - !static? (
127 - >=dev-libs/skalibs-2.6.3.0
128 - )
129 -"
130 -RDEPEND="
131 - !static? (
132 - >=dev-libs/skalibs-2.6.3.0:=
133 - )
134 -"
135 -
136 -HTML_DOCS="doc/*"
137 -
138 -src_prepare() {
139 - default
140 -
141 - # Remove QA warning about LDFLAGS addition
142 - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
143 -
144 - # configure overrides gentoo's -fstack-protector default
145 - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
146 -}
147 -
148 -src_configure() {
149 - econf \
150 - --bindir=/bin \
151 - --dynlibdir=/$(get_libdir) \
152 - --libdir=/usr/$(get_libdir)/${PN} \
153 - --with-dynlib=/$(get_libdir) \
154 - --with-lib=/usr/$(get_libdir)/skalibs \
155 - --with-sysdeps=/usr/$(get_libdir)/skalibs \
156 - $(use_enable !static shared) \
157 - $(use_enable static allstatic) \
158 - $(use_enable static static-libc) \
159 - $(use_enable static-libs static)
160 -}
161
162 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
163 deleted file mode 100644
164 index de60beb85347..000000000000
165 --- a/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
166 +++ /dev/null
167 @@ -1,44 +0,0 @@
168 -# Copyright 1999-2018 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=7
172 -
173 -DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
174 -HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
175 -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
176 -
177 -LICENSE="ISC"
178 -SLOT="0/$(ver_cut 1-2)"
179 -KEYWORDS="~amd64 ~x86"
180 -IUSE="static static-libs"
181 -
182 -REQUIRED_USE="static? ( static-libs )"
183 -
184 -DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]"
185 -RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
186 -
187 -HTML_DOCS="doc/*"
188 -
189 -src_prepare() {
190 - default
191 -
192 - # Remove QA warning about LDFLAGS addition
193 - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
194 -
195 - # configure overrides gentoo's -fstack-protector default
196 - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
197 -}
198 -
199 -src_configure() {
200 - econf \
201 - --bindir=/bin \
202 - --dynlibdir=/$(get_libdir) \
203 - --libdir=/usr/$(get_libdir)/${PN} \
204 - --with-dynlib=/$(get_libdir) \
205 - --with-lib=/usr/$(get_libdir)/skalibs \
206 - --with-sysdeps=/usr/$(get_libdir)/skalibs \
207 - --enable-shared \
208 - $(use_enable static allstatic) \
209 - $(use_enable static static-libc) \
210 - $(use_enable static-libs static)
211 -}
212
213 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
214 deleted file mode 100644
215 index b65a0a030c34..000000000000
216 --- a/net-dns/s6-dns/s6-dns-2.3.0.2.ebuild
217 +++ /dev/null
218 @@ -1,42 +0,0 @@
219 -# Copyright 1999-2019 Gentoo Authors
220 -# Distributed under the terms of the GNU General Public License v2
221 -
222 -EAPI=7
223 -
224 -DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
225 -HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
226 -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
227 -
228 -LICENSE="ISC"
229 -SLOT="0/$(ver_cut 1-2)"
230 -KEYWORDS="~amd64 ~x86"
231 -IUSE="static static-libs"
232 -
233 -REQUIRED_USE="static? ( static-libs )"
234 -
235 -RDEPEND=">=dev-libs/skalibs-2.8.0.0:=[static-libs?]"
236 -DEPEND="${RDEPEND}"
237 -
238 -HTML_DOCS=( doc/. )
239 -
240 -src_prepare() {
241 - default
242 -
243 - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
244 - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
245 - configure || die
246 -}
247 -
248 -src_configure() {
249 - econf \
250 - --bindir=/bin \
251 - --dynlibdir=/usr/$(get_libdir) \
252 - --libdir=/usr/$(get_libdir)/${PN} \
253 - --with-dynlib=/usr/$(get_libdir) \
254 - --with-lib=/usr/$(get_libdir)/skalibs \
255 - --with-sysdeps=/usr/$(get_libdir)/skalibs \
256 - --enable-shared \
257 - $(use_enable static allstatic) \
258 - $(use_enable static static-libc) \
259 - $(use_enable static-libs static)
260 -}
261
262 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
263 deleted file mode 100644
264 index 55879080c237..000000000000
265 --- a/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild
266 +++ /dev/null
267 @@ -1,42 +0,0 @@
268 -# Copyright 1999-2019 Gentoo Authors
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI=7
272 -
273 -DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
274 -HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
275 -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
276 -
277 -LICENSE="ISC"
278 -SLOT="0/$(ver_cut 1-2)"
279 -KEYWORDS="~amd64 ~x86"
280 -IUSE="static static-libs"
281 -
282 -REQUIRED_USE="static? ( static-libs )"
283 -
284 -RDEPEND=">=dev-libs/skalibs-2.9.1.0:=[static-libs?]"
285 -DEPEND="${RDEPEND}"
286 -
287 -HTML_DOCS=( doc/. )
288 -
289 -src_prepare() {
290 - default
291 -
292 - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
293 - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
294 - configure || die
295 -}
296 -
297 -src_configure() {
298 - econf \
299 - --bindir=/bin \
300 - --dynlibdir=/usr/$(get_libdir) \
301 - --libdir=/usr/$(get_libdir)/${PN} \
302 - --with-dynlib=/usr/$(get_libdir) \
303 - --with-lib=/usr/$(get_libdir)/skalibs \
304 - --with-sysdeps=/usr/$(get_libdir)/skalibs \
305 - --enable-shared \
306 - $(use_enable static allstatic) \
307 - $(use_enable static static-libc) \
308 - $(use_enable static-libs static)
309 -}