Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Sat, 22 Sep 2018 22:09:17
Message-Id: 1537654145.6d519368b0ac487239d931cabb1458d3fa8afee1.zlogene@gentoo
1 commit: 6d519368b0ac487239d931cabb1458d3fa8afee1
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 22 22:08:10 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 22 22:09:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d519368
7
8 sys-apps/iproute2: Drop old
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 sys-apps/iproute2/Manifest | 1 -
13 sys-apps/iproute2/iproute2-4.9.0.ebuild | 143 --------------------------------
14 2 files changed, 144 deletions(-)
15
16 diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
17 index ea7c4696ca0..376df83e778 100644
18 --- a/sys-apps/iproute2/Manifest
19 +++ b/sys-apps/iproute2/Manifest
20 @@ -2,4 +2,3 @@ DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe
21 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
22 DIST iproute2-4.18.0.tar.xz 692868 BLAKE2B ad40a5fa0aecb7c5eb98c3ee2b3a8da212c4b970ceb5f3781dcf961da249a70424a7c760f0f1a0a7fb2348efc9ac9ab3a9ac28fda3692d26001e2b3521493072 SHA512 c7c8e8e76c78faf63548da641769cf9f51811a308cd8eeec171f5f46423f116ff123033f11a554609825aba6d078c95dbbe36aa7ab23bd8d87b3a0d5100be1a9
23 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
24 -DIST iproute2-4.9.0.tar.xz 613032 BLAKE2B ae8b1bb4d39999e17b3930064e7f18407d0e9172567c2a95e50a0dbdccaeac59e4a880764b61dae9f814ba97092c1d5949e313cfe5d903dadfed26d9b17b03ec SHA512 0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889
25
26 diff --git a/sys-apps/iproute2/iproute2-4.9.0.ebuild b/sys-apps/iproute2/iproute2-4.9.0.ebuild
27 deleted file mode 100644
28 index 3e1bbf1eafb..00000000000
29 --- a/sys-apps/iproute2/iproute2-4.9.0.ebuild
30 +++ /dev/null
31 @@ -1,143 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -
37 -inherit eutils toolchain-funcs flag-o-matic multilib
38 -
39 -if [[ ${PV} == "9999" ]] ; then
40 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
41 - inherit git-r3
42 -else
43 - SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
44 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
45 -fi
46 -
47 -DESCRIPTION="kernel routing and traffic control utilities"
48 -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -IUSE="atm berkdb +iptables ipv6 minimal selinux"
53 -
54 -# We could make libmnl optional, but it's tiny, so eh
55 -RDEPEND="
56 - !net-misc/arpd
57 - !minimal? ( net-libs/libmnl virtual/libelf )
58 - iptables? ( >=net-firewall/iptables-1.4.20:= )
59 - berkdb? ( sys-libs/db:= )
60 - atm? ( net-dialup/linux-atm )
61 - selinux? ( sys-libs/libselinux )
62 -"
63 -# We require newer linux-headers for ipset support #549948 and some defines #553876
64 -DEPEND="
65 - ${RDEPEND}
66 - app-arch/xz-utils
67 - iptables? ( virtual/pkgconfig )
68 - >=sys-devel/bison-2.4
69 - sys-devel/flex
70 - >=sys-kernel/linux-headers-3.16
71 - elibc_glibc? ( >=sys-libs/glibc-2.7 )
72 -"
73 -
74 -PATCHES=(
75 - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
76 -)
77 -
78 -src_prepare() {
79 - if ! use ipv6 ; then
80 - PATCHES+=(
81 - "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
82 - )
83 - fi
84 -
85 - epatch "${PATCHES[@]}"
86 -
87 - sed -i \
88 - -e '/^CC :\?=/d' \
89 - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
90 - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
91 - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
92 - -e "/^WFLAGS/s:-Werror::" \
93 - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
94 - Makefile || die
95 -
96 - # Use /run instead of /var/run.
97 - sed -i \
98 - -e 's:/var/run:/run:g' \
99 - include/namespace.h \
100 - man/man8/ip-netns.8 || die
101 -
102 - # build against system headers
103 - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
104 - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
105 -
106 - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
107 -}
108 -
109 -src_configure() {
110 - tc-export AR CC PKG_CONFIG
111 -
112 - # This sure is ugly. Should probably move into toolchain-funcs at some point.
113 - local setns
114 - pushd "${T}" >/dev/null
115 - printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
116 - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
117 - echo 'int main(){return 0;}' > test.c
118 - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
119 - popd >/dev/null
120 -
121 - cat <<-EOF > Config
122 - TC_CONFIG_ATM := $(usex atm y n)
123 - TC_CONFIG_XT := $(usex iptables y n)
124 - TC_CONFIG_NO_XT := $(usex iptables n y)
125 - # We've locked in recent enough kernel headers #549948
126 - TC_CONFIG_IPSET := y
127 - HAVE_BERKELEY_DB := $(usex berkdb y n)
128 - HAVE_MNL := $(usex minimal n y)
129 - HAVE_ELF := $(usex minimal n y)
130 - HAVE_SELINUX := $(usex selinux y n)
131 - IP_CONFIG_SETNS := ${setns}
132 - # Use correct iptables dir, #144265 #293709
133 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
134 - EOF
135 -}
136 -
137 -src_install() {
138 - if use minimal ; then
139 - into /
140 - dosbin tc/tc
141 - dobin ip/ip
142 - return 0
143 - fi
144 -
145 - emake \
146 - DESTDIR="${D}" \
147 - LIBDIR="${EPREFIX}"/$(get_libdir) \
148 - SBINDIR="${EPREFIX}"/sbin \
149 - CONFDIR="${EPREFIX}"/etc/iproute2 \
150 - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
151 - MANDIR="${EPREFIX}"/usr/share/man \
152 - ARPDDIR="${EPREFIX}"/var/lib/arpd \
153 - install
154 -
155 - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
156 -
157 - dodir /bin
158 - mv "${ED}"/{s,}bin/ip || die #330115
159 -
160 - dolib.a lib/libnetlink.a
161 - insinto /usr/include
162 - doins include/libnetlink.h
163 - # This local header pulls in a lot of linux headers it
164 - # doesn't directly need. Delete this header that requires
165 - # linux-headers-3.8 until that goes stable. #467716
166 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
167 -
168 - if use berkdb ; then
169 - dodir /var/lib/arpd
170 - # bug 47482, arpd doesn't need to be in /sbin
171 - dodir /usr/bin
172 - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
173 - fi
174 -}