Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/iproute2: ChangeLog iproute2-3.17.0.ebuild
Date: Sat, 01 Nov 2014 05:56:49
Message-Id: 20141101055645.A1D9D2E35@oystercatcher.gentoo.org
1 radhermit 14/11/01 05:56:45
2
3 Modified: ChangeLog
4 Added: iproute2-3.17.0.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.235 sys-apps/iproute2/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.235&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.235&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.234&r2=1.235
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v
20 retrieving revision 1.234
21 retrieving revision 1.235
22 diff -u -r1.234 -r1.235
23 --- ChangeLog 27 Aug 2014 00:40:17 -0000 1.234
24 +++ ChangeLog 1 Nov 2014 05:56:45 -0000 1.235
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sys-apps/iproute2
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.234 2014/08/27 00:40:17 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.235 2014/11/01 05:56:45 radhermit Exp $
30 +
31 +*iproute2-3.17.0 (01 Nov 2014)
32 +
33 + 01 Nov 2014; Tim Harder <radhermit@g.o> +iproute2-3.17.0.ebuild:
34 + Version bump.
35
36 *iproute2-3.16.0-r1 (27 Aug 2014)
37
38
39
40
41 1.1 sys-apps/iproute2/iproute2-3.17.0.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-3.17.0.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-3.17.0.ebuild?rev=1.1&content-type=text/plain
45
46 Index: iproute2-3.17.0.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.17.0.ebuild,v 1.1 2014/11/01 05:56:45 radhermit Exp $
51
52 EAPI="5"
53
54 inherit eutils toolchain-funcs flag-o-matic multilib
55
56 if [[ ${PV} == "9999" ]] ; then
57 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
58 inherit git-2
59 else
60 SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
61 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
62 fi
63
64 DESCRIPTION="kernel routing and traffic control utilities"
65 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
66
67 LICENSE="GPL-2"
68 SLOT="0"
69 IUSE="atm berkdb +iptables ipv6 minimal selinux"
70
71 RDEPEND="!net-misc/arpd
72 iptables? ( >=net-firewall/iptables-1.4.20:= )
73 !minimal? ( berkdb? ( sys-libs/db ) )
74 atm? ( net-dialup/linux-atm )
75 selinux? ( sys-libs/libselinux )"
76 DEPEND="${RDEPEND}
77 app-arch/xz-utils
78 iptables? ( virtual/pkgconfig )
79 sys-devel/bison
80 sys-devel/flex
81 >=sys-kernel/linux-headers-2.6.27
82 elibc_glibc? ( >=sys-libs/glibc-2.7 )"
83
84 src_prepare() {
85 epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
86 use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
87
88 sed -i \
89 -e '/^CC =/d' \
90 -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
91 -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
92 -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
93 -e "/^WFLAGS/s:-Werror::" \
94 -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
95 Makefile || die
96
97 # Use /run instead of /var/run.
98 sed -i \
99 -e 's:/var/run:/run:g' \
100 ip/ipnetns.c \
101 man/man8/ip-netns.8 || die
102
103 # build against system headers
104 rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
105 sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
106
107 # don't build arpd if USE=-berkdb #81660
108 use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
109
110 use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
111 }
112
113 src_configure() {
114 tc-export AR CC PKG_CONFIG
115
116 # This sure is ugly. Should probably move into toolchain-funcs at some point.
117 local setns
118 pushd "${T}" >/dev/null
119 echo 'main(){return setns();};' > test.c
120 ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
121 echo 'main(){};' > test.c
122 ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
123 popd >/dev/null
124
125 cat <<-EOF > Config
126 TC_CONFIG_ATM := $(usex atm y n)
127 TC_CONFIG_XT := $(usex iptables y n)
128 HAVE_SELINUX := $(usex selinux y n)
129 IP_CONFIG_SETNS := ${setns}
130 # Use correct iptables dir, #144265 #293709
131 IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
132 EOF
133 }
134
135 src_install() {
136 if use minimal ; then
137 into /
138 dosbin tc/tc
139 return 0
140 fi
141
142 emake \
143 DESTDIR="${D}" \
144 LIBDIR="${EPREFIX}"/$(get_libdir) \
145 SBINDIR="${EPREFIX}"/sbin \
146 CONFDIR="${EPREFIX}"/etc/iproute2 \
147 DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
148 MANDIR="${EPREFIX}"/usr/share/man \
149 ARPDDIR="${EPREFIX}"/var/lib/arpd \
150 install
151
152 rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
153
154 dodir /bin
155 mv "${ED}"/{s,}bin/ip || die #330115
156
157 dolib.a lib/libnetlink.a
158 insinto /usr/include
159 doins include/libnetlink.h
160 # This local header pulls in a lot of linux headers it
161 # doesn't directly need. Delete this header that requires
162 # linux-headers-3.8 until that goes stable. #467716
163 sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
164
165 if use berkdb ; then
166 dodir /var/lib/arpd
167 # bug 47482, arpd doesn't need to be in /sbin
168 dodir /usr/bin
169 mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
170 fi
171 }