Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/iproute2: ChangeLog iproute2-2.6.24.20080108.ebuild
Date: Sat, 29 Mar 2008 17:26:17
Message-Id: E1Jfeop-0005oU-6S@stork.gentoo.org
1 vapier 08/03/29 17:26:15
2
3 Modified: ChangeLog
4 Added: iproute2-2.6.24.20080108.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_pre5)
8
9 Revision Changes Path
10 1.104 sys-apps/iproute2/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.104&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.104&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.103&r2=1.104
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v
19 retrieving revision 1.103
20 retrieving revision 1.104
21 diff -u -r1.103 -r1.104
22 --- ChangeLog 16 Mar 2008 08:33:47 -0000 1.103
23 +++ ChangeLog 29 Mar 2008 17:26:14 -0000 1.104
24 @@ -1,6 +1,12 @@
25 # ChangeLog for sys-apps/iproute2
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.103 2008/03/16 08:33:47 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.104 2008/03/29 17:26:14 vapier Exp $
29 +
30 +*iproute2-2.6.24.20080108 (29 Mar 2008)
31 +
32 + 29 Mar 2008; Mike Frysinger <vapier@g.o>
33 + +iproute2-2.6.24.20080108.ebuild:
34 + Version bump.
35
36 *iproute2-2.6.23.20071016 (16 Mar 2008)
37
38
39
40
41 1.1 sys-apps/iproute2/iproute2-2.6.24.20080108.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/iproute2-2.6.24.20080108.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/iproute2-2.6.24.20080108.ebuild?rev=1.1&content-type=text/plain
45
46 Index: iproute2-2.6.24.20080108.ebuild
47 ===================================================================
48 # Copyright 1999-2008 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.24.20080108.ebuild,v 1.1 2008/03/29 17:26:14 vapier Exp $
51
52 inherit eutils toolchain-funcs
53
54 MY_PV="${PV%.*}-rc7"
55 SNAP=${PV##*.}
56 SNAP=${SNAP:2}
57 MY_P="${PN}-${MY_PV}"
58 DESCRIPTION="kernel routing and traffic control utilities"
59 HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
60 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
61
62 LICENSE="GPL-2"
63 SLOT="0"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
65 IUSE="atm berkdb minimal"
66
67 RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
68 atm? ( net-dialup/linux-atm )"
69 DEPEND="${RDEPEND}
70 >=virtual/os-headers-2.4.21"
71
72 S=${WORKDIR}/${MY_P}
73
74 src_unpack() {
75 unpack ${A}
76 cd "${S}"
77 sed -i "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
78
79 epatch "${FILESDIR}"/${PN}-2.6.16.20060323-build.patch #137574
80
81 local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
82 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
83 EPATCH_SOURCE=${base}/${CTARGET}/${check}
84 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
85 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
86 if [[ -d ${EPATCH_SOURCE} ]] ; then
87 EPATCH_SUFFIX="patch"
88 EPATCH_FORCE="yes" \
89 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
90 epatch
91 break
92 fi
93 done
94
95 # don't build arpd if USE=-berkdb #81660
96 use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
97 # Multilib fixes
98 sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h
99 sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
100 netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h || die
101 # Use correct iptables dir, #144265.
102 sed -i "s:/usr/local/lib/iptables:/$(get_libdir)/iptables:g" \
103 include/iptables.h
104 }
105
106 src_compile() {
107 echo -n 'TC_CONFIG_ATM:=' > Config
108 use atm \
109 && echo 'y' >> Config \
110 || echo 'n' >> Config
111
112 use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
113 emake \
114 CC="$(tc-getCC)" \
115 AR="$(tc-getAR)" \
116 || die "make"
117 }
118
119 src_install() {
120 if use minimal ; then
121 into /
122 dosbin tc/tc || die "minimal"
123 return 0
124 fi
125
126 emake \
127 DESTDIR="${D}" \
128 SBINDIR=/sbin \
129 DOCDIR=/usr/share/doc/${PF} \
130 install \
131 || die "make install failed"
132 if use berkdb ; then
133 dodir /var/lib/arpd
134 # bug 47482, arpd doesn't need to be in /sbin
135 dodir /usr/sbin
136 mv "${D}"/sbin/arpd "${D}"/usr/sbin/
137 fi
138 }
139
140
141
142 --
143 gentoo-commits@l.g.o mailing list