[gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-07-28 22:04 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-07-28 22:04 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/07/28 22:04:35

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Disable the guest agent since we now have app-emulation/qemu-guest-agent for that.
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.142                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.141&r2=1.142

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ChangeLog	22 Jul 2012 04:35:00 -0000	1.141
+++ ChangeLog	28 Jul 2012 22:04:35 -0000	1.142
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.141 2012/07/22 04:35:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.142 2012/07/28 22:04:35 cardoe Exp $
+
+  28 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Disable the guest agent since we now have app-emulation/qemu-guest-agent for
+  that.
 
   22 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
   Use packaged sgabios instead of what QEMU ships with.



1.49                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.48&r2=1.49

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qemu-kvm-9999.ebuild	22 Jul 2012 04:35:00 -0000	1.48
+++ qemu-kvm-9999.ebuild	28 Jul 2012 22:04:35 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.48 2012/07/22 04:35:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.49 2012/07/28 22:04:35 cardoe Exp $
 
 EAPI="4"
 
@@ -246,7 +246,7 @@
 		--disable-libiscsi \
 		--disable-strip \
 		--disable-werror \
-		--enable-guest-agent \
+		--disable-guest-agent \
 		--enable-vnc-jpeg \
 		--enable-vnc-png \
 		--python=python2 \





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-09-10 21:39 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-09-10 21:39 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/09/10 21:39:34

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Use sys-firmware/ipxe rather than the preshipped binaries.
  
  (Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

Revision  Changes    Path
1.161                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.160&r2=1.161

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	10 Sep 2012 02:20:44 -0000	1.160
+++ ChangeLog	10 Sep 2012 21:39:34 -0000	1.161
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.160 2012/09/10 02:20:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.161 2012/09/10 21:39:34 cardoe Exp $
+
+  10 Sep 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Use sys-firmware/ipxe rather than the preshipped binaries.
 
   10 Sep 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.1-r1.ebuild,
   qemu-kvm-1.1.1-r3.ebuild:



1.60                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.59&r2=1.60

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu-kvm-9999.ebuild	7 Sep 2012 12:39:49 -0000	1.59
+++ qemu-kvm-9999.ebuild	10 Sep 2012 21:39:34 -0000	1.60
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.59 2012/09/07 12:39:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.60 2012/09/10 21:39:34 cardoe Exp $
 
 EAPI="4"
 
@@ -67,6 +67,7 @@
 	>=dev-libs/glib-2.0
 	media-libs/libpng
 	sys-apps/pciutils
+	sys-firmware/ipxe
 	>=sys-firmware/seabios-1.7.0
 	sys-firmware/sgabios
 	sys-firmware/vgabios
@@ -356,6 +357,15 @@
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
 	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+
+	# Remove iPXE since we're using the iPXE packaged one
+	rm "${ED}/usr/share/qemu/pxe-*.rom"
+	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
 }
 
 pkg_postinst() {





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-08-25 22:38 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-08-25 22:38 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/08/25 22:38:02

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Remove --disable-debug-mon which is an obsolete option for 1.2. bug #432484
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.156                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.155&r2=1.156

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	13 Aug 2012 15:06:59 -0000	1.155
+++ ChangeLog	25 Aug 2012 22:38:02 -0000	1.156
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.155 2012/08/13 15:06:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.156 2012/08/25 22:38:02 cardoe Exp $
+
+  25 Aug 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Remove --disable-debug-mon which is an obsolete option for 1.2. bug #432484
 
   13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> files/qemu-kvm:
   Fix --enable-kvm argument to -enable-kvm. bug #431088



1.56                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.55&r2=1.56

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qemu-kvm-9999.ebuild	13 Aug 2012 00:59:46 -0000	1.55
+++ qemu-kvm-9999.ebuild	25 Aug 2012 22:38:02 -0000	1.56
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.55 2012/08/13 00:59:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.56 2012/08/25 22:38:02 cardoe Exp $
 
 EAPI="4"
 
@@ -242,6 +242,7 @@
 	# provides libuuid on their platform
 	# --enable-vnc-thread will go away in 1.2
 	# $(use_enable xen xen-pci-passthrough) for 1.2
+	# $(use_enable debug debug-mon) goes away for 1.2
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-bsd-user \
@@ -258,7 +259,6 @@
 		$(use_enable caps cap-ng) \
 		$(use_enable curl) \
 		$(use_enable debug debug-info) \
-		$(use_enable debug debug-mon) \
 		$(use_enable debug debug-tcg) \
 		$(use_enable doc docs) \
 		$(use_enable fdt) \





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-08-12 23:42 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-08-12 23:42 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/08/12 23:42:59

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Live ebuild doesn't use BACKPORTS.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.150                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.149&r2=1.150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog	12 Aug 2012 23:03:17 -0000	1.149
+++ ChangeLog	12 Aug 2012 23:42:59 -0000	1.150
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.149 2012/08/12 23:03:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.150 2012/08/12 23:42:59 cardoe Exp $
+
+  12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Live ebuild doesn't use BACKPORTS.
 
 *qemu-kvm-1.1.1-r2 (12 Aug 2012)
 



1.53                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.52&r2=1.53

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- qemu-kvm-9999.ebuild	12 Aug 2012 23:03:17 -0000	1.52
+++ qemu-kvm-9999.ebuild	12 Aug 2012 23:42:59 -0000	1.53
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.52 2012/08/12 23:03:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.53 2012/08/12 23:42:59 cardoe Exp $
 
 EAPI="4"
 
 PYTHON_DEPEND="2"
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
-BACKPORTS=1
+#BACKPORTS=1
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-08-12 22:13 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-08-12 22:13 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/08/12 22:13:05

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Switch from QA_PRESTRIPPED to QA_PREBUILT since these files are actually prebuilt so that we prevent QA warnings.
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.148                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.147&r2=1.148

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog	6 Aug 2012 00:03:12 -0000	1.147
+++ ChangeLog	12 Aug 2012 22:13:05 -0000	1.148
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.147 2012/08/06 00:03:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.148 2012/08/12 22:13:05 cardoe Exp $
+
+  12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Switch from QA_PRESTRIPPED to QA_PREBUILT since these files are actually
+  prebuilt so that we prevent QA warnings.
 
   06 Aug 2012; Doug Goldstein <cardoe@gentoo.org> -files/65-gentoo-kvm.rules,
   -files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch,



1.51                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.50&r2=1.51

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qemu-kvm-9999.ebuild	28 Jul 2012 22:20:23 -0000	1.50
+++ qemu-kvm-9999.ebuild	12 Aug 2012 22:13:05 -0000	1.51
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.50 2012/07/28 22:20:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.51 2012/08/12 22:13:05 cardoe Exp $
 
 EAPI="4"
 
@@ -104,7 +104,7 @@
 
 STRIP_MASK="/usr/share/qemu/palcode-clipper"
 
-QA_PRESTRIPPED="
+QA_PREBUILT="
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-07-22  4:35 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-07-22  4:35 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/07/22 04:35:00

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Use packaged sgabios instead of what QEMU ships with.
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.141                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.140&r2=1.141

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog	22 Jul 2012 03:57:25 -0000	1.140
+++ ChangeLog	22 Jul 2012 04:35:00 -0000	1.141
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.140 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.141 2012/07/22 04:35:00 cardoe Exp $
+
+  22 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Use packaged sgabios instead of what QEMU ships with.
 
   21 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.1-r1.ebuild,
   qemu-kvm-9999.ebuild:



1.48                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.47&r2=1.48

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qemu-kvm-9999.ebuild	22 Jul 2012 03:57:25 -0000	1.47
+++ qemu-kvm-9999.ebuild	22 Jul 2012 04:35:00 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.47 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.48 2012/07/22 04:35:00 cardoe Exp $
 
 EAPI="4"
 
@@ -62,11 +62,10 @@
 	>=dev-libs/glib-2.0
 	media-libs/libpng
 	sys-apps/pciutils
+	>=sys-apps/seabios-1.7.0
+	sys-apps/sgabios
+	sys-apps/vgabios
 	virtual/jpeg
-	amd64? ( >=sys-apps/seabios-1.7.0
-		sys-apps/vgabios )
-	x86? ( >=sys-apps/seabios-1.7.0
-		sys-apps/vgabios )
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
@@ -346,6 +345,10 @@
 	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
 	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
 	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+	# Remove sgabios since we're using the sgabios packaged one
+	rm "${ED}/usr/share/qemu/sgabios.bin"
+	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
 }
 
 pkg_postinst() {





^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-07-11  2:01 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-07-11  2:01 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/07/11 02:01:15

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Update to latest version. Fix --enable-vnc-thread as its documented in the ebuild source. bug #425654
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.135                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.134&r2=1.135

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog	11 Jul 2012 01:58:02 -0000	1.134
+++ ChangeLog	11 Jul 2012 02:01:15 -0000	1.135
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.134 2012/07/11 01:58:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.135 2012/07/11 02:01:15 cardoe Exp $
+
+  10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Update to latest version. Fix --enable-vnc-thread as its documented in the
+  ebuild source. bug #425654
 
   10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.0.ebuild:
   Attempt to better handle the case when we can't have PIE enabled, which is



1.45                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.44&r2=1.45

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qemu-kvm-9999.ebuild	10 Jul 2012 10:46:33 -0000	1.44
+++ qemu-kvm-9999.ebuild	11 Jul 2012 02:01:15 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.44 2012/07/10 10:46:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.45 2012/07/11 02:01:15 cardoe Exp $
 
 EAPI="4"
 
@@ -25,9 +25,9 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty +curl debug doc fdt kernel_linux \
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
 kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static tci tls usbredir vde +vhost-net xattr xen xfs"
+smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
@@ -51,8 +51,10 @@
 
 REQUIRED_USE="static? ( !alsa !pulseaudio )
 	amd64? ( qemu_softmmu_targets_x86_64 )
-	x86? ( qemu_softmmu_targets_x86_64 )"
+	x86? ( qemu_softmmu_targets_x86_64 )
+	virtfs? ( xattr )"
 
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
 RDEPEND="
 	!app-emulation/kqemu
 	!app-emulation/qemu
@@ -69,6 +71,7 @@
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
+	caps? ( sys-libs/libcap-ng )
 	curl? ( >=net-misc/curl-7.15.4 )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
 	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
@@ -90,6 +93,7 @@
 	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
+	virtfs? ( sys-libs/libcap )
 	xattr? ( sys-apps/attr )
 	xen? ( app-emulation/xen-tools )
 	xfs? ( sys-fs/xfsprogs )"
@@ -217,7 +221,14 @@
 	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
 
 	# audio options
 	audio_opts="oss"
@@ -237,14 +248,13 @@
 		--disable-strip \
 		--disable-werror \
 		--enable-guest-agent \
-		--enable-pie \
 		--enable-vnc-jpeg \
 		--enable-vnc-png \
-		--enable-vnc-thread \
 		--python=python2 \
 		$(use_enable aio linux-aio) \
 		$(use_enable bluetooth bluez) \
 		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
 		$(use_enable curl) \
 		$(use_enable debug debug-info) \
 		$(use_enable debug debug-mon) \
@@ -268,9 +278,10 @@
 		$(use_enable usbredir usb-redir) \
 		$(use_enable vde) \
 		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
 		$(use_enable xattr attr) \
-		$(use_enable xattr virtfs) \
 		$(use_enable xen) \
+		$(use_enable xen xen-pci-passthrough) \
 		$(use_enable xfs xfsctl) \
 		--audio-drv-list="${audio_opts}" \
 		--target-list="${softmmu_targets} ${user_targets}" \
@@ -292,12 +303,12 @@
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "make install failed"
+	emake DESTDIR="${ED}" install
 
 	if [[ -n ${softmmu_targets} ]]; then
 		if use kernel_linux; then
 			insinto /lib/udev/rules.d/
-			doins "${FILESDIR}"/65-kvm.rules || die
+			doins "${FILESDIR}"/65-kvm.rules
 		fi
 
 		if use qemu_softmmu_targets_x86_64 ; then
@@ -311,16 +322,14 @@
 		fi
 	fi
 
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
 
 	if use doc; then
 		dohtml qemu-doc.html qemu-tech.html || die
 	fi
 
-	if use python; then
-		dobin scripts/kvm/kvm_stat || die
-	fi
+	use python & dobin scripts/kvm/kvm_stat
 
 	# FIXME: Need to come up with a solution for non-x86 based systems
 	if use x86 || use amd64; then
@@ -343,7 +352,6 @@
 }
 
 pkg_postinst() {
-
 	if [[ -n ${softmmu_targets} ]]; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-07-08 22:07 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-07-08 22:07 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/07/08 22:07:51

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Update the live ebuild to the latest version
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.126                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.125&r2=1.126

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog	8 Jul 2012 22:03:30 -0000	1.125
+++ ChangeLog	8 Jul 2012 22:07:51 -0000	1.126
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.125 2012/07/08 22:03:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.126 2012/07/08 22:07:51 cardoe Exp $
+
+  08 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Update the live ebuild to the latest version
 
   08 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.0.ebuild,
   metadata.xml:



1.40                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.39&r2=1.40

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qemu-kvm-9999.ebuild	31 May 2012 23:35:44 -0000	1.39
+++ qemu-kvm-9999.ebuild	8 Jul 2012 22:07:51 -0000	1.40
@@ -1,27 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.39 2012/05/31 23:35:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.40 2012/07/08 22:07:51 cardoe Exp $
 
-#BACKPORTS=1
+EAPI="4"
+
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
 
-EAPI="3"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
 	inherit git-2
-fi
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
-
-if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
 	${BACKPORTS:+
-		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -29,14 +25,12 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl debug fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads usbredir vde
-+vhost-net xattr xen"
-# static, depends on libsdl being built with USE=static-libs, which can not
-# be expressed in current EAPI's
+IUSE="+aio alsa bluetooth brltty +curl debug doc fdt kernel_linux \
+kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static tci test tls usbredir vde +vhost-net xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
 
 # Setup the default SoftMMU targets, while using the loops
@@ -45,7 +39,7 @@
 IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	if [[ ${target} = x86_64 ]]; then
+	if [ "x${target}" = "xx86_64" ]; then
 		continue
 	fi
 	IUSE="${IUSE} qemu_softmmu_targets_${target}"
@@ -55,16 +49,18 @@
 	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
-RESTRICT="test"
+REQUIRED_USE="static? ( !alsa !pulseaudio )
+	amd64? ( qemu_softmmu_targets_x86_64 )
+	x86? ( qemu_softmmu_targets_x86_64 )"
 
 RDEPEND="
 	!app-emulation/kqemu
 	!app-emulation/qemu
-	!app-emulation/qemu-user
+	!<app-emulation/qemu-1.0
 	>=dev-libs/glib-2.0
+	media-libs/libpng
 	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
+	virtual/jpeg
 	amd64? ( sys-apps/seabios
 		sys-apps/vgabios )
 	x86? ( sys-apps/seabios
@@ -73,39 +69,36 @@
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
+	curl? ( >=net-misc/curl-7.15.4 )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
 	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
+	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
+	python? ( =dev-lang/python-2*[ncurses] )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
+	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
+	static? ( sys-libs/zlib[static-libs(+)] )
+	!static? ( sys-libs/zlib )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-protocol-0.8.1
+			static? ( >=app-emulation/spice-0.9.0[static-libs] )
+			!static? ( >=app-emulation/spice-0.9.0 )
 	)
-	ssl? ( net-libs/gnutls )
+	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )
 	xen? ( app-emulation/xen-tools )
-"
+	xfs? ( sys-fs/xfsprogs )"
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
 	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35"
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	test? ( dev-libs/check )"
 
 STRIP_MASK="/usr/share/qemu/palcode-clipper"
 
@@ -113,18 +106,16 @@
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
+	usr/share/qemu/palcode-clipper"
+
 QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
 	usr/bin/qemu-alpha
 	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
 	usr/bin/qemu-cris
-	usr/bin/qemu-i386
 	usr/bin/qemu-m68k
 	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
 	usr/bin/qemu-ppc
@@ -133,73 +124,75 @@
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
 	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-kvm_kern_warn() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
 
 pkg_pretend() {
-	if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
-		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-	fi
-
-	if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
-		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-	fi
-
-	if kernel_is lt 2 6 25; then
+	if use kernel_linux && kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-		eerror "Either upgrade your kernel"
-	else
+	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
-			ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
-			ewarn "to have vhost-net support."
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+="~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
 		fi
 	fi
 }
 
 pkg_setup() {
-
 	python_set_active_version 2
 
-	enewgroup kvm
+	enewgroup kvm 78
 }
 
 src_prepare() {
 	# prevent docs to get automatically installed
 	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+	# append CFLAGS while linking
+	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
 
-	# drop '-g' by default as it tends to eat
-	# A LOT (~2GB) of ram for each job #355861
-	sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
-		-i configure || die
+	# remove part to make udev happy
+	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
-	# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
-	# to the qemu-devel ml - bug 337988
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
 
+	# Patch the use of sys/sysctl.h on FreeBSD
+	epatch "${FILESDIR}"/${P}-freebsd-sysctl-header.patch
+
+	python_convert_shebangs scripts/kvm/kvm_stat
+
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+
+	epatch_user
 }
 
 src_configure() {
@@ -233,36 +226,7 @@
 	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	#use static && conf_opts="${conf_opts} --static"
-
-	# Support debug USE flag
-	use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		--disable-bsd-user
-	"
+	use static && conf_opts="${conf_opts} --static"
 
 	# audio options
 	audio_opts="oss"
@@ -270,51 +234,103 @@
 	use pulseaudio && audio_opts="pa ${audio_opts}"
 	use sdl && audio_opts="sdl ${audio_opts}"
 
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
+	# conditionally making UUID work on Linux only is wrong
+	# but the Gentoo/FreeBSD guys need to figure out what
+	# provides libuuid on their platform
+	# --enable-vnc-thread will go away in 1.2
+	# $(use_enable xen xen-pci-passthrough) for 1.2
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-darwin-user \
+		--disable-bsd-user \
+		--disable-libiscsi \
 		--disable-strip \
 		--disable-werror \
-		--enable-kvm \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--enable-guest-agent \
+		--enable-pie \
+		--enable-virtfs \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--enable-vnc-thread \
+		--python=python2 \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable curl) \
+		$(use_enable debug debug-info) \
+		$(use_enable debug debug-mon) \
+		$(use_enable debug debug-tcg) \
+		$(use_enable doc docs) \
+		$(use_enable fdt) \
+		$(use_enable kernel_linux kvm) \
+		$(use_enable kernel_linux kvm-device-assignment) \
+		$(use_enable kernel_linux kvm-pit) \
+		$(use_enable kernel_linux nptl) \
+		$(use_enable kernel_linux uuid) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable tci tcg-interpreter) \
+		$(use_enable test check-utests) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable xattr attr) \
+		$(use_enable xen) \
+		$(use_enable xfs xfsctl) \
 		--audio-drv-list="${audio_opts}" \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
 
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
+		# this is for qemu upstream's threaded support which is
+		# in development and broken
+		# the kvm project has its own support for threaded IO
+		# which is always on and works
+		# --enable-io-thread \
+
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
 }
 
 src_install() {
 	emake DESTDIR="${ED}" install || die "make install failed"
 
 	if [[ -n ${softmmu_targets} ]]; then
-		insinto /lib/udev/rules.d/
-		doins "${FILESDIR}"/65-gentoo-kvm.rules || die
+		if use kernel_linux; then
+			insinto /lib/udev/rules.d/
+			doins kvm/scripts/65-kvm.rules || die
+		fi
 
 		if use qemu_softmmu_targets_x86_64 ; then
 			dobin "${FILESDIR}"/qemu-kvm
-			dosym /usr/bin/qemu-kvm /usr/bin/kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
 		else
 			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
 			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
 		fi
-
-		if use qemu-ifup; then
-			insinto /etc/qemu/
-			insopts -m0755
-			doins "${FILESDIR}"/qemu-ifup || die
-		fi
 	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
 	newdoc pc-bios/README README.pc-bios || die
 	dohtml qemu-doc.html qemu-tech.html || die
 
+	if use python; then
+		dobin scripts/kvm/kvm_stat || die
+	fi
+
 	# FIXME: Need to come up with a solution for non-x86 based systems
 	if use x86 || use amd64; then
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
@@ -348,12 +364,7 @@
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "You will need the Universal TUN/TAP driver compiled into your"
-		elog "kernel or loaded as a module to use the virtual network device"
-		elog "if using -net tap.  You will also need support for 802.1d"
-		elog "Ethernet Bridging and a configured bridge if using the provided"
-		elog "qemu-ifup script from /etc/qemu."
-		elog
-		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
+		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
 }






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-01-22 22:49 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2012-01-22 22:49 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    12/01/22 22:49:22

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  [app-emulation/qemu-kvm-9999] Whitespace changes.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.88                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.87&r2=1.88

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog	22 Jan 2012 21:23:30 -0000	1.87
+++ ChangeLog	22 Jan 2012 22:49:21 -0000	1.88
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.87 2012/01/22 21:23:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.88 2012/01/22 22:49:21 jmbsvicetto Exp $
+
+  22 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Whitespace changes.
 
   22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-kvm-0.14.1-r2.ebuild,
   qemu-kvm-0.15.0.ebuild, qemu-kvm-0.15.1-r1.ebuild, qemu-kvm-1.0.ebuild:



1.29                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.28&r2=1.29

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qemu-kvm-9999.ebuild	22 Jan 2012 20:40:49 -0000	1.28
+++ qemu-kvm-9999.ebuild	22 Jan 2012 22:49:21 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.28 2012/01/22 20:40:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.29 2012/01/22 22:49:21 jmbsvicetto Exp $
 
 #BACKPORTS=1
 
@@ -30,8 +30,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio rbd sasl sdl spice ssl threads vde \
-+vhost-net xattr xen"
+png pulseaudio rbd sasl sdl spice ssl threads vde +vhost-net xattr xen"
 # static, depends on libsdl being built with USE=static-libs, which can not
 # be expressed in current EAPI's
 
@@ -82,8 +81,10 @@
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? ( >=app-emulation/spice-0.9.0
-			>=app-emulation/spice-protocol-0.8.1 )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=app-emulation/spice-protocol-0.8.1
+	)
 	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2012-01-17 22:25 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-01-17 22:25 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/01/17 22:25:48

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Update the live ebuild with the latest updates. bug #394623
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.81                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	17 Jan 2012 22:23:53 -0000	1.80
+++ ChangeLog	17 Jan 2012 22:25:48 -0000	1.81
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.80 2012/01/17 22:23:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.81 2012/01/17 22:25:48 cardoe Exp $
+
+  17 Jan 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Update the live ebuild with the latest updates. bug #394623
 
   17 Jan 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.0.ebuild,
   qemu-kvm-0.15.1-r1.ebuild, qemu-kvm-1.0.ebuild:



1.26                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.25&r2=1.26

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qemu-kvm-9999.ebuild	21 Nov 2011 18:11:11 -0000	1.25
+++ qemu-kvm-9999.ebuild	17 Jan 2012 22:25:48 -0000	1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.25 2011/11/21 18:11:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.26 2012/01/17 22:25:48 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -31,7 +31,7 @@
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
 +vhost-net xattr xen"
 # static, depends on libsdl being built with USE=static-libs, which can not
 # be expressed in current EAPI's
@@ -78,13 +78,15 @@
 	jpeg? ( virtual/jpeg )
 	ncurses? ( sys-libs/ncurses )
 	nss? ( dev-libs/nss )
+	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? ( >=app-emulation/spice-0.6.0 )
+	spice? ( >=app-emulation/spice-0.9.0
+			>=app-emulation/spice-protocol-0.8.1 )
 	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )
@@ -93,9 +95,33 @@
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.35
-	ssl? ( dev-util/pkgconfig )
-"
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
@@ -105,8 +131,8 @@
 	eerror
 }
 
-pkg_setup() {
-	if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
+pkg_pretend() {
+	if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
 		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
 	fi
 
@@ -129,6 +155,9 @@
 			ewarn "to have vhost-net support."
 		fi
 	fi
+}
+
+pkg_setup() {
 
 	python_set_active_version 2
 
@@ -201,10 +230,11 @@
 	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
 	conf_opts="${conf_opts} $(use_enable curl)"
 	conf_opts="${conf_opts} $(use_enable fdt)"
-	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+	conf_opts="${conf_opts} $(use_enable hardened pie)"
 	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
 	conf_opts="${conf_opts} $(use_enable ncurses curses)"
 	conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
+	conf_opts="${conf_opts} $(use_enable opengl)"
 	conf_opts="${conf_opts} $(use_enable png vnc-png)"
 	conf_opts="${conf_opts} $(use_enable rbd)"
 	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
@@ -248,7 +278,7 @@
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	if [ ! -z "${softmmu_targets}" ]; then
-		insinto /$(get_libdir)/udev/rules.d/
+		insinto /lib/udev/rules.d/
 		doins kvm/scripts/65-kvm.rules || die
 
 		if use qemu-ifup; then






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2011-10-21  3:13 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-10-21  3:13 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    11/10/21 03:13:05

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  [app-emulation/qemu-kvm-9999] Use Avi Kivity's git repo until kernel.org is up again.
  
  (Portage version: 2.2.0_alpha69/cvs/Linux x86_64)

Revision  Changes    Path
1.68                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	27 Aug 2011 18:53:13 -0000	1.67
+++ ChangeLog	21 Oct 2011 03:13:05 -0000	1.68
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.67 2011/08/27 18:53:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.68 2011/10/21 03:13:05 jmbsvicetto Exp $
+
+  21 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Use Avi Kivity's git repo until kernel.org is
+  up again.
 
   27 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   qemu-kvm-0.14.1-r2.ebuild:



1.21                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.20&r2=1.21

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qemu-kvm-9999.ebuild	14 Aug 2011 12:45:23 -0000	1.20
+++ qemu-kvm-9999.ebuild	21 Oct 2011 03:13:05 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.20 2011/08/14 12:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.21 2011/10/21 03:13:05 jmbsvicetto Exp $
 
 #BACKPORTS=2
 
@@ -8,6 +8,7 @@
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	EGIT_REPO_URI="git://github.com/avikivity/kvm.git"
 	GIT_ECLASS="git-2"
 fi
 






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2011-08-11 19:25 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 17+ messages in thread
From: Doug Goldstein (cardoe) @ 2011-08-11 19:25 UTC (permalink / raw
  To: gentoo-commits

cardoe      11/08/11 19:25:59

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Update the 9999 ebuild to gain all the improvements from past updates.
  
  (Portage version: 2.1.10.10/cvs/Linux x86_64)

Revision  Changes    Path
1.62                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.61&r2=1.62

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog	11 Aug 2011 19:22:36 -0000	1.61
+++ ChangeLog	11 Aug 2011 19:25:59 -0000	1.62
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.61 2011/08/11 19:22:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.62 2011/08/11 19:25:59 cardoe Exp $
+
+  11 Aug 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Update the 9999 ebuild to gain all the improvements from past updates.
 
 *qemu-kvm-0.15.0 (11 Aug 2011)
 



1.17                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.16&r2=1.17

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qemu-kvm-9999.ebuild	28 Mar 2011 03:31:46 -0000	1.16
+++ qemu-kvm-9999.ebuild	11 Aug 2011 19:25:59 -0000	1.17
@@ -1,12 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.16 2011/03/28 03:31:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.17 2011/08/11 19:25:59 cardoe Exp $
 
-EAPI="2"
+#BACKPORTS=2
+
+EAPI="3"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
+	GIT_ECLASS="git-2"
 fi
 
 inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
@@ -16,7 +18,7 @@
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -26,23 +28,30 @@
 LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
-png pulseaudio qemu-ifup rbd sasl sdl ssl spice static vde vhost-net xen"
-
-# Updated targets to use the only supported upstream target - x86_64-softmmu
-COMMON_TARGETS=""
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64"
-IUSE_USER_TARGETS=""
-#COMMON_TARGETS="i386 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-#IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64 mips64 mips64el ppcemb"
-#IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
++vhost-net xen"
+# static, depends on libsdl being built with USE=static-libs, which can not
+# be expressed in current EAPI's
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
 done
 
 for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
+	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
 RESTRICT="test"
@@ -62,7 +71,7 @@
 	brltty? ( app-accessibility/brltty )
 	curl? ( net-misc/curl )
 	esd? ( media-sound/esound )
-	fdt? ( sys-apps/dtc )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
 	jpeg? ( virtual/jpeg )
 	ncurses? ( sys-libs/ncurses )
 	png? ( media-libs/libpng )
@@ -92,18 +101,17 @@
 }
 
 pkg_setup() {
-	local counter="0" check
+	if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
 
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-	for check in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${check}" && counter="1"
-	done
-	[[ ${counter} == 0 ]] && die "You need to set at least 1 target in QEMU_SOFTMMU_TARGETS"
+	if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
 
 	if kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
 		eerror "Either upgrade your kernel"
-		die "qemu-kvm version not compatible"
 	else
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
@@ -112,7 +120,8 @@
 			kvm_kern_warn
 		fi
 		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
-			ewarn "You have to enable CONFIG_VHOST_NET in the kernel to get vhost-net support."
+			ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
+			ewarn "to have vhost-net support."
 		fi
 	fi
 
@@ -131,11 +140,17 @@
 	# remove part to make udev happy
 	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
+	# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
+	# to the qemu-devel ml - bug 337988
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
 }
 
 src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
+	local conf_opts audio_opts user_targets
 
 	for target in ${IUSE_SOFTMMU_TARGETS} ; do
 		use "qemu_softmmu_targets_${target}" && \
@@ -147,7 +162,10 @@
 		user_targets="${user_targets} ${target}-linux-user"
 	done
 
-	if [ ! -z "${softmmu_targets}" ]; then
+	if [ -z "${softmmu_targets}" ]; then
+		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
+		die "At least 1 SoftMMU target must be enabled"
+	else
 		einfo "Building the following softmmu targets: ${softmmu_targets}"
 	fi
 
@@ -162,7 +180,10 @@
 	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
+	#use static && conf_opts="${conf_opts} --static"
+
+	# Support debug USE flag
+	use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
 
 	# Fix the $(prefix)/etc issue
 	conf_opts="${conf_opts} --sysconfdir=/etc"
@@ -180,12 +201,12 @@
 	conf_opts="${conf_opts} $(use_enable rbd)"
 	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
 	conf_opts="${conf_opts} $(use_enable sdl)"
-	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
 	conf_opts="${conf_opts} $(use_enable spice)"
+	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+	conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
 	conf_opts="${conf_opts} $(use_enable vde)"
 	conf_opts="${conf_opts} $(use_enable vhost-net)"
 	conf_opts="${conf_opts} $(use_enable xen)"
-#	conf_opts="${conf_opts} --disable-xen"
 	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
 
 	# audio options
@@ -211,27 +232,29 @@
 		# in development and broken
 		# the kvm project has its own support for threaded IO
 		# which is always on and works
-#		--enable-io-thread \
+		# --enable-io-thread \
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	insinto /$(get_libdir)/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
+	if [ ! -z "${softmmu_targets}" ]; then
+		insinto /$(get_libdir)/udev/rules.d/
+		doins kvm/scripts/65-kvm.rules || die
 
-	if use qemu-ifup; then
-		insinto /etc/qemu/
-		insopts -m0755
-		doins kvm/scripts/qemu-ifup || die
-	fi
+		if use qemu-ifup; then
+			insinto /etc/qemu/
+			insopts -m0755
+			doins kvm/scripts/qemu-ifup || die
+		fi
 
-	if use qemu_softmmu_targets_x86_64 ; then
-		dobin "${FILESDIR}"/qemu-kvm
-		dosym /usr/bin/qemu-kvm /usr/bin/kvm
-	else
-		elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-		elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin "${FILESDIR}"/qemu-kvm
+			dosym /usr/bin/qemu-kvm /usr/bin/kvm
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+		fi
 	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
@@ -240,22 +263,24 @@
 }
 
 pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	elog
-	elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
-	echo
+
+	if [ ! -z "${softmmu_targets}" ]; then
+		elog "If you don't have kvm compiled into the kernel, make sure you have"
+		elog "the kernel module loaded before running kvm. The easiest way to"
+		elog "ensure that the kernel module is loaded is to load it on boot."
+		elog "For AMD CPUs the module is called 'kvm-amd'"
+		elog "For Intel CPUs the module is called 'kvm-intel'"
+		elog "Please review /etc/conf.d/modules for how to load these"
+		elog
+		elog "Make sure your user is in the 'kvm' group"
+		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+		elog
+		elog "You will need the Universal TUN/TAP driver compiled into your"
+		elog "kernel or loaded as a module to use the virtual network device"
+		elog "if using -net tap.  You will also need support for 802.1d"
+		elog "Ethernet Bridging and a configured bridge if using the provided"
+		elog "kvm-ifup script from /etc/kvm."
+		elog
+		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
+	fi
 }






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2010-09-06 11:07 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2010-09-06 11:07 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    10/09/06 11:07:09

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  [app-emulation/qemu-kvm-9999] Synced to latest qemu-kvm-0.12.5-r1.
  Sorted IUSE flags.
  
  (Portage version: 2.2_rc73/cvs/Linux x86_64)

