1 |
commit: 469e9c573f9a7773aead7c4c70c267301e3bbe87 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 28 08:19:36 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 28 08:19:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469e9c57 |
7 |
|
8 |
sys-apps/iproute2: Drop old |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
sys-apps/iproute2/Manifest | 2 - |
14 |
sys-apps/iproute2/iproute2-4.18.0-r1.ebuild | 153 ---------------------------- |
15 |
sys-apps/iproute2/iproute2-4.4.0.ebuild | 133 ------------------------ |
16 |
3 files changed, 288 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
19 |
index da65ca3058c..0c3e61bbdad 100644 |
20 |
--- a/sys-apps/iproute2/Manifest |
21 |
+++ b/sys-apps/iproute2/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c |
24 |
DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 |
25 |
-DIST iproute2-4.18.0.tar.xz 692868 BLAKE2B ad40a5fa0aecb7c5eb98c3ee2b3a8da212c4b970ceb5f3781dcf961da249a70424a7c760f0f1a0a7fb2348efc9ac9ab3a9ac28fda3692d26001e2b3521493072 SHA512 c7c8e8e76c78faf63548da641769cf9f51811a308cd8eeec171f5f46423f116ff123033f11a554609825aba6d078c95dbbe36aa7ab23bd8d87b3a0d5100be1a9 |
26 |
DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8 |
27 |
-DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 |
28 |
|
29 |
diff --git a/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index fe34c36583b..00000000000 |
32 |
--- a/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,153 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-inherit toolchain-funcs flag-o-matic multilib |
41 |
- |
42 |
-if [[ ${PV} == "9999" ]] ; then |
43 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
44 |
- inherit git-r3 |
45 |
-else |
46 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
47 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 |
- !minimal? ( net-libs/libmnl ) |
61 |
- caps? ( sys-libs/libcap ) |
62 |
- elf? ( virtual/libelf ) |
63 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
64 |
- berkdb? ( sys-libs/db:= ) |
65 |
- atm? ( net-dialup/linux-atm ) |
66 |
- selinux? ( sys-libs/libselinux ) |
67 |
-" |
68 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
69 |
-DEPEND=" |
70 |
- ${RDEPEND} |
71 |
- app-arch/xz-utils |
72 |
- iptables? ( virtual/pkgconfig ) |
73 |
- >=sys-devel/bison-2.4 |
74 |
- sys-devel/flex |
75 |
- >=sys-kernel/linux-headers-3.16 |
76 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
77 |
-" |
78 |
- |
79 |
-PATCHES=( |
80 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
81 |
- "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 |
82 |
-) |
83 |
- |
84 |
-src_prepare() { |
85 |
- if ! use ipv6 ; then |
86 |
- PATCHES+=( |
87 |
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 |
88 |
- ) |
89 |
- fi |
90 |
- |
91 |
- default |
92 |
- |
93 |
- sed -i \ |
94 |
- -e '/^CC :\?=/d' \ |
95 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
96 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
97 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
98 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
99 |
- Makefile || die |
100 |
- |
101 |
- # Use /run instead of /var/run. |
102 |
- sed -i \ |
103 |
- -e 's:/var/run:/run:g' \ |
104 |
- include/namespace.h \ |
105 |
- man/man8/ip-netns.8 || die |
106 |
- |
107 |
- # build against system headers |
108 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
109 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
110 |
- |
111 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- tc-export AR CC PKG_CONFIG |
116 |
- |
117 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
118 |
- local setns |
119 |
- pushd "${T}" >/dev/null |
120 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
121 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
122 |
- echo 'int main(){return 0;}' > test.c |
123 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
124 |
- popd >/dev/null |
125 |
- |
126 |
- # run "configure" script first which will create "config.mk"... |
127 |
- econf |
128 |
- |
129 |
- # ...now switch on/off requested features via USE flags |
130 |
- # this is only useful if the test did not set other things, per bug #643722 |
131 |
- cat <<-EOF >> config.mk |
132 |
- TC_CONFIG_ATM := $(usex atm y n) |
133 |
- TC_CONFIG_XT := $(usex iptables y n) |
134 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
135 |
- # We've locked in recent enough kernel headers #549948 |
136 |
- TC_CONFIG_IPSET := y |
137 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
138 |
- HAVE_CAP := $(usex caps y n) |
139 |
- HAVE_MNL := $(usex minimal n y) |
140 |
- HAVE_ELF := $(usex elf y n) |
141 |
- HAVE_SELINUX := $(usex selinux y n) |
142 |
- IP_CONFIG_SETNS := ${setns} |
143 |
- # Use correct iptables dir, #144265 #293709 |
144 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
145 |
- EOF |
146 |
-} |
147 |
- |
148 |
-src_compile() { |
149 |
- emake V=1 |
150 |
-} |
151 |
- |
152 |
-src_install() { |
153 |
- if use minimal ; then |
154 |
- into / |
155 |
- dosbin tc/tc |
156 |
- dobin ip/ip |
157 |
- return 0 |
158 |
- fi |
159 |
- |
160 |
- emake \ |
161 |
- DESTDIR="${D}" \ |
162 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
163 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
164 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
165 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
166 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
167 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
168 |
- install |
169 |
- |
170 |
- dodir /bin |
171 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
172 |
- |
173 |
- dolib.a lib/libnetlink.a |
174 |
- insinto /usr/include |
175 |
- doins include/libnetlink.h |
176 |
- # This local header pulls in a lot of linux headers it |
177 |
- # doesn't directly need. Delete this header that requires |
178 |
- # linux-headers-3.8 until that goes stable. #467716 |
179 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
180 |
- |
181 |
- if use berkdb ; then |
182 |
- dodir /var/lib/arpd |
183 |
- # bug 47482, arpd doesn't need to be in /sbin |
184 |
- dodir /usr/bin |
185 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
186 |
- fi |
187 |
-} |
188 |
|
189 |
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild |
190 |
deleted file mode 100644 |
191 |
index 496c5efbf75..00000000000 |
192 |
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild |
193 |
+++ /dev/null |
194 |
@@ -1,133 +0,0 @@ |
195 |
-# Copyright 1999-2018 Gentoo Foundation |
196 |
-# Distributed under the terms of the GNU General Public License v2 |
197 |
- |
198 |
-EAPI="5" |
199 |
- |
200 |
-inherit eutils toolchain-funcs flag-o-matic multilib |
201 |
- |
202 |
-if [[ ${PV} == "9999" ]] ; then |
203 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
204 |
- inherit git-r3 |
205 |
-else |
206 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
207 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
208 |
-fi |
209 |
- |
210 |
-DESCRIPTION="kernel routing and traffic control utilities" |
211 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
212 |
- |
213 |
-LICENSE="GPL-2" |
214 |
-SLOT="0" |
215 |
-IUSE="atm berkdb +iptables ipv6 minimal selinux" |
216 |
- |
217 |
-# We could make libmnl optional, but it's tiny, so eh |
218 |
-RDEPEND=" |
219 |
- !net-misc/arpd |
220 |
- !minimal? ( net-libs/libmnl virtual/libelf ) |
221 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
222 |
- berkdb? ( sys-libs/db:= ) |
223 |
- atm? ( net-dialup/linux-atm ) |
224 |
- selinux? ( sys-libs/libselinux ) |
225 |
-" |
226 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
227 |
-DEPEND=" |
228 |
- ${RDEPEND} |
229 |
- app-arch/xz-utils |
230 |
- iptables? ( virtual/pkgconfig ) |
231 |
- >=sys-devel/bison-2.4 |
232 |
- sys-devel/flex |
233 |
- >=sys-kernel/linux-headers-3.16 |
234 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
235 |
-" |
236 |
- |
237 |
-src_prepare() { |
238 |
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
239 |
- use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 |
240 |
- |
241 |
- sed -i \ |
242 |
- -e '/^CC :\?=/d' \ |
243 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
244 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
245 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
246 |
- -e "/^WFLAGS/s:-Werror::" \ |
247 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
248 |
- Makefile || die |
249 |
- |
250 |
- # Use /run instead of /var/run. |
251 |
- sed -i \ |
252 |
- -e 's:/var/run:/run:g' \ |
253 |
- include/namespace.h \ |
254 |
- man/man8/ip-netns.8 || die |
255 |
- |
256 |
- # build against system headers |
257 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
258 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
259 |
- |
260 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
261 |
-} |
262 |
- |
263 |
-src_configure() { |
264 |
- tc-export AR CC PKG_CONFIG |
265 |
- |
266 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
267 |
- local setns |
268 |
- pushd "${T}" >/dev/null |
269 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
270 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
271 |
- echo 'int main(){return 0;}' > test.c |
272 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
273 |
- popd >/dev/null |
274 |
- |
275 |
- cat <<-EOF > Config |
276 |
- TC_CONFIG_ATM := $(usex atm y n) |
277 |
- TC_CONFIG_XT := $(usex iptables y n) |
278 |
- # We've locked in recent enough kernel headers #549948 |
279 |
- TC_CONFIG_IPSET := y |
280 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
281 |
- HAVE_MNL := $(usex minimal n y) |
282 |
- HAVE_ELF := $(usex minimal n y) |
283 |
- HAVE_SELINUX := $(usex selinux y n) |
284 |
- IP_CONFIG_SETNS := ${setns} |
285 |
- # Use correct iptables dir, #144265 #293709 |
286 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
287 |
- EOF |
288 |
-} |
289 |
- |
290 |
-src_install() { |
291 |
- if use minimal ; then |
292 |
- into / |
293 |
- dosbin tc/tc |
294 |
- dobin ip/ip |
295 |
- return 0 |
296 |
- fi |
297 |
- |
298 |
- emake \ |
299 |
- DESTDIR="${D}" \ |
300 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
301 |
- SBINDIR="${EPREFIX}"/sbin \ |
302 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
303 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
304 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
305 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
306 |
- install |
307 |
- |
308 |
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 |
309 |
- |
310 |
- dodir /bin |
311 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
312 |
- |
313 |
- dolib.a lib/libnetlink.a |
314 |
- insinto /usr/include |
315 |
- doins include/libnetlink.h |
316 |
- # This local header pulls in a lot of linux headers it |
317 |
- # doesn't directly need. Delete this header that requires |
318 |
- # linux-headers-3.8 until that goes stable. #467716 |
319 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
320 |
- |
321 |
- if use berkdb ; then |
322 |
- dodir /var/lib/arpd |
323 |
- # bug 47482, arpd doesn't need to be in /sbin |
324 |
- dodir /usr/bin |
325 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
326 |
- fi |
327 |
-} |