| 1 |
dev-zero 13/02/28 12:16:33 |
| 2 |
|
| 3 |
Modified: qemu-1.4.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Block libcacard since qemu is libcacard upstream and bundles/installs it from now on. Also block spice[smartcard] if smartcard-support in qemu is requested since that one is pulling in libcacard and to make sure users know what to do. Renaming the binary is then not required anymore. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 app-emulation/qemu/qemu-1.4.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: qemu-1.4.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- qemu-1.4.0.ebuild 26 Feb 2013 16:16:18 -0000 1.7 |
| 23 |
+++ qemu-1.4.0.ebuild 28 Feb 2013 12:16:33 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 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.4.0.ebuild,v 1.7 2013/02/26 16:16:18 cardoe Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.8 2013/02/28 12:16:33 dev-zero Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -72,7 +72,8 @@ |
| 33 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 34 |
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) |
| 35 |
seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) |
| 36 |
- spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) |
| 37 |
+ spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] |
| 38 |
+ smartcard? ( app-emulation/spice[-smartcard] ) ) |
| 39 |
tls? ( net-libs/gnutls[static-libs(+)] ) |
| 40 |
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) |
| 41 |
vde? ( net-misc/vde[static-libs(+)] ) |
| 42 |
@@ -100,10 +101,10 @@ |
| 43 |
python? ( =dev-lang/python-2*[ncurses] ) |
| 44 |
sdl? ( media-libs/libsdl[X] ) |
| 45 |
selinux? ( sec-policy/selinux-qemu ) |
| 46 |
- smartcard? ( dev-libs/nss ) |
| 47 |
+ smartcard? ( dev-libs/nss !app-emulation/libcacard ) |
| 48 |
spice? ( >=app-emulation/spice-protocol-0.12.3 ) |
| 49 |
systemtap? ( dev-util/systemtap ) |
| 50 |
- usbredir? ( >=sys-apps/usbredir-0.5.3 ) |
| 51 |
+ usbredir? ( >=sys-apps/usbredir-0.6 ) |
| 52 |
virtfs? ( sys-libs/libcap ) |
| 53 |
xen? ( app-emulation/xen-tools )" |
| 54 |
|
| 55 |
@@ -409,9 +410,6 @@ |
| 56 |
dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt |
| 57 |
newdoc pc-bios/README README.pc-bios |
| 58 |
|
| 59 |
- # Avoid collision with app-emulation/libcacard |
| 60 |
- use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" |
| 61 |
- |
| 62 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
| 63 |
rm "${ED}/usr/share/qemu/bios.bin" |
| 64 |
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.197 app-emulation/qemu/ChangeLog |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.197&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.197&content-type=text/plain |
| 72 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.196&r2=1.197 |
| 73 |
|
| 74 |
Index: ChangeLog |
| 75 |
=================================================================== |
| 76 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
| 77 |
retrieving revision 1.196 |
| 78 |
retrieving revision 1.197 |
| 79 |
diff -u -r1.196 -r1.197 |
| 80 |
--- ChangeLog 26 Feb 2013 16:16:18 -0000 1.196 |
| 81 |
+++ ChangeLog 28 Feb 2013 12:16:33 -0000 1.197 |
| 82 |
@@ -1,6 +1,12 @@ |
| 83 |
# ChangeLog for app-emulation/qemu |
| 84 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 85 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.196 2013/02/26 16:16:18 cardoe Exp $ |
| 86 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.197 2013/02/28 12:16:33 dev-zero Exp $ |
| 87 |
+ |
| 88 |
+ 28 Feb 2013; Tiziano Müller <dev-zero@g.o> qemu-1.4.0.ebuild: |
| 89 |
+ Block libcacard since qemu is libcacard upstream and bundles/installs it from |
| 90 |
+ now on. Also block spice[smartcard] if smartcard-support in qemu is requested |
| 91 |
+ since that one is pulling in libcacard and to make sure users know what to do. |
| 92 |
+ Renaming the binary is then not required anymore. |
| 93 |
|
| 94 |
26 Feb 2013; Doug Goldstein <cardoe@g.o> qemu-1.2.2-r4.ebuild, |
| 95 |
qemu-1.4.0.ebuild: |
Archives