Revision  Changes    Path
1.43                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	6 Sep 2010 10:56:40 -0000	1.42
+++ ChangeLog	6 Sep 2010 11:07:09 -0000	1.43
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.42 2010/09/06 10:56:40 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.43 2010/09/06 11:07:09 jmbsvicetto Exp $
+
+  06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Synced to latest qemu-kvm-0.12.5-r1.
+  Sorted IUSE flags.
 
   06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   qemu-kvm-0.12.5-r1.ebuild, metadata.xml:



1.12                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.11&r2=1.12

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qemu-kvm-9999.ebuild	6 Sep 2010 03:06:27 -0000	1.11
+++ qemu-kvm-9999.ebuild	6 Sep 2010 11:07:09 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.11 2010/09/06 03:06:27 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.12 2010/09/06 11:07:09 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -15,7 +15,8 @@
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -26,7 +27,7 @@
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
-png pulseaudio qemu-ifup ssl sasl sdl static vde xen"
+png pulseaudio qemu-ifup sasl sdl ssl static vde xen"
 
 # Updated targets to use the only supported upstream target - x86_64-softmmu
 COMMON_TARGETS=""






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2010-09-06  3:06 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2010-09-06  3:06 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    10/09/06 03:06:27

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  [app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in upstream's build system.
  Added use flags to enable jpeg and png compression on vnc.
  Replaced gnu-tls with ssl use flag - bug 311627.
  Added use flag to make accessbility support optional - bug 326491.
  Currently it seems qemu-kvm won't build with -sasl - will check and updated ebuild soon.
  
  (Portage version: 2.2_rc73/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	6 Sep 2010 01:16:15 -0000	1.38
+++ ChangeLog	6 Sep 2010 03:06:27 -0000	1.39
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.38 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.39 2010/09/06 03:06:27 jmbsvicetto Exp $
+
+  06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in
+  upstream's build system.
+  Added use flags to enable jpeg and png compression on vnc.
+  Replaced gnu-tls with ssl use flag - bug 311627.
+  Added use flag to make accessbility support optional - bug 326491.
+  Currently it seems qemu-kvm won't build with -sasl - will check and
+  updated ebuild soon.
 
   06 Sep 2010; Luca Barbato <lu_zero@gentoo.org> qemu-kvm-0.12.5-r1.ebuild,
   qemu-kvm-9999.ebuild:



1.11                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.10&r2=1.11

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qemu-kvm-9999.ebuild	6 Sep 2010 01:16:15 -0000	1.10
+++ qemu-kvm-9999.ebuild	6 Sep 2010 03:06:27 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.10 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.11 2010/09/06 03:06:27 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -25,8 +25,8 @@
 LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd gnutls fdt hardened kvm-trace \
-ncurses pulseaudio qemu-ifup sasl sdl static vde"
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup ssl sasl sdl static vde xen"
 
 # Updated targets to use the only supported upstream target - x86_64-softmmu
 COMMON_TARGETS=""
@@ -58,23 +58,27 @@
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
 	curl? ( net-misc/curl )
 	esd? ( media-sound/esound )
 	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
+	jpeg? ( media-libs/jpeg )
 	ncurses? ( sys-libs/ncurses )
+	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
-	brltty? ( app-accessibility/brltty )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
+	xen? ( app-emulation/xen )
 "
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
 	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
+	ssl? ( dev-util/pkgconfig )
+"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
@@ -159,19 +163,20 @@
 
 	#config options
 	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+	conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
 	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
 	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-	conf_opts="${conf_opts} $(use_enable brltty)"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
+	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+	conf_opts="${conf_opts} $(use_enable ncurses curses)"
+	conf_opts="${conf_opts} $(use_enable png vnc-png)"
+	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+	conf_opts="${conf_opts} $(use_enable sdl)"
+	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+	conf_opts="${conf_opts} $(use_enable vde)"
+	conf_opts="${conf_opts} $(use_enable xen)"
+#	conf_opts="${conf_opts} --disable-xen"
 	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
 
 	# audio options
@@ -240,5 +245,7 @@
 	elog "if using -net tap.  You will also need support for 802.1d"
 	elog "Ethernet Bridging and a configured bridge if using the provided"
 	elog "kvm-ifup script from /etc/kvm."
+	elog
+	elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
 	echo
 }






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2010-06-12  5:20 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2010-06-12  5:20 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    10/06/12 05:20:47

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  [app-emulation/qemu-kvm-9999] Restricted targets to x86_64-softmmu after upstream informed that's the only supported target for qemu-kvm.
  Should fix bug 317205 and bug 318413.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	18 May 2010 17:57:32 -0000	1.28
+++ ChangeLog	12 Jun 2010 05:20:47 -0000	1.29
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.28 2010/05/18 17:57:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.29 2010/06/12 05:20:47 jmbsvicetto Exp $
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Restricted targets to x86_64-softmmu after
+  upstream informed that's the only supported target for qemu-kvm.
+  Should fix bug 317205 and bug 318413.
 
 *qemu-kvm-0.12.4 (18 May 2010)
 



1.7                  app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.6&r2=1.7

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qemu-kvm-9999.ebuild	28 Mar 2010 17:24:11 -0000	1.6
+++ qemu-kvm-9999.ebuild	12 Jun 2010 05:20:47 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.6 2010/03/28 17:24:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.7 2010/06/12 05:20:47 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -28,9 +28,13 @@
 IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
 pulseaudio qemu-ifup sasl sdl static vde"
 
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+# Updated targets to use the only supported upstream target - x86_64-softmmu
+COMMON_TARGETS=""
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64"
+IUSE_USER_TARGETS=""
+#COMMON_TARGETS="i386 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+#IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64 mips64 mips64el ppcemb"
+#IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
 	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -70,7 +74,7 @@
 	>=sys-kernel/linux-headers-2.6.29
 	gnutls? ( dev-util/pkgconfig )"
 
-kvm_kern_war() {
+kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
 	eerror
 	eerror "  Virtualization"
@@ -79,6 +83,14 @@
 }
 
 pkg_setup() {
+
+	local counter="0" check
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	for check in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${check}" && counter="1"
+	done
+	[[ ${counter} == 0 ]] && die "You need to set at least 1 target in QEMU_SOFTMMU_TARGETS"
+
 	if kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
 		eerror "Either upgrade your kernel"
@@ -141,7 +153,7 @@
 	use static && conf_opts="${conf_opts} --static"
 
 	# Fix the $(prefix)/etc issue
-	conf_opts="${conf_opts} --sysconfdir=${D}/etc"
+	conf_opts="${conf_opts} --sysconfdir=/etc"
 
 	#config options
 	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
@@ -200,8 +212,13 @@
 	newdoc pc-bios/README README.pc-bios || die
 	dohtml qemu-doc.html qemu-tech.html || die
 
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
+	if use qemu_softmmu_targets_x86_64 ; then
+		dobin "${FILESDIR}"/qemu-kvm
+		dosym /usr/bin/qemu-kvm /usr/bin/kvm
+	else
+		elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+		elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+	fi
 }
 
 pkg_postinst() {






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2010-03-28 17:24 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2010-03-28 17:24 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    10/03/28 17:24:11

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied upstream.
  Fixes bug 310979 - thanks to Jeff Kowalczyk <jtk@yahoo.com>.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	19 Mar 2010 17:23:17 -0000	1.25
+++ ChangeLog	28 Mar 2010 17:24:11 -0000	1.26
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.25 2010/03/19 17:23:17 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.26 2010/03/28 17:24:11 jmbsvicetto Exp $
+
+  28 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild, -files/qemu-kvm-9999-sysconfigdir.patch:
+  Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied
+  upstream.
+  Fixes bug 310979 - thanks to Jeff Kowalczyk <jtk@yahoo.com>.
 
   19 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild:



1.6                  app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.5&r2=1.6

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qemu-kvm-9999.ebuild	7 Mar 2010 03:15:30 -0000	1.5
+++ qemu-kvm-9999.ebuild	28 Mar 2010 17:24:11 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.5 2010/03/07 03:15:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.6 2010/03/28 17:24:11 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -108,7 +108,6 @@
 	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-	epatch "${FILESDIR}/${P}-sysconfigdir.patch"
 }
 
 src_configure() {






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
@ 2010-03-07  3:15 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 17+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2010-03-07  3:15 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    10/03/07 03:15:31

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Added a patch to fix the support for --sysconfdir and updated src_configure to prevent the default $prefix/etc.
  (Portage version: 2.2_rc65/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	2 Mar 2010 16:56:34 -0000	1.20
+++ ChangeLog	7 Mar 2010 03:15:30 -0000	1.21
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.20 2010/03/02 16:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.21 2010/03/07 03:15:30 jmbsvicetto Exp $
+
+  07 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild, +files/qemu-kvm-9999-sysconfigdir.patch:
+  Added a patch to fix the support for --sysconfdir and updated
+  src_configure to prevent the default $prefix/etc.
 
 *qemu-kvm-0.12.3 (02 Mar 2010)
 



1.5                  app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.4&r2=1.5

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qemu-kvm-9999.ebuild	2 Mar 2010 16:56:34 -0000	1.4
+++ qemu-kvm-9999.ebuild	7 Mar 2010 03:15:30 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.4 2010/03/02 16:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.5 2010/03/07 03:15:30 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -108,6 +108,7 @@
 	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+	epatch "${FILESDIR}/${P}-sysconfigdir.patch"
 }
 
 src_configure() {
@@ -140,6 +141,9 @@
 	# Add support for static builds
 	use static && conf_opts="${conf_opts} --static"
 
+	# Fix the $(prefix)/etc issue
+	conf_opts="${conf_opts} --sysconfdir=${D}/etc"
+
 	#config options
 	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
 	use bluetooth || conf_opts="${conf_opts} --disable-bluez"






^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2012-09-10 21:39 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-28 22:04 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild Doug Goldstein (cardoe)
  -- strict thread matches above, loose matches on Subject: below --
2012-09-10 21:39 Doug Goldstein (cardoe)
2012-08-25 22:38 Doug Goldstein (cardoe)
2012-08-12 23:42 Doug Goldstein (cardoe)
2012-08-12 22:13 Doug Goldstein (cardoe)
2012-07-22  4:35 Doug Goldstein (cardoe)
2012-07-11  2:01 Doug Goldstein (cardoe)
2012-07-08 22:07 Doug Goldstein (cardoe)
2012-01-22 22:49 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2012-01-17 22:25 Doug Goldstein (cardoe)
2011-10-21  3:13 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-08-11 19:25 Doug Goldstein (cardoe)
2010-09-06 11:07 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-09-06  3:06 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-06-12  5:20 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-03-28 17:24 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-03-07  3:15 Jorge Manuel B. S. Vicetto (jmbsvicetto)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox