1 |
commit: d971c982b8cbf996848d9e7f3759170a1e845ee1 |
2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 19:45:06 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 21:49:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d971c982 |
7 |
|
8 |
sys-apps/iproute2: Remove old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/705870 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> |
13 |
|
14 |
sys-apps/iproute2/Manifest | 2 - |
15 |
sys-apps/iproute2/iproute2-5.4.0.ebuild | 162 ------------------------------- |
16 |
sys-apps/iproute2/iproute2-5.9.0.ebuild | 167 -------------------------------- |
17 |
3 files changed, 331 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
20 |
index 6aee22e27ce..e8d4aadc7e0 100644 |
21 |
--- a/sys-apps/iproute2/Manifest |
22 |
+++ b/sys-apps/iproute2/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 |
25 |
-DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051 |
26 |
DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 |
27 |
-DIST iproute2-5.9.0.tar.xz 786524 BLAKE2B 9d82cfb1b1353d2cc6c441269af234b05e1ccd190a58c67f890d74fb42b4266be91ce64277bd2b75a0b711977c0f9edc61d8655bf262d05aaebd8d73caecc0c7 SHA512 bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50 |
28 |
|
29 |
diff --git a/sys-apps/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild |
30 |
deleted file mode 100644 |
31 |
index d79f9a329ba..00000000000 |
32 |
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,162 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit toolchain-funcs flag-o-matic multilib |
41 |
- |
42 |
-if [[ ${PV} == "9999" ]] ; then |
43 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
44 |
- inherit git-r3 |
45 |
-else |
46 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" |
47 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" |
48 |
-fi |
49 |
- |
50 |
-DESCRIPTION="kernel routing and traffic control utilities" |
51 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
52 |
- |
53 |
-LICENSE="GPL-2" |
54 |
-SLOT="0" |
55 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
56 |
- |
57 |
-# We could make libmnl optional, but it's tiny, so eh |
58 |
-RDEPEND=" |
59 |
- !net-misc/arpd |
60 |
- dev-libs/libbsd |
61 |
- !minimal? ( net-libs/libmnl ) |
62 |
- caps? ( sys-libs/libcap ) |
63 |
- elf? ( virtual/libelf ) |
64 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
65 |
- berkdb? ( sys-libs/db:= ) |
66 |
- atm? ( net-dialup/linux-atm ) |
67 |
- selinux? ( sys-libs/libselinux ) |
68 |
-" |
69 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
70 |
-DEPEND=" |
71 |
- ${RDEPEND} |
72 |
- >=sys-kernel/linux-headers-3.16 |
73 |
-" |
74 |
-BDEPEND=" |
75 |
- app-arch/xz-utils |
76 |
- >=sys-devel/bison-2.4 |
77 |
- sys-devel/flex |
78 |
- virtual/pkgconfig |
79 |
-" |
80 |
- |
81 |
-PATCHES=( |
82 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
83 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
84 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
85 |
-) |
86 |
- |
87 |
-src_prepare() { |
88 |
- if ! use ipv6 ; then |
89 |
- PATCHES+=( |
90 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
91 |
- ) |
92 |
- fi |
93 |
- |
94 |
- default |
95 |
- |
96 |
- # echo -n is not POSIX compliant |
97 |
- sed 's@echo -n@printf@' -i configure || die |
98 |
- |
99 |
- sed -i \ |
100 |
- -e '/^CC :\?=/d' \ |
101 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
102 |
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ |
103 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
104 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
105 |
- Makefile || die |
106 |
- |
107 |
- # Use /run instead of /var/run. |
108 |
- sed -i \ |
109 |
- -e 's:/var/run:/run:g' \ |
110 |
- include/namespace.h \ |
111 |
- man/man8/ip-netns.8 || die |
112 |
- |
113 |
- # build against system headers |
114 |
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
115 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
116 |
- |
117 |
- if use minimal ; then |
118 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
119 |
- fi |
120 |
-} |
121 |
- |
122 |
-src_configure() { |
123 |
- tc-export AR CC PKG_CONFIG |
124 |
- |
125 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
126 |
- local setns |
127 |
- pushd "${T}" >/dev/null |
128 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
129 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
130 |
- echo 'int main(){return 0;}' > test.c |
131 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
132 |
- popd >/dev/null |
133 |
- |
134 |
- # run "configure" script first which will create "config.mk"... |
135 |
- econf |
136 |
- |
137 |
- # ...now switch on/off requested features via USE flags |
138 |
- # this is only useful if the test did not set other things, per bug #643722 |
139 |
- cat <<-EOF >> config.mk |
140 |
- TC_CONFIG_ATM := $(usex atm y n) |
141 |
- TC_CONFIG_XT := $(usex iptables y n) |
142 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
143 |
- # We've locked in recent enough kernel headers #549948 |
144 |
- TC_CONFIG_IPSET := y |
145 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
146 |
- HAVE_CAP := $(usex caps y n) |
147 |
- HAVE_MNL := $(usex minimal n y) |
148 |
- HAVE_ELF := $(usex elf y n) |
149 |
- HAVE_SELINUX := $(usex selinux y n) |
150 |
- IP_CONFIG_SETNS := ${setns} |
151 |
- # Use correct iptables dir, #144265 #293709 |
152 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
153 |
- EOF |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- emake V=1 |
158 |
-} |
159 |
- |
160 |
-src_install() { |
161 |
- if use minimal ; then |
162 |
- into / |
163 |
- dosbin tc/tc |
164 |
- dobin ip/ip |
165 |
- return 0 |
166 |
- fi |
167 |
- |
168 |
- emake \ |
169 |
- DESTDIR="${D}" \ |
170 |
- PREFIX="${EPREFIX}/usr" \ |
171 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
172 |
- SBINDIR="${EPREFIX}"/sbin \ |
173 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
174 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
175 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
176 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
177 |
- install |
178 |
- |
179 |
- dodir /bin |
180 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
181 |
- |
182 |
- dolib.a lib/libnetlink.a |
183 |
- insinto /usr/include |
184 |
- doins include/libnetlink.h |
185 |
- # This local header pulls in a lot of linux headers it |
186 |
- # doesn't directly need. Delete this header that requires |
187 |
- # linux-headers-3.8 until that goes stable. #467716 |
188 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
189 |
- |
190 |
- if use berkdb ; then |
191 |
- keepdir /var/lib/arpd |
192 |
- # bug 47482, arpd doesn't need to be in /sbin |
193 |
- dodir /usr/bin |
194 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
195 |
- fi |
196 |
-} |
197 |
|
198 |
diff --git a/sys-apps/iproute2/iproute2-5.9.0.ebuild b/sys-apps/iproute2/iproute2-5.9.0.ebuild |
199 |
deleted file mode 100644 |
200 |
index 6bccbe4b7ea..00000000000 |
201 |
--- a/sys-apps/iproute2/iproute2-5.9.0.ebuild |
202 |
+++ /dev/null |
203 |
@@ -1,167 +0,0 @@ |
204 |
-# Copyright 1999-2020 Gentoo Authors |
205 |
-# Distributed under the terms of the GNU General Public License v2 |
206 |
- |
207 |
-EAPI=7 |
208 |
- |
209 |
-inherit toolchain-funcs flag-o-matic multilib |
210 |
- |
211 |
-if [[ ${PV} == "9999" ]] ; then |
212 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
213 |
- inherit git-r3 |
214 |
-else |
215 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" |
216 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
217 |
-fi |
218 |
- |
219 |
-DESCRIPTION="kernel routing and traffic control utilities" |
220 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
221 |
- |
222 |
-LICENSE="GPL-2" |
223 |
-SLOT="0" |
224 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
225 |
- |
226 |
-# We could make libmnl optional, but it's tiny, so eh |
227 |
-RDEPEND=" |
228 |
- !net-misc/arpd |
229 |
- dev-libs/libbsd |
230 |
- !minimal? ( net-libs/libmnl ) |
231 |
- caps? ( sys-libs/libcap ) |
232 |
- elf? ( virtual/libelf ) |
233 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
234 |
- berkdb? ( sys-libs/db:= ) |
235 |
- atm? ( net-dialup/linux-atm ) |
236 |
- selinux? ( sys-libs/libselinux ) |
237 |
-" |
238 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
239 |
-DEPEND=" |
240 |
- ${RDEPEND} |
241 |
- >=sys-kernel/linux-headers-3.16 |
242 |
-" |
243 |
-BDEPEND=" |
244 |
- app-arch/xz-utils |
245 |
- >=sys-devel/bison-2.4 |
246 |
- sys-devel/flex |
247 |
- virtual/pkgconfig |
248 |
-" |
249 |
- |
250 |
-PATCHES=( |
251 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
252 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
253 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
254 |
- "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch |
255 |
-) |
256 |
- |
257 |
-src_prepare() { |
258 |
- if ! use ipv6 ; then |
259 |
- PATCHES+=( |
260 |
- "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 |
261 |
- ) |
262 |
- fi |
263 |
- |
264 |
- default |
265 |
- |
266 |
- # Fix version if necessary |
267 |
- local versionfile="include/version.h" |
268 |
- if ! grep -Fq "${PV}" ${versionfile} ; then |
269 |
- elog "Fixing version string" |
270 |
- sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ |
271 |
- -i ${versionfile} || die |
272 |
- fi |
273 |
- |
274 |
- # echo -n is not POSIX compliant |
275 |
- sed 's@echo -n@printf@' -i configure || die |
276 |
- |
277 |
- sed -i \ |
278 |
- -e '/^CC :\?=/d' \ |
279 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
280 |
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ |
281 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
282 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
283 |
- Makefile || die |
284 |
- |
285 |
- # build against system headers |
286 |
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
287 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
288 |
- |
289 |
- if use minimal ; then |
290 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
291 |
- fi |
292 |
-} |
293 |
- |
294 |
-src_configure() { |
295 |
- tc-export AR CC PKG_CONFIG |
296 |
- |
297 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
298 |
- local setns |
299 |
- pushd "${T}" >/dev/null |
300 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
301 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
302 |
- echo 'int main(){return 0;}' > test.c |
303 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
304 |
- popd >/dev/null |
305 |
- |
306 |
- # run "configure" script first which will create "config.mk"... |
307 |
- econf |
308 |
- |
309 |
- # ...now switch on/off requested features via USE flags |
310 |
- # this is only useful if the test did not set other things, per bug #643722 |
311 |
- cat <<-EOF >> config.mk |
312 |
- TC_CONFIG_ATM := $(usex atm y n) |
313 |
- TC_CONFIG_XT := $(usex iptables y n) |
314 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
315 |
- # We've locked in recent enough kernel headers #549948 |
316 |
- TC_CONFIG_IPSET := y |
317 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
318 |
- HAVE_CAP := $(usex caps y n) |
319 |
- HAVE_MNL := $(usex minimal n y) |
320 |
- HAVE_ELF := $(usex elf y n) |
321 |
- HAVE_SELINUX := $(usex selinux y n) |
322 |
- IP_CONFIG_SETNS := ${setns} |
323 |
- # Use correct iptables dir, #144265 #293709 |
324 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
325 |
- EOF |
326 |
-} |
327 |
- |
328 |
-src_compile() { |
329 |
- emake V=1 NETNS_RUN_DIR=/run/netns |
330 |
-} |
331 |
- |
332 |
-src_install() { |
333 |
- if use minimal ; then |
334 |
- into / |
335 |
- dosbin tc/tc |
336 |
- dobin ip/ip |
337 |
- return 0 |
338 |
- fi |
339 |
- |
340 |
- emake \ |
341 |
- DESTDIR="${D}" \ |
342 |
- PREFIX="${EPREFIX}/usr" \ |
343 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
344 |
- SBINDIR="${EPREFIX}"/sbin \ |
345 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
346 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
347 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
348 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
349 |
- install |
350 |
- |
351 |
- dodir /bin |
352 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
353 |
- |
354 |
- dolib.a lib/libnetlink.a |
355 |
- insinto /usr/include |
356 |
- doins include/libnetlink.h |
357 |
- # This local header pulls in a lot of linux headers it |
358 |
- # doesn't directly need. Delete this header that requires |
359 |
- # linux-headers-3.8 until that goes stable. #467716 |
360 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
361 |
- |
362 |
- if use berkdb ; then |
363 |
- keepdir /var/lib/arpd |
364 |
- # bug 47482, arpd doesn't need to be in /sbin |
365 |
- dodir /usr/bin |
366 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
367 |
- elif [[ -d "${ED}"/var/lib/arpd ]]; then |
368 |
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die |
369 |
- fi |
370 |
-} |