Remove older versions

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

6 files changed, 16 insertions, 1017 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 4e6cf38cda2f..f9085efa3724 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.275 2013/06/04 20:02:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.276 2013/06/04 20:08:17 cardoe Exp $
+
+  04 Jun 2013; Doug Goldstein <cardoe@gentoo.org> -files/libvirt-1.0.5.1-0001-cg
+  roup-be-robust-against-cgroup-movement-races.patch, -files/libvirt-1.0.5.1-000
+  2-qemu-fix-NBD-migration-to-hosts-with-IPv6-enabled.patch,
+  -libvirt-1.0.5.1-r1.ebuild, -libvirt-1.0.5.1.ebuild:
+  Remove older versions
 
 *libvirt-1.0.5.1-r2 (04 Jun 2013)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index b4f2d45e0405..025aed355415 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libvirt-1.0.5.1-0001-cgroup-be-robust-against-cgroup-movement-races.patch 3807 SHA256 9bb96978edbba9435bcc92bfa94ae00d31299204d0092d5ac01938d85dd1c6f0 SHA512 820a1aa759f8a7ecaa8ee86f2269bfdef76cc3f0ba7a107f40f91779dc6647c1e496b3f7746dfbe8675eed0f9a7a58aa7fe2f85a428ee4a65f76f3f2673d72e3 WHIRLPOOL 2cc661247b164f0d13c9ff5ecb8a017e21cbb52b162ddd92621b8b9a1c286a4f35574684b5771d89a6f342acf72815ccc4c1d67e38214afef15bbcf7114ee1fe
-AUX libvirt-1.0.5.1-0002-qemu-fix-NBD-migration-to-hosts-with-IPv6-enabled.patch 1544 SHA256 ec99ea7735b7f5ad1069017d55b2322c27cdb2238b7a4fea6e62468a4bb2d085 SHA512 146ecabab523dc64f4b52177c6db45bde7e78fc1072f8bd879ccadafd1cd252cafd461cfef547ec3b93cd1efb93e1dd26961b9240eedb5f4f766ac16a411b367 WHIRLPOOL 4ef5edda37f10ff47d93a050068d6069bc18c38fed755ec923a83e70ba8e2843079cc63f1249b6f9398d4614a83972a444b72a553cfbc5911257840d9846e6d1
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.init-r11 3656 SHA256 51c3b79c1a71638211056f11085936d40874c5eb1440512309a5c0837f5a59e1 SHA512 c1743271fcf18eef38d9202ca58c7d052159262cb75283ce13739f6a21f3c6024cac567f52f082744c8f4321b857ace4489cc363281a7757920dc306b618d27f WHIRLPOOL 827f3908c5580e526ba83efd005c72d5024ed04072aab00e372347315d9cb6be88512c9148b5283d01190c2ef2ffa4fec477c28299afe70414c76188258103b2
 DIST libvirt-1.0.2-1b2f2439.tar.xz 3184 SHA256 fb7cbd3add0b54927b1be4bc753e0f0279e11f5b85bb692d44fb9b99b85722da SHA512 a45cd0896dbf845472135cb3548eff731f6a6c89af2d90c44094d3c07a8f19c8c8422dc43228a0c4b0c04b1b11bae2bc2a271f02bea598d36b52c42fb60ddc19 WHIRLPOOL bf0760fcf5245d0c3347f1969605fcb3df86c93e183b468c0421b88801db5f0984c4d1ce5a3ebc7b72a53f585d17db7fa984f7fbfa6e8f1d2c65819f3fd3ed27
@@ -15,22 +13,20 @@ DIST libvirt-1.0.5.1.tar.gz 23928327 SHA256 38a67d9dc979ed28440791eb3fd63e94e4d0
 EBUILD libvirt-1.0.2-r2.ebuild 11853 SHA256 cfff47a9f5bd41edfb2db44755800c42576a0e6f378fa8b3cdbf0f120d0a7ec2 SHA512 c4dcaefb32a9be93e5c7836db45332645a5fb1b4aa96f338dd417552e450e896f6334887001cab591c6d9efe0bea6fc4ddb573d21cfc6ff686c91f02fe1cd290 WHIRLPOOL c6857ac5588ef3aea6bffe4df5ed254f4941d9e647642bf23575d6cd3357250d0c2e9ac4a40fb17a25a390b71604fb7671a8fe7ab619559e7f24552165722a6e
 EBUILD libvirt-1.0.3-r2.ebuild 12003 SHA256 9487bfd65d6c0f959c0932d78a3852906283473e2cea81c6f481a291e01e19f8 SHA512 e330564b03751f950da2a83a1018f857631231b27b7976d379ee1bfc44bf6e5929c08a1f69f3a4fde7ccf92f25a90a25e720c6ad6c9ec6efa15c27a8a6cf6814 WHIRLPOOL 9ee7c51da91107e99247e0d1eb0bf4d22110fc43cdb5c47b749e5d2a2226c882ce9d5c5b0a5761ce01ac1344ce7d375670e6935ce760c47766f042c96e3247d6
 EBUILD libvirt-1.0.4.ebuild 12003 SHA256 cf78e7e1b6d2a649f5bc9809aad9f1deda023acd06df7d1143a6d5fd0425d669 SHA512 be893f168ab1bb1fa283dd1bbab059638f4ab5e3957958a6b285f438389152df2041a4d8c5bdc17dc2f53ce46449e0a28be6666dd8ba0a41b507ae2e2a3ff41a WHIRLPOOL a527fdcb016734fbf005dc674ef0515462b7d6f41f4755bfe90ee297bcab1e9405b6d3a081c270917a57b8c91618ba2082adf7de7377c6594025f5a339aa11f1
-EBUILD libvirt-1.0.5.1-r1.ebuild 12272 SHA256 555340d0346a948bad6a6f9d3911878f0987403d33cb12656dd463b6244cbed8 SHA512 51218973d83c94c521de7efbfe3d6cd7440a1aa2bcf3333bbdf7aff5ab9282c7c4308bad2854c10fa86067e22a77b019e040e68535887d9c5e0074dbfc54359c WHIRLPOOL d25a89497c7825d5d6c19c9621fde750996222cd10d45309c92cffc69db97ce1f7c4f2ab24f4bb5acef1291585bc927876a70c179dd925b4d5e1636c69e1ecf1
 EBUILD libvirt-1.0.5.1-r2.ebuild 12192 SHA256 a44c31540e64b1428a34c1e78191437025cc52be2d37b1a88e9b010d6ccd7be3 SHA512 45eeec184a92d7e3cc5c482131c9c11d09807b5b1b36f4847516714b6e96b60ec97a4a2ad8596d6937e9933c498d4c41b6bce576b4ca6044372ba07b3987da70 WHIRLPOOL 58d90ddb39c36a3966e8ed5abe32bbf27115fff2420b69dca129f9fc4392ac6384ff734b9f701d08b0ee88dd153cab6551b387fc446fd3623422ef7d958fa0c5
-EBUILD libvirt-1.0.5.1.ebuild 12190 SHA256 8cd437a87cf22a9d6361d3cc5b8edaa4f011153286e2090c35638235e374d031 SHA512 f90eb088c10a8c9b94ae0195cb104b0776fd6cd28fd098987d0de4765e9da1b54a0f2841570a9ec54557a11f0d86fbabcc8a289194f760352a539ef7a1c3182f WHIRLPOOL 8cd9e3afc9e2c3f1aef49678642dc45efeb846a18db91e16c611ee768d326a6b478145d90b6012a1dbecd7d89220d9a22905771cde33835e024f786931828901
 EBUILD libvirt-9999.ebuild 12105 SHA256 feaa2fae6c1cd35f1d834267189fd2ed8a83a8b83eb356d45f8983722eb50202 SHA512 ce7a32702484cc33c07754c031b9fcd633dac29b7efb430ce02e36294809d821e13146c75ad9e6d622cf673392de87c2f18f426111efea97fd9f62a9346c3363 WHIRLPOOL 5ad7f14c98c5419c67e3ed0e2cc6a26b8e2efc228f1d84468f0748e933cd531b8aa2397c67518dfb6a49ef5941120e830b275212521c8cfa9958db58f8e530c0
-MISC ChangeLog 4521 SHA256 1ce92263ac12049df24aa56a83894a8c77439360019b9b06eaf1a9325a05a35d SHA512 8e18e8e362c371341342dc884513214f08885e4f04ca00b2e9138e7cb9d65b0b54a05996c4660d85e4aa4be0074d76550518c5900cd36f9806a05bcab213cc2b WHIRLPOOL a48bee9241ff976899d8d75560ccbf396a2a56c251c6db650dbf8759c25442937f5516834c02cbdc9ce3d0d86fbc13bb6091f6d7c7ade45fec364f4f45775209
+MISC ChangeLog 4824 SHA256 7e4345528b4f364d798dadf57413b9319c5c13c3f580a85c2d8ef12c4fd1e801 SHA512 ddabfe1ff83ae747ecbf3c67f9d2f461cc00ce325d422ccabd3389b378458d4b64d3b6c5fab930315a6f755b5f663652191d632d65bb8d19b6a5a3f9559c09c6 WHIRLPOOL 6459a6fa136b50f9c0418543ec082c94097ffe1e8cca0c3c2131911900ac32c31275a1c19fd454d97f8d744958d6b7eae26555a45b86fd6170da9183f050a517
 MISC metadata.xml 3518 SHA256 b4d7597acd9441b02afd05f1f4d51522f657f9ecafc9a77c66e1633b4991ee8a SHA512 f5fbd24db303d44b0801d5ea78815c169a668d090e039450979b495e00a852a8fbc8bf3bd65534cfcdb7540834af3f1496ce2a9abf449e39f83975b6892a6d87 WHIRLPOOL 086aa2e815bc5bb2ad8a0c54b6d1522e40b5c60662839c5792f7f96e03af9f5706a195f2c940ed82d04267ed8c0d40838326fb714848be006fac8982ecd80485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRrkfVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRrkkyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv3jgH/0pADOqL6vEOfDMVKN9FkDYb
