Clean out older versions

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CE396377CFE7E2B!

5 files changed, 20 insertions, 1009 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ca2c4deaff0d..1526a417bd27 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.362 2014/05/15 02:27:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.363 2014/05/17 14:37:15 cardoe Exp $
+
+  17 May 2014; Doug Goldstein <cardoe@gentoo.org> -files/libvirtd.init-r12,
+  -libvirt-1.1.3.3.ebuild, -libvirt-1.2.1.ebuild:
+  Clean out older versions
 
 *libvirt-1.2.4 (15 May 2014)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index eeee3abe7421..a715120ea245 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,38 +2,33 @@
 Hash: SHA256
 
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
-AUX libvirtd.init-r12 3668 SHA256 bae1b0766423b8ff879a7490a2b3e6381029638558923d8c0047414e97b881a5 SHA512 b24cf7dd0f6db454bb23bf4e9c4d40050f6d5aaa43f5b95a04238e028f1cb5c735ba605f6f01caf814f2d2a36407abc6fd1d751e66887fc7af78d543e4b61dd6 WHIRLPOOL 3c04c3acfa061144d16e1e9f2b35e37437855b0162d3ce0d7d3d39618fcfe855d8e82fdf4e16aee8d6cc591424d3d0875a32edd02646e02203b5ca239b7f5d64
 AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff96fa340158ceed09e35 SHA512 d50898c07291aefc0025aa51e7f4356c1e5d7b22c3d6d4c31f6da3dc4b23d88e2678568c4f2c755c6763ddce9bfc0e2aedeba52f001daba9ff3cbba2cd57ebf3 WHIRLPOOL 6a8a39b39b7e9d6efca47800e886cbb1e88b9e948c3ac623d120780d34f1fd8bba48c83e445fd0c0bdbff67926fcc577640eb4db0137fb5d703abc6eaf790dfb
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
-DIST libvirt-1.1.3.3.tar.gz 26611343 SHA256 81f3527b5e647d128af18b21ea924ffb4f8b6420fe87d19f09829af7b31982e9 SHA512 01fb1b70fc537cdb0986f09066df3af61ed3d949814c42438842e4ceb44e919a1a1a4f1d9e3d4adaab050fbcb4dffc218b1b9f7fbbae1d035a7c0edc2fc3f03e WHIRLPOOL cf5cc9d298deac77c7f6ff5a3a8edac8f63bdf93a423fefa8a4969fa0d03ec35864a7fd1894c4fd37daad731c018d3c0b7e55fe92321bbc3f106fb73728f1e8d
 DIST libvirt-1.1.3.4.tar.gz 26646511 SHA256 d2d62f55e925f38923339c79fb58dd0e2509b79f63e9463addc778b64112bf94 SHA512 8c27757238002e2dced7920d35cdbff4b908d61b26e92e39b77520349ee5492044827106a71c276dc86c03a1a34e75dc8abd200f56a675eae52a114a6c67ddf2 WHIRLPOOL ee4229fa79fb1419663bd61a296011c63765319725ef006d902523e3c67ce7f77417978d8f3d57a7c61b8827998771f163666317ec5e142f201dab16ecd3bf18
-DIST libvirt-1.2.1.tar.gz 27228694 SHA256 bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898 SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0 WHIRLPOOL 75c2a37b1101950474aad8931d999564ff575512d38c9e8d2cf989cef3ad7057853046b738b20bd77be80c1e6677319aea7227797ae95ce91512dc36bd05a142
 DIST libvirt-1.2.3.tar.gz 28605530 SHA256 b489d1a29c6166643d34b72795a89b03c6ac775cdaeadb6aa86fc1a982c02e31 SHA512 5ff85a98a0c62229d0ab8125d20fce982f8497d20cb89758bc37f475d7a5d59caa6d962e6c2313e1c494ca1648a836fcad253ceaccc34cc0060135470be3db5b WHIRLPOOL a431ff4584abed3454f30811b3673c0268f5d172d26d768c3157f1eddb8e242c084e7d81b9ea4c6fabd8f42a424cffae81b4695f475a8e6173a7710605a79f02
 DIST libvirt-1.2.4.tar.gz 28690741 SHA256 e43ac5f6b2baeafcd01777be03a897e636f8d48c0cdfb4c4cbb80d45faa9e875 SHA512 49be7fe73cbcdf51e6978740fd3603f21f813c388da89a139a09195d68d3ff445d2c939a1ea212c7498e8c2ace9685a8fb52dfd8ccb88a26ecf9b4228d502616 WHIRLPOOL 10793dcc4f535d54ccafa384023b25e608ee011aae73258cce6e713a451292f9af483470a95a351717000dce391b292e1dd1999988a2c1c3a71c3a76edd22bff
