| 1 |
dev-zero 12/10/29 11:15:29 |
| 2 |
|
| 3 |
Modified: qemu-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix collision with vscclient in the live ebuild like in the 1.2.0 ebuild. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.20/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.27 app-emulation/qemu/qemu-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.27&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.27&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.26&r2=1.27 |
| 15 |
|
| 16 |
Index: qemu-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v |
| 19 |
retrieving revision 1.26 |
| 20 |
retrieving revision 1.27 |
| 21 |
diff -u -r1.26 -r1.27 |
| 22 |
--- qemu-9999.ebuild 28 Oct 2012 09:27:24 -0000 1.26 |
| 23 |
+++ qemu-9999.ebuild 29 Oct 2012 11:15:29 -0000 1.27 |
| 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-9999.ebuild,v 1.26 2012/10/28 09:27:24 zmedico Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.27 2012/10/29 11:15:29 dev-zero Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -336,6 +336,9 @@ |
| 33 |
|
| 34 |
use python & dobin scripts/kvm/kvm_stat |
| 35 |
|
| 36 |
+ # avoid collision with libcacard |
| 37 |
+ use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" |
| 38 |
+ |
| 39 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
| 40 |
rm "${ED}/usr/share/qemu/bios.bin" |
| 41 |
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.136 app-emulation/qemu/ChangeLog |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.136&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.136&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.135&r2=1.136 |
| 50 |
|
| 51 |
Index: ChangeLog |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
| 54 |
retrieving revision 1.135 |
| 55 |
retrieving revision 1.136 |
| 56 |
diff -u -r1.135 -r1.136 |
| 57 |
--- ChangeLog 28 Oct 2012 18:59:12 -0000 1.135 |
| 58 |
+++ ChangeLog 29 Oct 2012 11:15:29 -0000 1.136 |
| 59 |
@@ -1,6 +1,9 @@ |
| 60 |
# ChangeLog for app-emulation/qemu |
| 61 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.135 2012/10/28 18:59:12 dev-zero Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.136 2012/10/29 11:15:29 dev-zero Exp $ |
| 64 |
+ |
| 65 |
+ 29 Oct 2012; Tiziano Müller <dev-zero@g.o> qemu-9999.ebuild: |
| 66 |
+ Fix collision with vscclient in the live ebuild like in the 1.2.0 ebuild. |
| 67 |
|
| 68 |
28 Oct 2012; Tiziano Müller <dev-zero@g.o> qemu-1.2.0.ebuild: |
| 69 |
Fix some build issues (missing patch and wrong S), avoid collision with |
Archives