1 |
jmbsvicetto 11/11/21 18:11:11 |
2 |
|
3 |
Modified: ChangeLog qemu-kvm-0.15.1-r1.ebuild |
4 |
qemu-kvm-9999.ebuild |
5 |
Log: |
6 |
[app-emulation/qemu-kvm] Sync 0.15.1-r1 and 9999 ebuilds. |
7 |
|
8 |
(Portage version: 2.2.0_alpha76/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.76 app-emulation/qemu-kvm/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.76&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.76&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.75&r2=1.76 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v |
20 |
retrieving revision 1.75 |
21 |
retrieving revision 1.76 |
22 |
diff -u -r1.75 -r1.76 |
23 |
--- ChangeLog 16 Nov 2011 04:29:30 -0000 1.75 |
24 |
+++ ChangeLog 21 Nov 2011 18:11:11 -0000 1.76 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for app-emulation/qemu-kvm |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.75 2011/11/16 04:29:30 jmbsvicetto Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.76 2011/11/21 18:11:11 jmbsvicetto Exp $ |
30 |
+ |
31 |
+ 21 Nov 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
32 |
+ qemu-kvm-0.15.1-r1.ebuild, qemu-kvm-9999.ebuild: |
33 |
+ [app-emulation/qemu-kvm] Sync 0.15.1-r1 and 9999 ebuilds |
34 |
|
35 |
16 Nov 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> ChangeLog: |
36 |
[app-emulation/qemu-kvm-9999] Revert to the old kernel.org repository. |
37 |
|
38 |
|
39 |
|
40 |
1.2 app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: qemu-kvm-0.15.1-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- qemu-kvm-0.15.1-r1.ebuild 25 Oct 2011 17:08:01 -0000 1.1 |
53 |
+++ qemu-kvm-0.15.1-r1.ebuild 21 Nov 2011 18:11:11 -0000 1.2 |
54 |
@@ -1,14 +1,13 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.1 2011/10/25 17:08:01 cardoe Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.2 2011/11/21 18:11:11 jmbsvicetto Exp $ |
59 |
|
60 |
#BACKPORTS=1 |
61 |
|
62 |
EAPI="3" |
63 |
|
64 |
if [[ ${PV} = *9999* ]]; then |
65 |
-# EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" |
66 |
- EGIT_REPO_URI="git://github.com/avikivity/kvm.git" |
67 |
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" |
68 |
GIT_ECLASS="git-2" |
69 |
fi |
70 |
|
71 |
|
72 |
|
73 |
|
74 |
1.25 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.25&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.25&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.24&r2=1.25 |
79 |
|
80 |
Index: qemu-kvm-9999.ebuild |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v |
83 |
retrieving revision 1.24 |
84 |
retrieving revision 1.25 |
85 |
diff -u -r1.24 -r1.25 |
86 |
--- qemu-kvm-9999.ebuild 16 Nov 2011 04:27:26 -0000 1.24 |
87 |
+++ qemu-kvm-9999.ebuild 21 Nov 2011 18:11:11 -0000 1.25 |
88 |
@@ -1,6 +1,6 @@ |
89 |
# Copyright 1999-2011 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.24 2011/11/16 04:27:26 jmbsvicetto Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.25 2011/11/21 18:11:11 jmbsvicetto Exp $ |
93 |
|
94 |
#BACKPORTS=1 |
95 |
|
96 |
@@ -11,7 +11,7 @@ |
97 |
GIT_ECLASS="git-2" |
98 |
fi |
99 |
|
100 |
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib |
101 |
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python |
102 |
|
103 |
if [[ ${PV} = *9999* ]]; then |
104 |
SRC_URI="" |
105 |
@@ -21,7 +21,7 @@ |
106 |
${BACKPORTS:+ |
107 |
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2 |
108 |
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}" |
109 |
- KEYWORDS="~amd64 ~x86" |
110 |
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
111 |
fi |
112 |
|
113 |
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |
114 |
@@ -66,7 +66,8 @@ |
115 |
sys-apps/pciutils |
116 |
>=sys-apps/util-linux-2.16.0 |
117 |
sys-libs/zlib |
118 |
- sys-apps/seabios |
119 |
+ amd64? ( sys-apps/seabios ) |
120 |
+ x86? ( sys-apps/seabios ) |
121 |
aio? ( dev-libs/libaio ) |
122 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
123 |
bluetooth? ( net-wireless/bluez ) |
124 |
@@ -129,6 +130,8 @@ |
125 |
fi |
126 |
fi |
127 |
|
128 |
+ python_set_active_version 2 |
129 |
+ |
130 |
enewgroup kvm |
131 |
} |
132 |
|
133 |
@@ -267,10 +270,12 @@ |
134 |
newdoc pc-bios/README README.pc-bios || die |
135 |
dohtml qemu-doc.html qemu-tech.html || die |
136 |
|
137 |
- # Remove SeaBIOS since we're using the SeaBIOS packaged one |
138 |
- rm "${D}/usr/share/qemu/bios.bin" |
139 |
- insinto /usr/share/qemu |
140 |
- dosym ../seabios/bios.bin |
141 |
+ # FIXME: Need to come up with a solution for non-x86 based systems |
142 |
+ if use x86 || use amd64; then |
143 |
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one |
144 |
+ rm "${D}/usr/share/qemu/bios.bin" |
145 |
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin |
146 |
+ fi |
147 |
} |
148 |
|
149 |
pkg_postinst() { |