-EBUILD libvirt-1.1.3.3.ebuild 12250 SHA256 e74bba4b644968f08a0f11dbcc72c9f0b91b24ef01bc8fcc3d45ef82846d541f SHA512 ea2484d2ecb8575546c6a08a51eaca3de360f826620afe359a86869b0cddf388088d761bcf739916241b68a880bcc015041dae9c374fe1ad71999e896e83156b WHIRLPOOL 8db83cd4cd8478cda81eb750c1c6eedcd335d2e2003a134ca454c4d2c5fb0b219c9c2ca3e08d832360fc7c1cec45637f27ad621c0457a0942fca136a1916f4a4
 EBUILD libvirt-1.1.3.4.ebuild 12247 SHA256 5e21dcf8f227d56f3a50580ab199d1bb7c1727d6f73bc72ab891151c3fdf27fe SHA512 1f2d3606fa279d22264e4c37102f79539e5fe48568749501504df6d66009578001df436d5d23df37cf5df28fcbbbd9e97b9531ba547adc5e1f98a23d1173c273 WHIRLPOOL 64035eeacb9d8e9bdfae0f5baa9332bc4e970225156162c7852dec22a615ca2605ea8f77ffec4491b98b3be47fdd9549139d32d8064a421a43d84c605fc45038
-EBUILD libvirt-1.2.1.ebuild 12074 SHA256 09bfa763b7d1a3aad3e2a64bc329cd0b9d2cd90dbf530da46947f573b513fadf SHA512 c33715fe4fd135ce14a4ae5ac791ae0ad220d7afde67a98a6278980e1710e1cac35a356a0834a4cf212682f5d0cbbc02bfd249bd31e187d7a5a1dd95457139ac WHIRLPOOL 23e9309050bcc80dddde55945aed811fd8d983a9d6a1e848f4a36862d3729b427a01dc9b25aa9e872b66e45248d52677e7e3ec11d3c83b95fc8909b51f31785d
 EBUILD libvirt-1.2.3.ebuild 12294 SHA256 53a8e43eef42b330915e52678ff0a7d5d641b0cb5c169fb7699684ec704171e6 SHA512 de019f8b0e3fcac4ad82803341adef185c040f88377a447f9003fd133c9e04f8d21f928a8fa7435fcdc14d7c78d169941f04151f8f4c84e7a0cfd4711b1a5e99 WHIRLPOOL 7482bacc5772ddfa435815d1e190477b0d4c506e7b30445684a0dc6bb1b2e2eee49838082f6c6594e8213f484fb929292399f5318cb6973a96d702d74db8e741
 EBUILD libvirt-1.2.4.ebuild 12296 SHA256 fa9f4efb6a3c07a0c3f978c5e1fa19e98a554e1fb95715f2e49fb02b60108e14 SHA512 d8b9eeb56e9e3534a406b9b2d05b3cd7998c3a9c5506a1d40e1426d79ab12a653a8408353d1fb8f7be7a3b206abc0a55e8d3d105eb199a49e8e252ffe27d985c WHIRLPOOL a1a18b9a66e64b85893d00d95faa63d608fd57fb7adfb1a1fc37ce3d07b347fef964653e9654bff142b4e9f66caf9f733bfaf3b4b4ab9144bc0f92ec7c44b8df
 EBUILD libvirt-9999.ebuild 12070 SHA256 346c529884f82164f893c846015d4c2bf7882b7526702985de53584cac6cc86b SHA512 0313120b4d6e62b8c728b4665d6f3c393555c731b84b1af3e1b6bfe531e247c0f44dc24752022332622d48c4ca6b663c74624edee1f5f03fcd76a69f45dda3d0 WHIRLPOOL 4de29606d968c00b8d71b896099d8b02a280eeb7e986f510593eaeefecca448cfc9b3b0ad09e6fe68c8550a4859263c01d101b2acf6916ef00ed7f5c2d5eddec
-MISC ChangeLog 17708 SHA256 d615435c877f66bcea3f15d06d87bf6300c65d7419ce20f4e68eb5423c872817 SHA512 fa98a56b2143da4b4d5110605f21f697cba445068be372297caa7aa48df5fbc9a16835c26295fdd82dd0f98ae374e71ceaf555ea3a4998e55609626ff5eb0de5 WHIRLPOOL c107da90d36c37c24ff8e821898b2a842e7b76c96ae391ec3e0916aec2847e8d036ea7d51d7dbb7e8b7efe6250dabe1ba32e92c22ed8c22fa5fed0afdefa961b
+MISC ChangeLog 17862 SHA256 5ee6cfe2603455025c058678211e409bd6f4991e87a58a4e7916743dcac0a89c SHA512 9c68c934d986f9ae19736756de5c948fd2231b1d7edb421b3ceff57d1052c20f764752cf3fbec1b4300e7fdf3781f5f04dcd30a88f8d37c659a1342dad099e3d WHIRLPOOL ce03e5dd204515b4eb97f40f21a9f9f47c643bc585964d470598e783031c409242ba52c47b923d15153b89fcb1b54bb414a57baaf65a45c296cce881458cd720
 MISC metadata.xml 3447 SHA256 39904bed8984cae6dcd825a88a5c28e2692d47fd13da73f5041b58e254e3b350 SHA512 d0972e6eeb32de75ca14c183873e59f87948f621d873cfeac3e930b63775fd2b8b776fdc482b9dc8c4bc2ee24ee45a52e35cdbf8adec30881ddbd745f249a312 WHIRLPOOL 2591d99b26d2ce784112a862b8362ef2a738a557bb2f712558216cf25b6680ec77dca9f5ec5696f4a949139a6de4e7e9ce8c0bad1690282ca169c28d218e5b6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTdCYnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTd3QeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBRUIwNzAzODgxM0ZDOEYwRjMyNzIzQTIx
