Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Mon, 27 Jan 2020 20:53:56
Message-Id: 1580158427.6488736665f9c6dffea792261a294ec5f6dc6326.polynomial-c@gentoo
1 commit: 6488736665f9c6dffea792261a294ec5f6dc6326
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 20:53:22 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 20:53:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64887366
7
8 sys-apps/iproute2: Removed old
9
10 Package-Manager: Portage-2.3.85, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/iproute2/Manifest | 1 -
14 sys-apps/iproute2/iproute2-5.3.0.ebuild | 162 --------------------------------
15 2 files changed, 163 deletions(-)
16
17 diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
18 index d03980eda6f..d211cffc4f0 100644
19 --- a/sys-apps/iproute2/Manifest
20 +++ b/sys-apps/iproute2/Manifest
21 @@ -1,5 +1,4 @@
22 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
23 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
24 -DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157
25 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
26 DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
27
28 diff --git a/sys-apps/iproute2/iproute2-5.3.0.ebuild b/sys-apps/iproute2/iproute2-5.3.0.ebuild
29 deleted file mode 100644
30 index 9d1acf39062..00000000000
31 --- a/sys-apps/iproute2/iproute2-5.3.0.ebuild
32 +++ /dev/null
33 @@ -1,162 +0,0 @@
34 -# Copyright 1999-2019 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 ~sh ~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 -)
85 -
86 -src_prepare() {
87 - if ! use ipv6 ; then
88 - PATCHES+=(
89 - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
90 - )
91 - fi
92 -
93 - default
94 -
95 - # echo -n is not POSIX compliant
96 - sed 's@echo -n@printf@' -i configure || die
97 -
98 - sed -i \
99 - -e '/^CC :\?=/d' \
100 - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
101 - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
102 - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
103 - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
104 - Makefile || die
105 -
106 - # Use /run instead of /var/run.
107 - sed -i \
108 - -e 's:/var/run:/run:g' \
109 - include/namespace.h \
110 - man/man8/ip-netns.8 || die
111 -
112 - # build against system headers
113 - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
114 - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
115 -
116 - if use minimal ; then
117 - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
118 - fi
119 -}
120 -
121 -src_configure() {
122 - tc-export AR CC PKG_CONFIG
123 -
124 - # This sure is ugly. Should probably move into toolchain-funcs at some point.
125 - local setns
126 - pushd "${T}" >/dev/null
127 - printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
128 - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
129 - echo 'int main(){return 0;}' > test.c
130 - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
131 - popd >/dev/null
132 -
133 - # run "configure" script first which will create "config.mk"...
134 - econf
135 -
136 - # ...now switch on/off requested features via USE flags
137 - # this is only useful if the test did not set other things, per bug #643722
138 - cat <<-EOF >> config.mk
139 - TC_CONFIG_ATM := $(usex atm y n)
140 - TC_CONFIG_XT := $(usex iptables y n)
141 - TC_CONFIG_NO_XT := $(usex iptables n y)
142 - # We've locked in recent enough kernel headers #549948
143 - TC_CONFIG_IPSET := y
144 - HAVE_BERKELEY_DB := $(usex berkdb y n)
145 - HAVE_CAP := $(usex caps y n)
146 - HAVE_MNL := $(usex minimal n y)
147 - HAVE_ELF := $(usex elf y n)
148 - HAVE_SELINUX := $(usex selinux y n)
149 - IP_CONFIG_SETNS := ${setns}
150 - # Use correct iptables dir, #144265 #293709
151 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
152 - EOF
153 -}
154 -
155 -src_compile() {
156 - emake V=1
157 -}
158 -
159 -src_install() {
160 - if use minimal ; then
161 - into /
162 - dosbin tc/tc
163 - dobin ip/ip
164 - return 0
165 - fi
166 -
167 - emake \
168 - DESTDIR="${D}" \
169 - PREFIX="${EPREFIX}/usr" \
170 - LIBDIR="${EPREFIX}"/$(get_libdir) \
171 - SBINDIR="${EPREFIX}"/sbin \
172 - CONFDIR="${EPREFIX}"/etc/iproute2 \
173 - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
174 - MANDIR="${EPREFIX}"/usr/share/man \
175 - ARPDDIR="${EPREFIX}"/var/lib/arpd \
176 - install
177 -
178 - dodir /bin
179 - mv "${ED}"/{s,}bin/ip || die #330115
180 -
181 - dolib.a lib/libnetlink.a
182 - insinto /usr/include
183 - doins include/libnetlink.h
184 - # This local header pulls in a lot of linux headers it
185 - # doesn't directly need. Delete this header that requires
186 - # linux-headers-3.8 until that goes stable. #467716
187 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
188 -
189 - if use berkdb ; then
190 - keepdir /var/lib/arpd
191 - # bug 47482, arpd doesn't need to be in /sbin
192 - dodir /usr/bin
193 - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
194 - fi
195 -}