| 1 |
dev-zero 12/10/28 18:59:12 |
| 2 |
|
| 3 |
Modified: qemu-1.2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix some build issues (missing patch and wrong S), avoid collision with libcacard (bug #439990). |
| 6 |
|
| 7 |
(Portage version: 2.1.11.20/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 app-emulation/qemu/qemu-1.2.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: qemu-1.2.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- qemu-1.2.0.ebuild 28 Oct 2012 09:27:24 -0000 1.3 |
| 23 |
+++ qemu-1.2.0.ebuild 28 Oct 2012 18:59:12 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.3 2012/10/28 09:27:24 zmedico Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.4 2012/10/28 18:59:12 dev-zero Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -139,6 +139,8 @@ |
| 33 |
usr/bin/qemu-armeb |
| 34 |
usr/bin/qemu-sparc32plus" |
| 35 |
|
| 36 |
+S="${WORKDIR}/${MY_P}" |
| 37 |
+ |
| 38 |
pkg_pretend() { |
| 39 |
if use kernel_linux && kernel_is lt 2 6 25; then |
| 40 |
eerror "This version of KVM requres a host kernel of 2.6.25 or higher." |
| 41 |
@@ -196,7 +198,7 @@ |
| 42 |
|
| 43 |
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" |
| 44 |
|
| 45 |
- epatch "${FILESDIR}"/${P}-fix-mipsen.patch |
| 46 |
+ epatch "${FILESDIR}"/${P}-cflags.patch |
| 47 |
[[ -n ${BACKPORTS} ]] && \ |
| 48 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
| 49 |
epatch |
| 50 |
@@ -337,6 +339,9 @@ |
| 51 |
|
| 52 |
use python & dobin scripts/kvm/kvm_stat |
| 53 |
|
| 54 |
+ # avoid collision with libcacard |
| 55 |
+ use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" |
| 56 |
+ |
| 57 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
| 58 |
rm "${ED}/usr/share/qemu/bios.bin" |
| 59 |
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.135 app-emulation/qemu/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.135&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.135&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.134&r2=1.135 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
| 72 |
retrieving revision 1.134 |
| 73 |
retrieving revision 1.135 |
| 74 |
diff -u -r1.134 -r1.135 |
| 75 |
--- ChangeLog 28 Oct 2012 09:27:24 -0000 1.134 |
| 76 |
+++ ChangeLog 28 Oct 2012 18:59:12 -0000 1.135 |
| 77 |
@@ -1,6 +1,10 @@ |
| 78 |
# ChangeLog for app-emulation/qemu |
| 79 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.134 2012/10/28 09:27:24 zmedico Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.135 2012/10/28 18:59:12 dev-zero Exp $ |
| 82 |
+ |
| 83 |
+ 28 Oct 2012; Tiziano Müller <dev-zero@g.o> qemu-1.2.0.ebuild: |
| 84 |
+ Fix some build issues (missing patch and wrong S), avoid collision with |
| 85 |
+ libcacard (bug #439990). |
| 86 |
|
| 87 |
28 Oct 2012; Zac Medico <zmedico@g.o> qemu-1.1.1-r1.ebuild, |
| 88 |
qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild, qemu-1.2.0.ebuild, |
Archives