-Q0UzOTYzNzdDRkU3RTJCAAoJEBzjljd8/n4rcBUP/RFVyFK9m32Gu+1exfFPj5vs
-iDbxEv1n2j8BgalQGruV2xYVNSSWGp0795GDNidiLmwWjcwilhEi60GkTQwUEz1L
-Zwvrke2xeyugfeYqJ6jvEaHEgctraxiUmgtToudwXPHnPhaiUmwLFkhSMDhRcmXE
-BqOtnvpj2lTzaZSIlhOy28eh9GjO8TaT9zzCPbz1tZHL6t2/Tp39BxC1ifpUUena
-t5c4rT1quiGcASr3xdqyHUqHnEbJrRxQLws6tC1lF5lsUCr2XBd4RPB2IPaAW+AA
-dzeTWPHmEeBUS1bOvChcrQ1xX5iZ7zvHtiqcrcb5WYzV8JhJnGI7GDIwqyFNmZQ6
-Rq7/c629mcqSMjwsAMWKMg18j/IFVzEuAQGifdo4HW/+omX/M5TaotdkyHYVHl7Y
-guJnCj2kW5XO9SjK36O/vOMBQSA87MLGvXDtvhVBucGAcA2ReQYK83JQUGQ5ElGL
-tEHJcfs2Ev57NcQe2lNsB5NILh79VO68GsvNz+suAfNqiDq6jK98AzFBn92mwU3g
-UjKozWV+gISvBckbrcz6+D/fmLQ2BkzX4l1sHqy0mbgB6tjCqm23fkOK6DEb9+Sx
-6gv5Qe92E7h6G5WWlMvAGndrWkDymkjwwlZruGGnG19aoMlEpfw4U1y4z49UcmJQ
-V4faBIp6tecrKASUQ4xY
-=vT4o
+Q0UzOTYzNzdDRkU3RTJCAAoJEBzjljd8/n4rrwUP/3V1lissAxmOVppjZz6NgUnd
+Y7m3YgRHGpybujiyShFPK4F87fnb5kt2XHwz9xefuUZiD+cI8Kie0wg/7Q1rh1sK
+WEDuAaKv1mnbM2B9w70zrAkYLpceo/01kvRbTfIUtU9NCPfEr+L3B8il6y9wU6ar
+H9506MQRnb8jS51CBOpRz2dDV0EDlQqL+Gb/jTBpqLmJ88KmdZ0CpqS2nCZ8dRB5
+DuvYep39vbiu9GJx/h2cl06BkdBSILbj/MEi+ORaPRDB+ercjEqKek9yW36WzAhC
+qWI1fgbIBbDHNoyDiD5uV2bvGnCit9amarWR3TCU4BN7TJSDAQgZ4bSiW9yAHeXJ
+vXtdQWjfsecbyRlSTVG5aYuF/+ZHwzJeFnONFp/sqLpjRDGe1sPJOQcZoSiVAXIc
+WuMNBgI5it61AgBwP2cBnvvNtnWdxS6w4nyrlQaUgix/hrPURO+C0Ep4rtbAjDxR
+ojTFCi351pYc7A9OxC7p4eS2Kka9ZltkPGR/TwqNrbeXYSUEy8183w8LB3GW1I/B
+p4EAVqE2TqLBA46FRd8rKqMqLxPy/wCR4gHXMe4J4sLLE/RPp7jRp1hkysEpnf79
+Ca0g6O1ZI6nb8PKV1KLbI9MdTaiVV+nuDEFB1rxF3FEVYZfOU3wvjLK4y/LBF/lV
+iUVvzYV6u2Y7gjorjKZR
+=NgCl
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirtd.init-r12 b/app-emulation/libvirt/files/libvirtd.init-r12
deleted file mode 100644
index 26a59dfe7df8..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init-r12
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/sbin/runscript
-
-description="Virtual Machine Management daemon (libvirt)"
-extra_started_commands="reload halt"
-description_halt="Stops the libvirt daemon without stopping your VMs"
-description_reload="Restarts the libvirt daemon without stopping your VMs"
-
-depend() {
-	USE_FLAG_FIREWALLD
-    use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus
-	after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
-}
-
-libvirtd_virsh() {
-	local mode=$1
-	shift
-
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-libvirtd_net_list() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }'
-}
-
-libvirtd_net_count() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \
-		$2 == "active" { count++ } \
-		END { print count }'
-}
-
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-	local counter=
-	local vm_name=
-	local net_name=
-	local dom_id=
-
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for dom_id in $(libvirtd_dom_list qemu) ; do
-            vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)"
-            einfo "   ${vm_name}"
-            libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            counter=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${counter} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count qemu)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count qemu)"
-				sleep 1
-				counter=$((${counter} - 1))
-				echo -n "."
-			done
-		fi
-
-        if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyway"
-        fi
-
-    fi
-
-	if [ "${LIBVIRTD_KVM_NET_SHUTDOWN}" != "no" ] \
-		&& [ "$(libvirtd_net_count qemu)" != "0" ]; then
-
-		einfo " Shutting down network(s):"
-			for net_name in $(libvirtd_net_list qemu); do
-				einfo "   ${net_name}"
-				libvirtd_virsh qemu net-destroy ${net_name} > /dev/null
-			done
-
-		if [ "$(libvirtd_net_count qemu)" != "0" ]; then
-			eerror " !!! Some networks are still active, stopping anyway"
-		fi
-	fi
-
-	# Now actually stop the daemon
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-halt() {
-    ebegin "Stopping libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	eend $?
-}
-
-reload() {
-	halt
-	start
-}
diff --git a/app-emulation/libvirt/libvirt-1.1.3.3.ebuild b/app-emulation/libvirt/libvirt-1.1.3.3.ebuild
deleted file mode 100644
index 968e038cc8f2..000000000000
--- a/app-emulation/libvirt/libvirt-1.1.3.3.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.3.ebuild,v 1.4 2014/03/01 22:08:30 mgorny Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
-
-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/${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 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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:0
-	>=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 )
-	python? ( ${PYTHON_DEPS} )
-	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-lang/perl
-	dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-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
-	~USER_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~SECURITYFS
-	~!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"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-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
-
-	python-single-r1_pkg_setup
-
-	# 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 lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
-	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-r13" "${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} \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/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
-	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
-
-	keepdir /var/lib/libvirt/images
-
-	use python && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-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
-	dodir /etc/sysctl.d
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	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!
-
-	readme.gentoo_print_elog
-
-	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
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.1.ebuild b/app-emulation/libvirt/libvirt-1.2.1.ebuild
deleted file mode 100644
index 26dae335c3bd..000000000000
--- a/app-emulation/libvirt/libvirt-1.2.1.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.1.ebuild,v 1.4 2014/03/01 22:08:30 mgorny Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-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/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${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/${PV}"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit +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:0
-	>=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-lang/perl
-	dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-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
-	~USER_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~SECURITYFS
-	~!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"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-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 lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
-	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-r13" "${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)"
-
-	# 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} \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/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
-	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
-
-	keepdir /var/lib/libvirt/images
-
-	readme.gentoo_create_doc
-}
-
-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
-	dodir /etc/sysctl.d
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	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!
-
-	readme.gentoo_print_elog
-
-	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
-}