Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/net-tools: metadata.xml ChangeLog net-tools-1.60_p201111202031570500.ebuild net-tools-9999.ebuild
Date: Mon, 21 Nov 2011 20:35:17
Message-Id: 20111121203450.10A1A2004B@flycatcher.gentoo.org
1 vapier 11/11/21 20:34:50
2
3 Modified: metadata.xml ChangeLog
4 Added: net-tools-1.60_p201111202031570500.ebuild
5 net-tools-9999.ebuild
6 Log:
7 Add USE=old-output to revert ifconfig output to old style #217775. Start a new live git ebuild.
8
9 (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.4 sys-apps/net-tools/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/metadata.xml?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/metadata.xml?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/metadata.xml?r1=1.3&r2=1.4
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/metadata.xml,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- metadata.xml 9 Dec 2003 17:41:25 -0000 1.3
25 +++ metadata.xml 21 Nov 2011 20:34:49 -0000 1.4
26 @@ -2,4 +2,7 @@
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 <herd>base-system</herd>
30 +<use>
31 + <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
32 +</use>
33 </pkgmetadata>
34
35
36
37 1.119 sys-apps/net-tools/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.119&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.119&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?r1=1.118&r2=1.119
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v
46 retrieving revision 1.118
47 retrieving revision 1.119
48 diff -u -r1.118 -r1.119
49 --- ChangeLog 23 Oct 2011 19:48:47 -0000 1.118
50 +++ ChangeLog 21 Nov 2011 20:34:49 -0000 1.119
51 @@ -1,6 +1,15 @@
52 # ChangeLog for sys-apps/net-tools
53 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.118 2011/10/23 19:48:47 grobian Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.119 2011/11/21 20:34:49 vapier Exp $
56 +
57 +*net-tools-9999 (21 Nov 2011)
58 +*net-tools-1.60_p201111202031570500 (21 Nov 2011)
59 +
60 + 21 Nov 2011; Mike Frysinger <vapier@g.o>
61 + +net-tools-1.60_p201111202031570500.ebuild, +net-tools-9999.ebuild,
62 + metadata.xml:
63 + Add USE=old-output to revert ifconfig output to old style #217775.
64 + Start a new live git ebuild.
65
66 23 Oct 2011; Fabian Groffen <grobian@g.o>
67 net-tools-1.60_p20110820045617.ebuild:
68
69
70
71 1.1 sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild?rev=1.1&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild?rev=1.1&content-type=text/plain
75
76 Index: net-tools-1.60_p201111202031570500.ebuild
77 ===================================================================
78 # Copyright 1999-2011 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 # $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild,v 1.1 2011/11/21 20:34:49 vapier Exp $
81
82 EAPI="3"
83
84 inherit flag-o-matic toolchain-funcs eutils
85
86 if [[ ${PV} == "9999" ]] ; then
87 EGIT_REPO_URL="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
88 inherit git-2
89 KEYWORDS=""
90 else
91 PATCH_VER="1"
92 SRC_URI="mirror://gentoo/${P}.tar.xz
93 mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
94 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
95 fi
96
97 DESCRIPTION="Standard Linux networking tools"
98 HOMEPAGE="http://net-tools.sourceforge.net/"
99
100 LICENSE="GPL-2"
101 SLOT="0"
102 IUSE="nls old-output static"
103
104 RDEPEND=""
105 DEPEND="${RDEPEND}
106 app-arch/xz-utils"
107
108 maint_pkg_create() {
109 cd /usr/local/src/net-tools/git
110 #git-update
111 local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
112 local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
113 local p="${PN}-${pv}"
114 git archive --prefix="nt/" master | tar xf - -C "${T}"
115 pushd "${T}" >/dev/null
116 pushd nt >/dev/null
117 sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
118 emake dist >/dev/null
119 popd >/dev/null
120 zcat ${p}.tar.gz | xz > ${p}.tar.xz
121 rm -f ${p}.tar.gz
122 popd >/dev/null
123
124 local patches="${p}-patches-${PATCH_VER:-1}"
125 local d="${T}/${patches}"
126 mkdir "${d}"
127 git format-patch -o "${d}" master..gentoo > /dev/null
128 echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
129 tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
130 rm -rf "${d}"
131
132 du -b "${T}"/*.tar.xz
133 }
134
135 pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
136
137 set_opt() {
138 local opt=$1 ans
139 shift
140 ans=$("$@" && echo y || echo n)
141 einfo "Setting option ${opt} to ${ans}"
142 sed -i \
143 -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
144 config.in || die
145 }
146
147 src_prepare() {
148 if [[ -n ${PATCH_VER} ]] ; then
149 use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
150 EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
151 fi
152 }
153
154 src_configure() {
155 set_opt I18N use nls
156 set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
157 if use static ; then
158 append-flags -static
159 append-ldflags -static
160 fi
161 tc-export AR CC
162 yes "" | ./configure.sh config.in || die
163 }
164
165 src_install() {
166 emake DESTDIR="${ED}" install || die
167 dodoc README README.ipv6 TODO
168 }
169
170 pkg_postinst() {
171 einfo "etherwake and such have been split into net-misc/ethercard-diag"
172 }
173
174
175
176 1.1 sys-apps/net-tools/net-tools-9999.ebuild
177
178 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.1&view=markup
179 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.1&content-type=text/plain
180
181 Index: net-tools-9999.ebuild
182 ===================================================================
183 # Copyright 1999-2011 Gentoo Foundation
184 # Distributed under the terms of the GNU General Public License v2
185 # $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.1 2011/11/21 20:34:49 vapier Exp $
186
187 EAPI="3"
188
189 inherit flag-o-matic toolchain-funcs eutils
190
191 if [[ ${PV} == "9999" ]] ; then
192 EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
193 inherit git-2
194 KEYWORDS=""
195 else
196 PATCH_VER="1"
197 SRC_URI="mirror://gentoo/${P}.tar.xz
198 mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
199 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
200 fi
201
202 DESCRIPTION="Standard Linux networking tools"
203 HOMEPAGE="http://net-tools.sourceforge.net/"
204
205 LICENSE="GPL-2"
206 SLOT="0"
207 IUSE="nls old-output static"
208
209 RDEPEND=""
210 DEPEND="${RDEPEND}
211 app-arch/xz-utils"
212
213 maint_pkg_create() {
214 cd /usr/local/src/net-tools/git
215 #git-update
216 local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
217 local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
218 local p="${PN}-${pv}"
219 git archive --prefix="nt/" master | tar xf - -C "${T}"
220 pushd "${T}" >/dev/null
221 pushd nt >/dev/null
222 sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
223 emake dist >/dev/null
224 popd >/dev/null
225 zcat ${p}.tar.gz | xz > ${p}.tar.xz
226 rm -f ${p}.tar.gz
227 popd >/dev/null
228
229 local patches="${p}-patches-${PATCH_VER:-1}"
230 local d="${T}/${patches}"
231 mkdir "${d}"
232 git format-patch -o "${d}" master..gentoo > /dev/null
233 echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
234 tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
235 rm -rf "${d}"
236
237 du -b "${T}"/*.tar.xz
238 }
239
240 pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
241
242 set_opt() {
243 local opt=$1 ans
244 shift
245 ans=$("$@" && echo y || echo n)
246 einfo "Setting option ${opt} to ${ans}"
247 sed -i \
248 -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
249 config.in || die
250 }
251
252 src_prepare() {
253 if [[ -n ${PATCH_VER} ]] ; then
254 use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
255 EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
256 fi
257 }
258
259 src_configure() {
260 set_opt I18N use nls
261 set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
262 if use static ; then
263 append-flags -static
264 append-ldflags -static
265 fi
266 tc-export AR CC
267 yes "" | ./configure.sh config.in || die
268 }
269
270 src_install() {
271 emake DESTDIR="${ED}" install || die
272 dodoc README README.ipv6 TODO
273 }
274
275 pkg_postinst() {
276 einfo "etherwake and such have been split into net-misc/ethercard-diag"
277 }
Report Message
Find on MARC Find on Google Groups