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: Thu, 04 Jun 2020 17:45:37
Message-Id: 1591291945.752f746729d4500ba48fa16f8f3214c14c3e0621.polynomial-c@gentoo
1 commit: 752f746729d4500ba48fa16f8f3214c14c3e0621
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 4 17:32:25 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 4 17:32:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752f7467
7
8 sys-apps/iproute2: Removed old
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/iproute2/Manifest | 1 -
14 sys-apps/iproute2/iproute2-5.5.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 5abe1ccdd6b..4c912c42931 100644
19 --- a/sys-apps/iproute2/Manifest
20 +++ b/sys-apps/iproute2/Manifest
21 @@ -1,6 +1,5 @@
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.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
25 -DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
26 DIST iproute2-5.6.0.tar.xz 754812 BLAKE2B 5232c206052dcbc489284cb5a4169bf2555f9bdf7c122e23be07f7a5a18e0c828f5b4f3bb4afb6d33919919d211c67a20626ad10556e4ae41f90619d6eed445f SHA512 e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c
27 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
28
29 diff --git a/sys-apps/iproute2/iproute2-5.5.0.ebuild b/sys-apps/iproute2/iproute2-5.5.0.ebuild
30 deleted file mode 100644
31 index 9e2e1f7f4e5..00000000000
32 --- a/sys-apps/iproute2/iproute2-5.5.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 -}