Gentoo Archives: gentoo-commits

From: "Agostino Sarubbo (ago)" <ago@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-user: qemu-user-1.1.0-r1.ebuild qemu-user-1.0.ebuild qemu-user-9999.ebuild ChangeLog
Date: Thu, 22 Nov 2012 18:47:41
Message-Id: 20121122184725.6C6EC20C65@flycatcher.gentoo.org
1 ago 12/11/22 18:47:25
2
3 Modified: qemu-user-1.1.0-r1.ebuild qemu-user-1.0.ebuild
4 qemu-user-9999.ebuild ChangeLog
5 Log:
6 remove redundant cd and minor cleanup
7
8 (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.4 app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild?r1=1.3&r2=1.4
16
17 Index: qemu-user-1.1.0-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- qemu-user-1.1.0-r1.ebuild 12 Sep 2012 19:14:11 -0000 1.3
24 +++ qemu-user-1.1.0-r1.ebuild 22 Nov 2012 18:47:25 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild,v 1.3 2012/09/12 19:14:11 lu_zero Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild,v 1.4 2012/11/22 18:47:25 ago Exp $
30
31 EAPI=4
32
33 @@ -79,12 +79,11 @@
34 }
35
36 src_prepare() {
37 - cd "${S}"
38 # prevent docs to get automatically installed
39 - sed -i '/$(DESTDIR)$(docdir)/d' Makefile
40 + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
41 # Alter target makefiles to accept CFLAGS set via flag-o
42 sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
43 - Makefile Makefile.target
44 + Makefile Makefile.target || die
45
46 EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
47 EPATCH_FORCE="yes" epatch
48 @@ -117,12 +116,8 @@
49 ./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed"
50 }
51
52 -src_compile() {
53 - emake || die "emake qemu failed"
54 -}
55 -
56 src_install() {
57 - emake DESTDIR="${ED}" install || die "make install failed"
58 + emake DESTDIR="${ED}" install
59
60 # fixup to avoid collisions with qemu
61 base_dir="${ED}/usr/bin"
62 @@ -133,7 +128,6 @@
63
64 pax-mark r "${ED}"/usr/bin/qemu-static-*
65 rm -fr "${ED}/usr/share" "${ED}/usr/libexec" "${ED}/etc"
66 - dohtml qemu-doc.html
67 - dohtml qemu-tech.html
68 + dohtml qemu-doc.html qemu-tech.html
69 newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
70 }
71
72
73
74 1.4 app-emulation/qemu-user/qemu-user-1.0.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild?rev=1.4&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild?rev=1.4&content-type=text/plain
78 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild?r1=1.3&r2=1.4
79
80 Index: qemu-user-1.0.ebuild
81 ===================================================================
82 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild,v
83 retrieving revision 1.3
84 retrieving revision 1.4
85 diff -u -r1.3 -r1.4
86 --- qemu-user-1.0.ebuild 3 May 2012 18:49:08 -0000 1.3
87 +++ qemu-user-1.0.ebuild 22 Nov 2012 18:47:25 -0000 1.4
88 @@ -1,6 +1,6 @@
89 # Copyright 1999-2012 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License v2
91 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild,v 1.3 2012/05/03 18:49:08 jdhore Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild,v 1.4 2012/11/22 18:47:25 ago Exp $
93
94 EAPI=4
95
96 @@ -66,12 +66,11 @@
97 S="${WORKDIR}/${MY_P}"
98
99 src_prepare() {
100 - cd "${S}"
101 # prevent docs to get automatically installed
102 - sed -i '/$(DESTDIR)$(docdir)/d' Makefile
103 + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
104 # Alter target makefiles to accept CFLAGS set via flag-o
105 sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
106 - Makefile Makefile.target
107 + Makefile Makefile.target || die
108
109 EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
110 EPATCH_FORCE="yes" epatch
111 @@ -104,12 +103,8 @@
112 ./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed"
113 }
114
115 -src_compile() {
116 - emake || die "emake qemu failed"
117 -}
118 -
119 src_install() {
120 - emake DESTDIR="${ED}" install || die "make install failed"
121 + emake DESTDIR="${ED}" install
122
123 # fixup to avoid collisions with qemu
124 base_dir="${ED}/usr/bin"
125 @@ -120,7 +115,6 @@
126
127 pax-mark r "${ED}"/usr/bin/qemu-static-*
128 rm -fr "${ED}/usr/share"
129 - dohtml qemu-doc.html
130 - dohtml qemu-tech.html
131 + dohtml qemu-doc.html qemu-tech.html
132 newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
133 }
134
135
136
137 1.4 app-emulation/qemu-user/qemu-user-9999.ebuild
138
139 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?rev=1.4&view=markup
140 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?rev=1.4&content-type=text/plain
141 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?r1=1.3&r2=1.4
142
143 Index: qemu-user-9999.ebuild
144 ===================================================================
145 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v
146 retrieving revision 1.3
147 retrieving revision 1.4
148 diff -u -r1.3 -r1.4
149 --- qemu-user-9999.ebuild 22 Jun 2012 13:52:59 -0000 1.3
150 +++ qemu-user-9999.ebuild 22 Nov 2012 18:47:25 -0000 1.4
151 @@ -1,6 +1,6 @@
152 # Copyright 1999-2012 Gentoo Foundation
153 # Distributed under the terms of the GNU General Public License v2
154 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.3 2012/06/22 13:52:59 lu_zero Exp $
155 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.4 2012/11/22 18:47:25 ago Exp $
156
157 EAPI=4
158
159 @@ -73,12 +73,11 @@
160 "
161
162 src_prepare() {
163 - cd "${S}"
164 # prevent docs to get automatically installed
165 - sed -i '/$(DESTDIR)$(docdir)/d' Makefile
166 + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
167 # Alter target makefiles to accept CFLAGS set via flag-o
168 sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
169 - Makefile Makefile.target
170 + Makefile Makefile.target || die
171
172 EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
173 EPATCH_FORCE="yes" epatch
174 @@ -111,12 +110,8 @@
175 ./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed"
176 }
177
178 -src_compile() {
179 - emake || die "emake qemu failed"
180 -}
181 -
182 src_install() {
183 - emake DESTDIR="${ED}" install || die "make install failed"
184 + emake DESTDIR="${ED}" install
185
186 # fixup to avoid collisions with qemu
187 base_dir="${ED}/usr/bin"
188 @@ -127,7 +122,6 @@
189
190 pax-mark r "${ED}"/usr/bin/qemu-static-*
191 rm -fr "${ED}/usr/share"
192 - dohtml qemu-doc.html
193 - dohtml qemu-tech.html
194 + dohtml qemu-doc.html qemu-tech.html
195 newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
196 }
197
198
199
200 1.47 app-emulation/qemu-user/ChangeLog
201
202 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?rev=1.47&view=markup
203 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?rev=1.47&content-type=text/plain
204 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?r1=1.46&r2=1.47
205
206 Index: ChangeLog
207 ===================================================================
208 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v
209 retrieving revision 1.46
210 retrieving revision 1.47
211 diff -u -r1.46 -r1.47
212 --- ChangeLog 12 Sep 2012 19:14:11 -0000 1.46
213 +++ ChangeLog 22 Nov 2012 18:47:25 -0000 1.47
214 @@ -1,6 +1,10 @@
215 # ChangeLog for app-emulation/qemu-user
216 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
217 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.46 2012/09/12 19:14:11 lu_zero Exp $
218 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.47 2012/11/22 18:47:25 ago Exp $
219 +
220 + 22 Nov 2012; Agostino Sarubbo <ago@g.o> qemu-user-1.0.ebuild,
221 + qemu-user-1.1.0-r1.ebuild, qemu-user-9999.ebuild:
222 + remove redundant cd and minor cleanup
223
224 12 Sep 2012; Luca Barbato <lu_zero@g.o> qemu-user-1.1.0-r1.ebuild:
225 misc minor fixes
226 @@ -197,4 +201,3 @@
227 +files/qemu-user-0.7.0-errno.patch, +metadata.xml,
228 +qemu-user-0.7.0-r1.ebuild:
229 qemu split ebuild, abi wrappers
230 -