clean up old versions

(Portage version: 2.1.6.13/cvs/Linux x86_64)

16 files changed, 14 insertions, 1123 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 2bdede6cf35e..071e030d10ce 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.27 2009/06/09 12:48:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.28 2009/06/09 13:26:37 cardoe Exp $
+
+  09 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
+  -files/libvirt-0.4.4-binary-paths.patch,
+  -files/libvirt-0.4.4-capabilities-kvm-path.patch,
+  -files/libvirt-0.4.4-kvm-cdrom-fix.patch, -libvirt-0.4.6-r1.ebuild,
+  -files/libvirt-0.4.6-add-missing-permission-checks.patch,
+  -files/libvirt-0.4.6-parallel-build-fix.patch,
+  -files/libvirt-0.4.6-qemu-img-name.patch, -libvirt-0.5.1.ebuild,
+  -files/libvirt-0.5.1-add-missing-permission-checks.patch,
+  -files/libvirt-0.5.1-libgnu-reposition.patch, -libvirt-0.6.2.ebuild,
+  -files/libvirt-0.6.2-storage-fix.patch, -libvirt-0.6.3.ebuild,
+  -libvirt-0.6.3-r1.ebuild, -libvirt-0.6.3-r2.ebuild:
+  clean up old versions
 
 *libvirt-0.6.4 (09 Jun 2009)
 
