1 |
commit: 7481ca5e9a46a81065c87e718f02c5c3d1f180d2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 23 00:20:29 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 23 00:20:38 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7481ca5e |
7 |
|
8 |
sys-apps/iproute2: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-apps/iproute2/Manifest | 1 - |
14 |
sys-apps/iproute2/iproute2-5.8.0.ebuild | 159 -------------------------------- |
15 |
2 files changed, 160 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
18 |
index 99cf8f8afef..6aee22e27ce 100644 |
19 |
--- a/sys-apps/iproute2/Manifest |
20 |
+++ b/sys-apps/iproute2/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 |
23 |
DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051 |
24 |
DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 |
25 |
-DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 |
26 |
DIST iproute2-5.9.0.tar.xz 786524 BLAKE2B 9d82cfb1b1353d2cc6c441269af234b05e1ccd190a58c67f890d74fb42b4266be91ce64277bd2b75a0b711977c0f9edc61d8655bf262d05aaebd8d73caecc0c7 SHA512 bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50 |
27 |
|
28 |
diff --git a/sys-apps/iproute2/iproute2-5.8.0.ebuild b/sys-apps/iproute2/iproute2-5.8.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 6a78d7f40fb..00000000000 |
31 |
--- a/sys-apps/iproute2/iproute2-5.8.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,159 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit toolchain-funcs flag-o-matic multilib |
40 |
- |
41 |
-if [[ ${PV} == "9999" ]] ; then |
42 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
43 |
- inherit git-r3 |
44 |
-else |
45 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" |
46 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
47 |
-fi |
48 |
- |
49 |
-DESCRIPTION="kernel routing and traffic control utilities" |
50 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
55 |
- |
56 |
-# We could make libmnl optional, but it's tiny, so eh |
57 |
-RDEPEND=" |
58 |
- !net-misc/arpd |
59 |
- dev-libs/libbsd |
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 |
- >=sys-kernel/linux-headers-3.16 |
72 |
-" |
73 |
-BDEPEND=" |
74 |
- app-arch/xz-utils |
75 |
- >=sys-devel/bison-2.4 |
76 |
- sys-devel/flex |
77 |
- virtual/pkgconfig |
78 |
-" |
79 |
- |
80 |
-PATCHES=( |
81 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
82 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
83 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
84 |
- "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.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 |
- # build against system headers |
108 |
- rm -r include/netinet || die #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 |
- if use minimal ; then |
112 |
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die |
113 |
- fi |
114 |
-} |
115 |
- |
116 |
-src_configure() { |
117 |
- tc-export AR CC PKG_CONFIG |
118 |
- |
119 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
120 |
- local setns |
121 |
- pushd "${T}" >/dev/null |
122 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
123 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
124 |
- echo 'int main(){return 0;}' > test.c |
125 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
126 |
- popd >/dev/null |
127 |
- |
128 |
- # run "configure" script first which will create "config.mk"... |
129 |
- econf |
130 |
- |
131 |
- # ...now switch on/off requested features via USE flags |
132 |
- # this is only useful if the test did not set other things, per bug #643722 |
133 |
- cat <<-EOF >> config.mk |
134 |
- TC_CONFIG_ATM := $(usex atm y n) |
135 |
- TC_CONFIG_XT := $(usex iptables y n) |
136 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
137 |
- # We've locked in recent enough kernel headers #549948 |
138 |
- TC_CONFIG_IPSET := y |
139 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
140 |
- HAVE_CAP := $(usex caps y n) |
141 |
- HAVE_MNL := $(usex minimal n y) |
142 |
- HAVE_ELF := $(usex elf y n) |
143 |
- HAVE_SELINUX := $(usex selinux y n) |
144 |
- IP_CONFIG_SETNS := ${setns} |
145 |
- # Use correct iptables dir, #144265 #293709 |
146 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
147 |
- EOF |
148 |
-} |
149 |
- |
150 |
-src_compile() { |
151 |
- emake V=1 NETNS_RUN_DIR=/run/netns |
152 |
-} |
153 |
- |
154 |
-src_install() { |
155 |
- if use minimal ; then |
156 |
- into / |
157 |
- dosbin tc/tc |
158 |
- dobin ip/ip |
159 |
- return 0 |
160 |
- fi |
161 |
- |
162 |
- emake \ |
163 |
- DESTDIR="${D}" \ |
164 |
- PREFIX="${EPREFIX}/usr" \ |
165 |
- LIBDIR="${EPREFIX}"/$(get_libdir) \ |
166 |
- SBINDIR="${EPREFIX}"/sbin \ |
167 |
- CONFDIR="${EPREFIX}"/etc/iproute2 \ |
168 |
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
169 |
- MANDIR="${EPREFIX}"/usr/share/man \ |
170 |
- ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
171 |
- install |
172 |
- |
173 |
- dodir /bin |
174 |
- mv "${ED}"/{s,}bin/ip || die #330115 |
175 |
- |
176 |
- dolib.a lib/libnetlink.a |
177 |
- insinto /usr/include |
178 |
- doins include/libnetlink.h |
179 |
- # This local header pulls in a lot of linux headers it |
180 |
- # doesn't directly need. Delete this header that requires |
181 |
- # linux-headers-3.8 until that goes stable. #467716 |
182 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
183 |
- |
184 |
- if use berkdb ; then |
185 |
- keepdir /var/lib/arpd |
186 |
- # bug 47482, arpd doesn't need to be in /sbin |
187 |
- dodir /usr/bin |
188 |
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
189 |
- elif [[ -d "${ED}"/var/lib/arpd ]]; then |
190 |
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die |
191 |
- fi |
192 |
-} |