-gDHSCqVZNHV9JymzCVUmrPvAQl9xWnSONyNjwt3Yj8CAZHJ7UHPrptIFcbalceM8
-yw8B++u8L5lmCUCnFuTC0gdie0CA4mVaZ48OO5aY0e44xzr7cg+Bv4bIB8N7kqyj
-6gqhKiCUvS6BOSqgE/kSRLgCBILWCnRJhAljgCax+qj2EJSrQ/Vxu8mNsyvdDD6T
-uNk0Kevg3T8vdLRSrYolPEoT1gH4hotgag3dlFVU4HdeYenqrLt/KGyTI5EeQXos
-yOx497HDk4MtKup6VNLykvV1LvkyC2YT8FWb7Yi6LUbimBp5A8+oTok4J0ntQR0=
-=M771
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvbEkIAIFAsoBbmPBBeeeHWI9whzE1
+/sIq/05Qu5b0Zinj/+4liCXhSEwvSZb3jpK/mYdjEjkCX6xWq6Dl5koG6KzTpGyc
+P3zmsimUFGDdlxub20ojcTC+3/fienD1XPtSdUd4WwrfZa7OWmKfErBVdn2969xU
+84k0VtKdG668YNyUril3tGpoxuLqBFN7R3KmHjckIBQM7JXC5KTeFYSmaUcbHLnQ
+7HfxJN9Lg9BFSCXRITin+TghWiUtm5rS/uQX8ccThLY/cKVg1TZmsg6njyH+UUVH
+7UNBOj5E/1K5kF6M0Qwia88iWXtw5peV+MRqnz/LuEMjbPs6v3YVM81FG2S5quM=
+=dkfp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirt-1.0.5.1-0001-cgroup-be-robust-against-cgroup-movement-races.patch b/app-emulation/libvirt/files/libvirt-1.0.5.1-0001-cgroup-be-robust-against-cgroup-movement-races.patch
deleted file mode 100644
index fcae2530fec6..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.0.5.1-0001-cgroup-be-robust-against-cgroup-movement-races.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From b4541a2f3d7ed9e1522065195b4f31529228e493 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 20 May 2013 20:30:30 -0600
-Subject: [PATCH 1/2] cgroup: be robust against cgroup movement races
-
-https://bugzilla.redhat.com/show_bug.cgi?id=965169 documents a
-problem starting domains when cgroups are enabled; I was able
-to reliably reproduce the race about 5% of the time when I added
-hooks to domain startup by 3 seconds (as that seemed to be about
-the length of time that qemu created and then closed a temporary
-thread, probably related to aio handling of initially opening
-a disk image).  The problem has existed since we introduced
-virCgroupMoveTask in commit 9102829 (v0.10.0).
-
-There are some inherent TOCTTOU races when moving tasks between
-kernel cgroups, precisely because threads can be created or
-completed in the window between when we read a thread id from the
-source and when we write to the destination.  As the goal of
-virCgroupMoveTask is merely to move ALL tasks into the new
-cgroup, it is sufficient to iterate until no more threads are
-being created in the old group, and ignoring any threads that
-die before we can move them.
-
-It would be nicer to start the threads in the right cgroup to
-begin with, but by default, all child threads are created in
-the same cgroup as their parent, and we don't want vcpu child
-threads in the emulator cgroup, so I don't see any good way
-of avoiding the move.  It would also be nice if the kernel were
-to implement something like rename() as a way to atomically move
-a group of threads from one cgroup to another, instead of forcing
-a window where we have to read and parse the source, then format
-and write back into the destination.
-
-* src/util/vircgroup.c (virCgroupAddTaskStrController): Ignore
-ESRCH, because a thread ended between read and write attempts.
-(virCgroupMoveTask): Loop until all threads have moved.
-
-Signed-off-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit 83e4c77547f5b721afad19a452f41c31daeee8c5)
----
- src/util/vircgroup.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index b05fc45..92b185e 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1037,7 +1037,11 @@ static int virCgroupAddTaskStrController(virCgroupPtr group,
-             goto cleanup;
- 
-         rc = virCgroupAddTaskController(group, p, controller);
--        if (rc != 0)
-+        /* A thread that exits between when we first read the source
-+         * tasks and now is not fatal.  */
-+        if (rc == -ESRCH)
-+            rc = 0;
-+        else if (rc != 0)
-             goto cleanup;
- 
-         next = strchr(cur, '\n');
-@@ -1074,15 +1078,23 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group)
-             !dest_group->controllers[i].mountPoint)
-             continue;
- 
--        rc = virCgroupGetValueStr(src_group, i, "tasks", &content);
--        if (rc != 0)
--            return rc;
-+        /* New threads are created in the same group as their parent;
-+         * but if a thread is created after we first read we aren't
-+         * aware that it needs to move.  Therefore, we must iterate
-+         * until content is empty.  */
-+        while (1) {
-+            rc = virCgroupGetValueStr(src_group, i, "tasks", &content);
-+            if (rc != 0)
-+                return rc;
-+            if (!*content)
-+                break;
- 
--        rc = virCgroupAddTaskStrController(dest_group, content, i);
--        if (rc != 0)
--            goto cleanup;
-+            rc = virCgroupAddTaskStrController(dest_group, content, i);
-+            if (rc != 0)
-+                goto cleanup;
- 
--        VIR_FREE(content);
-+            VIR_FREE(content);
-+        }
-     }
- 
- cleanup:
--- 
-1.8.1.5
-
diff --git a/app-emulation/libvirt/files/libvirt-1.0.5.1-0002-qemu-fix-NBD-migration-to-hosts-with-IPv6-enabled.patch b/app-emulation/libvirt/files/libvirt-1.0.5.1-0002-qemu-fix-NBD-migration-to-hosts-with-IPv6-enabled.patch
deleted file mode 100644
index 09936eea6c76..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.0.5.1-0002-qemu-fix-NBD-migration-to-hosts-with-IPv6-enabled.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3accd7eb25f3646e15511af4cb0d09c3bf2ce143 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 23 May 2013 15:51:05 +0200
-Subject: [PATCH 2/2] qemu: fix NBD migration to hosts with IPv6 enabled
-
-Since f03dcc5 we use [::] as the listening address both on qemu
-command line in -incoming and in nbd-server-start QMP command.
-However the latter requires just :: without the braces.
-(cherry picked from commit 2326006410a921bba38c0ce67a367cd1ea88cc33)
----
- src/qemu/qemu_migration.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 6ad1c30..adc967a 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -1114,6 +1114,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
-     unsigned short port = 0;
-     char *diskAlias = NULL;
-     size_t i;
-+    const char *host;
-+
-+    if (STREQ(listenAddr, "[::]"))
-+        host = "::";
-+    else
-+        host = listenAddr;
- 
-     for (i = 0; i < vm->def->ndisks; i++) {
-         virDomainDiskDefPtr disk = vm->def->disks[i];
-@@ -1135,7 +1141,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
- 
-         if (!port &&
-             ((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) ||
--             (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) {
-+             (qemuMonitorNBDServerStart(priv->mon, host, port) < 0))) {
-             qemuDomainObjExitMonitor(driver, vm);
-             goto cleanup;
-         }
--- 
-1.8.1.5
-
diff --git a/app-emulation/libvirt/libvirt-1.0.5.1-r1.ebuild b/app-emulation/libvirt/libvirt-1.0.5.1-r1.ebuild
deleted file mode 100644
index 721a8ecdf02b..000000000000
--- a/app-emulation/libvirt/libvirt-1.0.5.1-r1.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.1-r1.ebuild,v 1.1 2013/05/28 17:07:00 cardoe Exp $
-
-EAPI=5
-
-#BACKPORTS=9bf6bec4
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python user autotools linux-info systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt
-	=dev-lang/python-2*"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch "${FILESDIR}"/${P}-0001*.patch
-	epatch "${FILESDIR}"/${P}-0002*.patch
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r11" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		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"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		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"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-1.0.5.1.ebuild b/app-emulation/libvirt/libvirt-1.0.5.1.ebuild
deleted file mode 100644
index b32f4659af6f..000000000000
--- a/app-emulation/libvirt/libvirt-1.0.5.1.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.1.ebuild,v 1.6 2013/05/28 15:25:57 cardoe Exp $
-
-EAPI=5
-
-#BACKPORTS=9bf6bec4
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python user autotools linux-info systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt
-	=dev-lang/python-2*"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r11" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		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"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		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"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}