diff --git a/app-emulation/libvirt/files/libvirt-0.4.4-binary-paths.patch b/app-emulation/libvirt/files/libvirt-0.4.4-binary-paths.patch
deleted file mode 100644
index 1a9e470c08cd..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.4-binary-paths.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- libvirt-0.4.4/configure.in	2008-06-25 01:37:56.000000000 -0700
-+++ libvirt-0.4.4-new/configure.in	2008-07-14 04:51:49.000000000 -0700
-@@ -661,7 +661,41 @@
- fi
- AM_CONDITIONAL([WITH_STORAGE_FS], [test "$with_storage_fs" = "yes"])
- 
--AC_PATH_PROG([QEMU_IMG], [qemu-img], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
-+AC_MSG_CHECKING([path the of the binary for qemu])
-+AC_ARG_WITH([qemu-path], [AC_HELP_STRING([--with-qemu-path=[path of binary|/usr/bin/qemu]], [Path of the qemu binary])])
-+if test "x$with_qemu_path" == "x" ; then
-+    QEMU_BIN="/usr/bin/qemu"
-+else
-+    QEMU_BIN="$with_qemu_path"
-+fi
-+AC_SUBST([QEMU_BIN])
-+AC_MSG_RESULT($QEMU_BIN)
-+AC_DEFINE_UNQUOTED([QEMU_BIN],["$QEMU_BIN"],
-+      [Path of the qemu program])
-+
-+AC_MSG_CHECKING([path the of the binary for qemu-kvm])
-+AC_ARG_WITH([qemu-kvm-path], [AC_HELP_STRING([--with-qemu-kvm-path=[path of binary|/usr/bin/qemu-kvm]], [Path of the qemu-kvm binary])])
-+if test "x$with_qemu_kvm_path" == "x" ; then
-+    KVM_BIN="/usr/bin/qemu-kvm"
-+else
-+    KVM_BIN="$with_qemu_kvm_path"
-+fi
-+AC_SUBST([KVM_BIN])
-+AC_MSG_RESULT($KVM_BIN)
-+AC_DEFINE_UNQUOTED([KVM_BIN],["$KVM_BIN"],
-+      [Name of the qemu-kvm program])
-+
-+AC_MSG_CHECKING([name the disk image binary for qemu is])
-+AC_ARG_WITH([qemu-img-name], [AC_HELP_STRING([--with-qemu-img-name=[name of binary|qemu-img]], [Name of the qemu-img binary])])
-+if test "x$with_qemu_img_name" == "x" ; then
-+    QEMU_IMG_BIN="qemu-img"
-+else
-+    QEMU_IMG_BIN="$with_qemu_img_name"
-+fi
-+AC_SUBST([QEMU_IMG_BIN])
-+AC_MSG_RESULT($QEMU_IMG_BIN)
-+
-+AC_PATH_PROG([QEMU_IMG], [$QEMU_IMG_BIN], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
- if test -n "$QEMU_IMG" ; then
-   AC_DEFINE_UNQUOTED([HAVE_QEMU_IMG], 1, [whether qemu-img is available for non-raw files])
-   AC_DEFINE_UNQUOTED([QEMU_IMG],["$QEMU_IMG"],
---- libvirt-0.4.4/src/qemu_conf.c	2008-06-19 06:15:02.000000000 -0700
-+++ libvirt-0.4.4-new/src/qemu_conf.c	2008-07-14 04:50:55.000000000 -0700
-@@ -372,7 +372,7 @@
-             if (access("/dev/kvm", F_OK) == 0 &&
-                 virCapabilitiesAddGuestDomain(guest,
-                                               "kvm",
--                                              "/usr/bin/qemu-kvm",
-+                                              KVM_BIN,
-                                               NULL,
-                                               0,
-                                               NULL) == NULL)
---- libvirt-0.4.4/src/qemu_driver.c	2008-06-12 07:52:53.000000000 -0700
-+++ libvirt-0.4.4-new/src/qemu_driver.c	2008-07-14 04:50:27.000000000 -0700
-@@ -1682,7 +1682,9 @@
- {
-     if ((virFileExists("/usr/bin/qemu")) ||
-         (virFileExists("/usr/bin/qemu-kvm")) ||
--        (virFileExists("/usr/bin/xenner"))) {
-+        (virFileExists("/usr/bin/xenner")) ||
-+        (virFileExists(QEMU_BIN)) ||
-+        (virFileExists(KVM_BIN))) {
-         if (getuid() == 0) {
-             return("qemu:///system");
-         } else {
diff --git a/app-emulation/libvirt/files/libvirt-0.4.4-capabilities-kvm-path.patch b/app-emulation/libvirt/files/libvirt-0.4.4-capabilities-kvm-path.patch
deleted file mode 100644
index 677e49542d8a..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.4-capabilities-kvm-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libvirt-0.4.4/src/qemu_conf.c libvirt-0.4.4-new/src/qemu_conf.c
---- libvirt-0.4.4/src/qemu_conf.c	2008-06-19 13:15:02.000000000 +0000
-+++ libvirt-0.4.4-new/src/qemu_conf.c	2008-07-13 19:50:01.000000000 +0000
-@@ -309,7 +309,7 @@
- /* The archicture tables for supported QEMU archs */
- static const struct qemu_arch_info const arch_info_hvm[] = {
-     {  "i686", 32, arch_info_hvm_x86_machines, 2,
--       "/usr/bin/qemu", arch_info_i686_flags, 4 },
-+       "/usr/bin/kvm", arch_info_i686_flags, 4 },
-     {  "x86_64", 64, arch_info_hvm_x86_machines, 2,
-        "/usr/bin/qemu-system-x86_64", arch_info_x86_64_flags, 2 },
-     {  "mips", 32, arch_info_hvm_mips_machines, 1,
diff --git a/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch b/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch
deleted file mode 100644
index a073f062bc6b..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN libvirt-0.4.4/src/qemu_conf.c libvirt-0.4.4-new/src/qemu_conf.c
---- libvirt-0.4.4/src/qemu_conf.c	2008-06-19 13:15:02.000000000 +0000
-+++ libvirt-0.4.4-new/src/qemu_conf.c	2008-07-02 20:47:51.000000000 +0000
-@@ -2612,11 +2612,18 @@
-                 break;
-             }
- 
--            snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s",
--                     disk->src, qemudBusIdToName(disk->bus, 1),
--                     media ? media : "",
--                     idx,
--                     bootable ? ",boot=on" : "");
-+            if (disk->device == QEMUD_DISK_CDROM) {
-+                snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d",
-+                         disk->src, qemudBusIdToName(disk->bus, 1),
-+                         media ? media : "",
-+                         idx);
-+            } else { 
-+                snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s",
-+                         disk->src, qemudBusIdToName(disk->bus, 1),
-+                         media ? media : "",
-+                         idx,
-+                         bootable ? ",boot=on" : "");
-+            }
- 
-             ADD_ARG_LIT("-drive");
-             ADD_ARG_LIT(opt);
diff --git a/app-emulation/libvirt/files/libvirt-0.4.6-add-missing-permission-checks.patch b/app-emulation/libvirt/files/libvirt-0.4.6-add-missing-permission-checks.patch
deleted file mode 100644
index 02b359f0903d..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.6-add-missing-permission-checks.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- libvirt-0.4.6/src/libvirt.c.orig	2008-09-22 09:12:12.000000000 -0400
-+++ libvirt-0.4.6/src/libvirt.c	2009-01-08 23:11:35.000000000 -0500
-@@ -2180,6 +2180,16 @@
-         return NULL;
-     }
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        /* NB, delibrately report error against source object, not dest here */
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     /* Check that migration is supported by both drivers. */
-     if (!VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn,
-                                    VIR_DRV_FEATURE_MIGRATION_V1) ||
-@@ -2257,6 +2267,11 @@
-         return -1;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+
-     if (dconn->driver->domainMigratePrepare)
-         return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
-                                                     uri_in, uri_out,
-@@ -2287,6 +2302,11 @@
-     }
-     conn = domain->conn;
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+
-     if (conn->driver->domainMigratePerform)
-         return conn->driver->domainMigratePerform (domain, cookie, cookielen,
-                                                    uri,
-@@ -2314,6 +2334,11 @@
-         return NULL;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     if (dconn->driver->domainMigrateFinish)
-         return dconn->driver->domainMigrateFinish (dconn, dname,
-                                                    cookie, cookielen,
-@@ -2671,6 +2696,11 @@
-     }
-     conn = dom->conn;
- 
-+    if (dom->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     if (!path) {
-         virLibDomainError (dom, VIR_ERR_INVALID_ARG,
-                            _("path is NULL"));
-@@ -2746,6 +2776,11 @@
-     }
-     conn = dom->conn;
- 
-+    if (dom->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     /* Flags must be VIR_MEMORY_VIRTUAL at the moment.
-      *
-      * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
-@@ -3013,6 +3048,11 @@
- 
-     conn = domain->conn;
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     if (conn->driver->domainSetAutostart)
-         return conn->driver->domainSetAutostart (domain, autostart);
- 
-@@ -3963,6 +4003,11 @@
-         return (-1);
-     }
- 
-+    if (network->conn->flags & VIR_CONNECT_RO) {
-+        virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     conn = network->conn;
- 
-     if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
-@@ -4161,6 +4206,11 @@
-         return NULL;
-     }
- 
-+    if (conn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     if (conn->storageDriver && conn->storageDriver->findPoolSources)
-         return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
- 
-@@ -4834,6 +4884,11 @@
-         return (-1);
-     }
- 
-+    if (pool->conn->flags & VIR_CONNECT_RO) {
-+        virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     conn = pool->conn;
- 
-     if (conn->storageDriver && conn->storageDriver->poolSetAutostart)
diff --git a/app-emulation/libvirt/files/libvirt-0.4.6-parallel-build-fix.patch b/app-emulation/libvirt/files/libvirt-0.4.6-parallel-build-fix.patch
deleted file mode 100644
index 16906ba3a285..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.6-parallel-build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libvirt-0.4.6/python/Makefile.am.orig	2008-11-23 15:32:03.000000000 -0500
-+++ libvirt-0.4.6/python/Makefile.am	2008-11-23 15:36:51.000000000 -0500
-@@ -47,8 +47,11 @@
- 	   libvirt-py.h \
- 	   libvirtclass.py
- 
--$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
-+generated.stamp: $(srcdir)/$(GENERATE) $(API_DESC)
- 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-+	touch $@
-+
-+$(GENERATED): generated.stamp
- 
- libvirt.py: $(srcdir)/libvir.py libvirtclass.py
- 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
-@@ -66,7 +69,7 @@
- uninstall-local:
- 	rm -f $(DESTDIR)$(pythondir)/libvirt.py
- 
--CLEANFILES= $(GENERATED) libvirt.py
-+CLEANFILES= $(GENERATED) generated.stamp libvirt.py
- 
- else
- all:
diff --git a/app-emulation/libvirt/files/libvirt-0.4.6-qemu-img-name.patch b/app-emulation/libvirt/files/libvirt-0.4.6-qemu-img-name.patch
deleted file mode 100644
index a1c27d28b4eb..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.4.6-qemu-img-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libvirt-0.4.6/configure.in.orig	2008-11-20 22:44:26.000000000 -0500
-+++ libvirt-0.4.6/configure.in	2008-11-20 23:06:29.000000000 -0500
-@@ -698,7 +698,14 @@
-     [Location or name of the showmount program])
- fi
- 
--AC_PATH_PROG([QEMU_IMG], [qemu-img], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
-+AC_ARG_WITH([qemu-img-name], [AC_HELP_STRING([--with-qemu-img-name=[name of binary|qemu-img]], [Name of the qemu-img binary])])
-+if test "x$with_qemu_img_name" == "x" ; then
-+    QEMU_IMG_BIN="qemu-img"
-+else
-+    QEMU_IMG_BIN="$with_qemu_img_name"
-+fi
-+
-+AC_PATH_PROG([QEMU_IMG], [$QEMU_IMG_BIN], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
- if test -n "$QEMU_IMG" ; then
-   AC_DEFINE_UNQUOTED([HAVE_QEMU_IMG], 1, [whether qemu-img is available for non-raw files])
-   AC_DEFINE_UNQUOTED([QEMU_IMG],["$QEMU_IMG"],
diff --git a/app-emulation/libvirt/files/libvirt-0.5.1-add-missing-permission-checks.patch b/app-emulation/libvirt/files/libvirt-0.5.1-add-missing-permission-checks.patch
deleted file mode 100644
index 8f45718e000d..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.5.1-add-missing-permission-checks.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Wed, 17 Dec 2008 16:45:22 +0000 (+0000)
-Subject: Add missing checks for read-only connection flag (CVE-2008-5086)
-X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=e87a5440dff8020d7247656368023e1b2d57415c
-
-Add missing checks for read-only connection flag (CVE-2008-5086)
----
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index a4a0df5..7efe1d0 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -2299,6 +2299,16 @@ virDomainMigrate (virDomainPtr domain,
-         return NULL;
-     }
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        /* NB, delibrately report error against source object, not dest here */
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     /* Check that migration is supported by both drivers. */
-     if (VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn,
-                                   VIR_DRV_FEATURE_MIGRATION_V1) &&
-@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr dconn,
-         return -1;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+
-     if (dconn->driver->domainMigratePrepare)
-         return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
-                                                     uri_in, uri_out,
-@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr domain,
-     }
-     conn = domain->conn;
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+
-     if (conn->driver->domainMigratePerform)
-         return conn->driver->domainMigratePerform (domain, cookie, cookielen,
-                                                    uri,
-@@ -2485,6 +2505,11 @@ virDomainMigrateFinish (virConnectPtr dconn,
-         return NULL;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     if (dconn->driver->domainMigrateFinish)
-         return dconn->driver->domainMigrateFinish (dconn, dname,
-                                                    cookie, cookielen,
-@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr dconn,
-         return -1;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+
-     if (dconn->driver->domainMigratePrepare2)
-         return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen,
-                                                      uri_in, uri_out,
-@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr dconn,
-         return NULL;
-     }
- 
-+    if (dconn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     if (dconn->driver->domainMigrateFinish2)
-         return dconn->driver->domainMigrateFinish2 (dconn, dname,
-                                                     cookie, cookielen,
-@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom,
-     }
-     conn = dom->conn;
- 
-+    if (dom->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     if (!path) {
-         virLibDomainError (dom, VIR_ERR_INVALID_ARG,
-                            _("path is NULL"));
-@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom,
-     }
-     conn = dom->conn;
- 
-+    if (dom->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     /* Flags must be VIR_MEMORY_VIRTUAL at the moment.
-      *
-      * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
-@@ -3247,6 +3292,11 @@ virDomainSetAutostart(virDomainPtr domain,
- 
-     conn = domain->conn;
- 
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     if (conn->driver->domainSetAutostart)
-         return conn->driver->domainSetAutostart (domain, autostart);
- 
-@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr network,
-         return (-1);
-     }
- 
-+    if (network->conn->flags & VIR_CONNECT_RO) {
-+        virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     conn = network->conn;
- 
-     if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
-@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConnectPtr conn,
-         return NULL;
-     }
- 
-+    if (conn->flags & VIR_CONNECT_RO) {
-+        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return NULL;
-+    }
-+
-     if (conn->storageDriver && conn->storageDriver->findPoolSources)
-         return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
- 
-@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool,
-         return (-1);
-     }
- 
-+    if (pool->conn->flags & VIR_CONNECT_RO) {
-+        virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return (-1);
-+    }
-+
-     conn = pool->conn;
- 
-     if (conn->storageDriver && conn->storageDriver->poolSetAutostart)
diff --git a/app-emulation/libvirt/files/libvirt-0.5.1-libgnu-reposition.patch b/app-emulation/libvirt/files/libvirt-0.5.1-libgnu-reposition.patch
deleted file mode 100644
index aad576cc1ae7..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.5.1-libgnu-reposition.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libvirt-0.5.1/qemud/Makefile.am.orig	2009-01-08 22:47:27.000000000 -0500
-+++ libvirt-0.5.1/qemud/Makefile.am	2009-01-08 22:55:17.000000000 -0500
-@@ -87,8 +87,7 @@
- 	$(COVERAGE_LDFLAGS) \
- 	$(POLKIT_LIBS)
- 
--libvirtd_LDADD =					\
--		../gnulib/lib/libgnu.la
-+libvirtd_LDADD =
- 
- if ! WITH_DRIVER_MODULES
- if WITH_QEMU
-@@ -223,6 +222,8 @@
- 
- endif # DBUS_INIT_SCRIPTS_RED_HAT
- 
-+libvirtd_LDADD += ../gnulib/lib/libgnu.la
-+
- endif # WITH_LIBVIRTD
- 
- CLEANFILES = libvirtd.init
diff --git a/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch b/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch
deleted file mode 100644
index e3eeda1fe2b8..000000000000
--- a/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/storage_backend_fs.c.old	2009-04-03 14:57:21.000000000 -0500
-+++ src/storage_backend_fs.c	2009-04-03 14:57:54.000000000 -0500
-@@ -1152,7 +1152,7 @@
-                                   vol->target.format);
-             return -1;
-         }
--        if (vol->backingStore.path != NULL) {
-+        if (vol->target.path != NULL) {
-             virStorageReportError(conn, VIR_ERR_NO_SUPPORT,
-                                   _("copy-on-write image not supported with "
-                                     "qcow-create"));
diff --git a/app-emulation/libvirt/libvirt-0.4.6-r1.ebuild b/app-emulation/libvirt/libvirt-0.4.6-r1.ebuild
deleted file mode 100644
index 2f405fefa0be..000000000000
--- a/app-emulation/libvirt/libvirt-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.4.6-r1.ebuild,v 1.2 2009/02/20 17:47:32 cardoe Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi lvm kvm openvz parted qemu sasl selinux xen" #policykit is in package.mask
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-misc/bridge-utils
-	net-analyzer/netcat
-	net-dns/dnsmasq
-	dev-util/pkgconfig
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	qemu? ( app-emulation/qemu )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	"
-	#policykit? ( >=sys-auth/policykit-0.6 )
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/"${P}"-qemu-img-name.patch
-	epatch "${FILESDIR}"/"${P}"-parallel-build-fix.patch
-	epatch "${FILESDIR}"/"${P}"-add-missing-permission-checks.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	if ! use qemu && ! use xen && ! use openvz && ! use kvm ; then
-		local msg="You must enable one of these USE flags: qemu xen openvz kvm"
-		eerror "$msg"
-		die "$msg"
-	fi
-}
-
-src_compile() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		# fix path for kvm-img but use qemu-img if the useflag is set
-		my_conf="--with-qemu \
-			$(use_with !qemu qemu-img-name kvm-img)"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with avahi) \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with openvz) \
-		$(use_with parted storage-disk) \
-		$(use_with sasl) \
-		$(use_with selinux) \
-		$(use_with xen) \
-		${my_conf} \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid \
-		|| die "econf failed"
-		#$(use_with policykit) \
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-	newinitd "${FILESDIR}"/libvirtd.init libvirtd
-	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
-}
diff --git a/app-emulation/libvirt/libvirt-0.5.1.ebuild b/app-emulation/libvirt/libvirt-0.5.1.ebuild
deleted file mode 100644
index b291d7182acc..000000000000
--- a/app-emulation/libvirt/libvirt-0.5.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.5.1.ebuild,v 1.2 2009/02/20 17:47:32 cardoe Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi lvm lxc hal kvm openvz parted qemu sasl selinux uml xen"
-# policykit is in package.mask
-# devicekit isn't in portage
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-misc/bridge-utils
-	net-analyzer/netcat
-	net-dns/dnsmasq
-	dev-util/pkgconfig
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	qemu? ( app-emulation/qemu )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	"
-	#policykit? ( >=sys-auth/policykit-0.6 )
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/"${PN}"-0.4.6-qemu-img-name.patch
-	epatch "${FILESDIR}"/"${PN}"-0.4.6-parallel-build-fix.patch
-	epatch "${FILESDIR}"/"${P}"-libgnu-reposition.patch
-	epatch "${FILESDIR}"/"${P}"-add-missing-permission-checks.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	local hasbackend=0
-	local backends="lxc kvm openvz qemu uml xen"
-	local backend
-
-	for backend in $backends ; do
-		use $backend && hasbackend=1
-	done
-
-	if [ "$hasbackend" == 0 ]; then
-		local msg="You must enable one of these USE flags: $backends"
-		eerror "$msg"
-		die "$msg"
-	fi
-}
-
-src_compile() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		# fix path for kvm-img but use qemu-img if the useflag is set
-		my_conf="--with-qemu \
-			$(use_with !qemu qemu-img-name kvm-img)"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with avahi) \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with lxc) \
-		$(use_with hal) \
-		$(use_with openvz) \
-		$(use_with parted storage-disk) \
-		$(use_with sasl) \
-		$(use_with selinux) \
-		$(use_with uml) \
-		$(use_with xen) \
-		${my_conf} \
-		--without-devkit \
-		--without-polkit \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid \
-		|| die "econf failed"
-		#$(use_with policykit) \
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-	newinitd "${FILESDIR}"/libvirtd.init libvirtd
-	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
-}
-
-pkg_postinst() {
-	elog "To allow normal users to connect to libvirtd you must change the"
-	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-}
diff --git a/app-emulation/libvirt/libvirt-0.6.2.ebuild b/app-emulation/libvirt/libvirt-0.6.2.ebuild
deleted file mode 100644
index ee1a15697146..000000000000
--- a/app-emulation/libvirt/libvirt-0.6.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.6.2.ebuild,v 1.1 2009/04/17 15:01:16 cardoe Exp $
-
-EAPI=1
-
-inherit eutils autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi hal kvm lvm +lxc +network openvz parted qemu sasl selinux uml xen"
-# policykit is in package.mask
-# devicekit isn't in portage
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-analyzer/netcat
-	dev-util/pkgconfig
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	qemu? ( app-emulation/qemu )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	"
-	#policykit? ( >=sys-auth/policykit-0.6 )
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/"${PN}"-0.4.6-qemu-img-name.patch
-	epatch "${FILESDIR}"/"${P}"-storage-fix.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	local hasbackend=0
-	local backends="lxc kvm openvz qemu uml xen"
-	local backend
-
-	for backend in $backends ; do
-		use $backend && hasbackend=1
-	done
-
-	if [ "$hasbackend" == 0 ]; then
-		local msg="You must enable one of these USE flags: $backends"
-		eerror "$msg"
-		die "$msg"
-	fi
-}
-
-src_compile() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		# fix path for kvm-img but use qemu-img if the useflag is set
-		my_conf="--with-qemu \
-			$(use_with !qemu qemu-img-name kvm-img)"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with avahi) \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with lxc) \
-		$(use_with hal) \
-		$(use_with openvz) \
-		$(use_with parted storage-disk) \
-		$(use_with sasl) \
-		$(use_with selinux) \
-		$(use_with uml) \
-		$(use_with xen) \
-		$(use_with network) \
-		${my_conf} \
-		--without-devkit \
-		--without-polkit \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid \
-		|| die "econf failed"
-		#$(use_with policykit) \
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-	newinitd "${FILESDIR}"/libvirtd.init libvirtd
-	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
-}
-
-pkg_postinst() {
-	elog "To allow normal users to connect to libvirtd you must change the"
-	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-}
diff --git a/app-emulation/libvirt/libvirt-0.6.3-r1.ebuild b/app-emulation/libvirt/libvirt-0.6.3-r1.ebuild
deleted file mode 100644
index 5cda769a6804..000000000000
--- a/app-emulation/libvirt/libvirt-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.6.3-r1.ebuild,v 1.1 2009/05/27 22:34:30 cardoe Exp $
-
-EAPI="2"
-
-inherit eutils autotools confutils
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi hal kvm lvm +lxc +network nls openvz policykit parted qemu \
-	sasl selinux uml virtualbox xen"
-# devicekit isn't in portage
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-analyzer/netcat
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( app-emulation/qemu )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	virtualbox? ( app-emulation/virtualbox-bin )
-	xen? ( app-emulation/xen-tools app-emulation/xen )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-kvm-85-argv-detection.patch" \
-		"${FILESDIR}/${P}-kvm-img.patch"
-	eautoreconf
-
-	#	"${FILESDIR}/${PN}-0.6.2-storage-fix.patch" \
-}
-
-pkg_setup() {
-	confutils_require_any lxc kvm openvz qemu uml virtualbox xen
-}
-
-src_configure() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		my_conf="--with-qemu"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with parted storage-disk) \
-		$(use_with lxc) \
-		$(use_with openvz) \
-		$(use_with uml) \
-		$(use_with virtualbox vbox) \
-		$(use_with xen) \
-		$(use_with xen xen-inotify) \
-		$(use_with avahi) \
-		$(use_with hal) \
-		$(use_with sasl) \
-		$(use_with network) \
-		$(use_with policykit polkit) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		${my_conf} \
-		--without-devkit \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake instal lfailed"
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-
-	newinitd "${FILESDIR}/libvirtd.init" libvirtd
-	newconfd "${FILESDIR}/libvirtd.confd" libvirtd
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_postinst() {
-	elog "To allow normal users to connect to libvirtd you must change the"
-	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	elog
-	ewarn "If you have a DNS server setup on your machine, you will have"
-	ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-	ewarn " bind-interfaces"
-	ewarn " interface or except-interface"
-	elog
-	ewarn "Otherwise you might have issues with your existing DNS server."
-}
diff --git a/app-emulation/libvirt/libvirt-0.6.3-r2.ebuild b/app-emulation/libvirt/libvirt-0.6.3-r2.ebuild
deleted file mode 100644
index 894ebb830dea..000000000000
--- a/app-emulation/libvirt/libvirt-0.6.3-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.6.3-r2.ebuild,v 1.1 2009/05/28 16:27:25 cardoe Exp $
-
-EAPI="2"
-
-inherit eutils autotools confutils
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi hal kvm lvm +lxc +network nls numa openvz policykit \
-	parted qemu sasl selinux uml virtualbox xen"
-# devicekit isn't in portage
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-analyzer/netcat
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( >=app-emulation/qemu-0.10.0 )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	virtualbox? ( >=app-emulation/virtualbox-bin-2.2.0 )
-	xen? ( app-emulation/xen-tools app-emulation/xen )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	# Fix argv handling for KVM 85 and newer
-	epatch "${FILESDIR}/${P}-kvm-85-argv-detection.patch"
-	# Patch sent upstream for working with kvm-img
-	epatch "${FILESDIR}/${P}-kvm-img.patch"
-	# upstream patch. fix shared/read-only disk labeling
-	epatch "${FILESDIR}/${PN}-0.6.2-shared-readonly-label.patch"
-	# upstream patch. fix <hostdev managed='yes'>
-	epatch "${FILESDIR}/${P}-hostdev-managed.patch"
-	# upstream patch. refresh qemu caps when getCapabilities is called
-	epatch "${FILESDIR}/${P}-refresh-qemu-caps.patch"
-	# upstream patch. enable migration support which appeared in QEMU 0.10.0
-	epatch "${FILESDIR}/${PN}-0.6.2-enable-qemu-0-10-migration.patch"
-	# upstream patch. don't try to label a disk with no path (empty cdrom)
-	epatch "${FILESDIR}/${PN}-0.6.2-fix-nosource-label.patch"
-
-	eautoreconf
-}
-
-pkg_setup() {
-	confutils_require_any lxc kvm openvz qemu uml virtualbox xen
-}
-
-src_configure() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		my_conf="--with-qemu"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with parted storage-disk) \
-		$(use_with lxc) \
-		$(use_with openvz) \
-		$(use_with uml) \
-		$(use_with virtualbox vbox) \
-		$(use_with xen) \
-		$(use_with xen xen-inotify) \
-		$(use_with avahi) \
-		$(use_with hal) \
-		$(use_with sasl) \
-		$(use_with network) \
-		$(use_with policykit polkit) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with numa numactl) \
-		${my_conf} \
-		--without-devkit \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake instal lfailed"
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-
-	newinitd "${FILESDIR}/libvirtd.init" libvirtd
-	newconfd "${FILESDIR}/libvirtd.confd" libvirtd
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_postinst() {
-	elog "To allow normal users to connect to libvirtd you must change the"
-	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	elog
-	ewarn "If you have a DNS server setup on your machine, you will have"
-	ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-	ewarn " bind-interfaces"
-	ewarn " interface or except-interface"
-	elog
-	ewarn "Otherwise you might have issues with your existing DNS server."
-}
diff --git a/app-emulation/libvirt/libvirt-0.6.3.ebuild b/app-emulation/libvirt/libvirt-0.6.3.ebuild
deleted file mode 100644
index 641114431f2a..000000000000
--- a/app-emulation/libvirt/libvirt-0.6.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.6.3.ebuild,v 1.1 2009/05/21 14:43:36 dev-zero Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi hal kvm lvm +lxc +network openvz policykit parted qemu sasl selinux uml xen"
-# devicekit isn't in portage
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=dev-libs/libxml2-2.5
-	>=net-libs/gnutls-1.0.25
-	dev-lang/python
-	sys-fs/sysfsutils
-	net-analyzer/netcat
-	avahi? ( >=net-dns/avahi-0.6 )
-	iscsi? ( sys-block/open-iscsi )
-	kvm? ( app-emulation/kvm )
-	lvm? ( sys-fs/lvm2 )
-	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-apps/parted-1.8 )
-	qemu? ( app-emulation/qemu )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	policykit? ( >=sys-auth/policykit-0.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-0.4.6-qemu-img-name.patch" \
-		"${FILESDIR}/${PN}-0.6.2-storage-fix.patch" \
-		"${FILESDIR}/${P}-kvm-85-argv-detection.patch"
-	eautoreconf
-}
-
-pkg_setup() {
-	local hasbackend=0
-	local backends="lxc kvm openvz qemu uml xen"
-	local backend
-
-	for backend in $backends ; do
-		use $backend && hasbackend=1
-	done
-
-	if [ "$hasbackend" == 0 ]; then
-		local msg="You must enable one of these USE flags: $backends"
-		eerror "$msg"
-		die "$msg"
-	fi
-}
-
-src_configure() {
-	local my_conf=""
-	if use qemu || use kvm ; then
-		# fix path for kvm-img but use qemu-img if the useflag is set
-		my_conf="--with-qemu \
-			$(use_with !qemu qemu-img-name kvm-img)"
-	else
-		my_conf="--without-qemu"
-	fi
-
-	econf \
-		$(use_with avahi) \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with lxc) \
-		$(use_with hal) \
-		$(use_with openvz) \
-		$(use_with parted storage-disk) \
-		$(use_with sasl) \
-		$(use_with selinux) \
-		$(use_with uml) \
-		$(use_with xen) \
-		$(use_with network) \
-		$(use_with policykit polkit) \
-		${my_conf} \
-		--without-devkit \
-		--with-remote \
-		--disable-iptables-lokkit \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake instal lfailed"
-	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-
-	newinitd "${FILESDIR}/libvirtd.init" libvirtd
-	newconfd "${FILESDIR}/libvirtd.confd" libvirtd
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_postinst() {
-	elog "To allow normal users to connect to libvirtd you must change the"
-	elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-}