Cleanup old versions.

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

8 files changed, 21 insertions, 807 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 7d94dd276ec2..3edc2369712f 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.75 2010/09/17 17:58:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.76 2010/10/15 14:28:10 flameeyes Exp $
+
+  15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libvirt-0.8.2-r1.ebuild, -libvirt-0.8.3.ebuild, -libvirt-0.8.3-r1.ebuild,
+  -files/libvirtd.confd, -files/libvirtd.init:
+  Cleanup old versions.
 
 *libvirt-0.8.4 (17 Sep 2010)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9ffdcb56e31d..aea303822f24 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,15 +1,16 @@
-AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76082bb28705606758880c19af922dde1ccb01 SHA256 ff2c94d2a64058152be669256d8d2e241cde4356a77bd653eac9fa3b084666f6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
-AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
-DIST libvirt-0.8.2.tar.gz 12230368 RMD160 280c95e74c41c56686a50892105b2c41b196a107 SHA1 553c984e1fc1eae288d32ff911ba5614010bece4 SHA256 69d2bbf2d4057bdb2781a2ba45b2628a0f0312597ef7dd15a6a3d34720b33e60
-DIST libvirt-0.8.3-backports-2.tar.bz2 3667 RMD160 609e1fe166e9c27ed8d3fac04a1db6d2fd374b54 SHA1 5a7faada120ec91088c7e8a357e6554729e3d2c3 SHA256 0dc2d15229acabb6bec3ce1dcf41f483d0a180e82605c274b52af658a4b19529
-DIST libvirt-0.8.3-backports-3.tar.bz2 10617 RMD160 95c85f39cf670cbf9ad5151a00870205791bcb68 SHA1 0ce917e4a1d2210d7528323ef3a892391d3ffb49 SHA256 d9077e107b8e3976a7404090dbf158776fd99837225b4cec65dcca5fd00b0d4c
-DIST libvirt-0.8.3.tar.gz 12430752 RMD160 0ff7561efc45f472c44fc950153cba180222096b SHA1 4dc92139031f2af3141c2b1d0813b57ecd735c5d SHA256 35e1836c3947ac3edd7b4a1948cf13f5f13dd3e5bb31933d627d771b1e997a1f
 DIST libvirt-0.8.4.tar.gz 12726557 RMD160 c4fe8756aa952a6fa3ff276e5bcccb99020294a4 SHA1 dd960237bc54daa3260632763fea21bbb4774c04 SHA256 9c683b910a0b1d22c64065efa79668c954fa378a1699e06ea7393f4822f7ae29
-EBUILD libvirt-0.8.2-r1.ebuild 6939 RMD160 c43ffaab435a3da080299654b78f9c9be23fe1fc SHA1 0c18d51ea742aeed29f5e5fcec2b67cf371c853f SHA256 40216ed24efcbfc7d61004949ae6f2ed9b5c0f877a70174c2100023099cdc751
-EBUILD libvirt-0.8.3-r1.ebuild 7165 RMD160 f343cbc5a6d7a1691a665690e2c1cd6ae94cc39e SHA1 6800ad7303724c412f7a92198be46dfa73df91c6 SHA256 36fabe87c7423e7a6ddf8bdaca1170d020968772f7bff10262ac356a69658b32
-EBUILD libvirt-0.8.3.ebuild 7073 RMD160 b6b3a4f066b596b75428927f7738a035a8b3b11d SHA1 c6f26e2a7bf01923992cedc209f8759149b01e40 SHA256 bddf8af7df11a963855564d2634686c28a9357c57a50e444ea6d5ab8adf856c4
 EBUILD libvirt-0.8.4.ebuild 7158 RMD160 cf61d91f1c3ce1a4bf2044ec5d62be3bdf5f61ba SHA1 5a8d6a2a66d49fa5225e0eca244a17d8bc96ce43 SHA256 2b0937ac50c59f7f578342db9626b719bd68e2b7be10df7ac8d0133530425685
-MISC ChangeLog 17115 RMD160 5693f5984f24bc2a24bf790f72a010d06fd10051 SHA1 5b5574f465c3d3f4c4a02cb38f9e5c055770f561 SHA256 2164f279f1dfbfd56794ed74adb55c024ead36c2caaded6aaec372ab3b917011
+MISC ChangeLog 17323 RMD160 8f89f5153a43ab983421bb53bfa5ac50d895f2fd SHA1 1e707437f328a3fe633e34bbb4b23d706e419961 SHA256 69dc9328acadbe2410e54d51a6ca9919f6a18b9ed6ec27ab9941fe7efc6d267e
 MISC metadata.xml 1984 RMD160 0cc10b41e5080a8041cf05f9a37262ab7901fb4f SHA1 abefbdf96e86e4ca4ac2b9017c3c07a9d5fb7c9e SHA256 c69015c29667266301606d74334da95d61fd26f06e3ec1ca434f141e3a8107eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky4ZM8ACgkQAiZjviIA2Xg3dwCgpkroVzelga32LCV1H5qTn0mk
+7/IAn28xacMxxbyCj8Qz1mEX+0+FiYZ4
+=p051
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirtd.confd b/app-emulation/libvirt/files/libvirtd.confd
deleted file mode 100644
index 705b78532b39..000000000000
--- a/app-emulation/libvirt/files/libvirtd.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/conf.d/libvirtd
-
-# You may want to add '--listen' to have libvirtd listen for tcp/ip connections
-# if you want to use libvirt for remote control
-
-# Please consult 'libvirtd --help' for more options
-
-#LIBVIRTD_OPTS="--listen"
-
-# Automatically shutdown KVM domains when stopping libvirtd
-LIBVIRTD_KVM_SHUTDOWN="yes"
-
-# Timeout in seconds until stopping libvirtd and "pulling the plug" on the
-# remaining VM's still in a running state
-#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="100"
diff --git a/app-emulation/libvirt/files/libvirtd.init b/app-emulation/libvirt/files/libvirtd.init
deleted file mode 100755
index 10765f5c0c3c..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop status reload restart"
-
-depend() {
-    need net
-    before sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    libvirtd_virsh list | grep running | awk '{ print $1 }'
-}
-
-libvirtd_dom_count() {
-    libvirtd_dom_list | wc -l
-}
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "yes" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh shutdown ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=100
-        fi
-
-        einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-        DOM_COUNT="$(libvirtd_dom_count)"
-        while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-            DOM_COUNT="$(libvirtd_dom_count)"
-            sleep 1
-            COUNTER=$((${COUNTER} - 1))
-            echo -n "."
-        done
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyways"
-        fi
-
-    fi
-    start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading libvirtd"
-    start-stop-daemon --stop --signal HUP --quiet --pidfile /var/run/libvirtd.pid --oknodo
-    eend $?
-}
diff --git a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild
deleted file mode 100644
index 98ec43f728b2..000000000000
--- a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild,v 1.6 2010/08/20 17:01:37 jer Exp $
-
-#BACKPORTS=1
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps iscsi +libvirtd lvm +lxc macvtap +network nfs nls numa openvz \
-	parted pcap phyp policykit python qemu sasl selinux uml virtualbox xen udev"
-# IUSE=one : bug #293416 & bug# 299011
-
-# Some tests are simply broken in the released tarball, ignore them
-# for now.
-RESTRICT=test
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=net-libs/gnutls-1.0.25
-	sys-fs/sysfsutils
-	sys-apps/util-linux
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-}
-
-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)"
-	if ! use policykit && use xen; then
-		myconf="${myconf} --with-xen-proxy"
-	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)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with 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 numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# 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 biits
-	myconf="${myconf} $(use_with libpcap)"
-	myconf="${myconf} $(use_with macvtap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# 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 \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	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 \
-		|| die "emake install failed"
-
-	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r1" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-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
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		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
-	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'll need the"
-	elog "following packages":
-	elog
-	elog "	net-dns/dnsmasq"
-	elog "	net-firewall/iptables"
-	elog "	net-firewall/ebtables"
-	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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild
deleted file mode 100644
index 0efb7a4d5354..000000000000
--- a/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.3-r1.ebuild,v 1.6 2010/09/12 15:35:41 jmbsvicetto Exp $
-
-BACKPORTS=3
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python autotools
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap +network nfs nls \
-	numa openvz parted pcap phyp policykit python qemu sasl selinux
-	uml virtualbox xen udev"
-# IUSE=one : bug #293416 & bug #299011
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
-	>=net-libs/gnutls-1.0.25
-	sys-fs/sysfsutils
-	sys-apps/util-linux
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 app-emulation/qemu-kvm-spice ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	myconf="${myconf} $(use_enable debug)"
-
-	## 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)"
-	if ! use policykit && use xen; then
-		myconf="${myconf} --with-xen-proxy"
-	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)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with 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 numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# 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 biits
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with macvtap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# 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 \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	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 \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r1" 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
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		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'll need the"
-	elog "following packages":
-	elog
-	elog "	net-dns/dnsmasq"
-	elog "	>=net-firewall/iptables-1.4.9"
-	elog "	net-firewall/ebtables"
-	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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-0.8.3.ebuild b/app-emulation/libvirt/libvirt-0.8.3.ebuild
deleted file mode 100644
index d04f27b33d27..000000000000
--- a/app-emulation/libvirt/libvirt-0.8.3.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.3.ebuild,v 1.5 2010/08/20 17:01:37 jer Exp $
-
-BACKPORTS=2
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps iscsi +libvirtd lvm +lxc macvtap +network nfs nls numa openvz \
-	parted pcap phyp policykit python qemu sasl selinux uml virtualbox xen udev \
-	debug"
-# IUSE=one : bug #293416 & bug# 299011
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=net-libs/gnutls-1.0.25
-	sys-fs/sysfsutils
-	sys-apps/util-linux
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( sys-process/numactl )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-}
-
-src_configure() {
-	local myconf=""
-
-	myconf="${myconf} $(use_enable debug)"
-
-	## 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)"
-	if ! use policykit && use xen; then
-		myconf="${myconf} --with-xen-proxy"
-	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)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with 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 numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# 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 biits
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with macvtap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# 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 \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	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 \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r1" 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
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		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'll need the"
-	elog "following packages":
-	elog
-	elog "	net-dns/dnsmasq"
-	elog "	net-firewall/iptables"
-	elog "	net-firewall/ebtables"
-	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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
-}
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index b1cafeb349ae..80b5caf83516 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX lxc.initd 3198 RMD160 040fe0799306a781201500b5cd6b4fd1b23a2b39 SHA1 159d86282ba7be1541b7e1899a935cf4688ef0db SHA256 14a918e913173b1c9d3782e9b3df2471bb9d715df1d9d3f1e030f42da62f6d69
-DIST lxc-0.7.1.tar.gz 264376 RMD160 a57c978b50f2f6df15d526d4d5d25c8cd438e9cf SHA1 06dab217dd67b10acc57e2566f80b0673f0261f2 SHA256 da7a0b4f684a0d1d9d982c8423f1143a59798a0fab6c30e0c1aae752c578a642
 DIST lxc-0.7.2.tar.gz 266877 RMD160 3c4f2a751c1f4965bab75d9825e4d9d0642a4a4b SHA1 75dfc113a576fa15d46a3736ff788a168de0b258 SHA256 0660edbc08d74275968cb18c8e634aafd6f1ad395419e037d7018f2b1d669b1a
-EBUILD lxc-0.7.1.ebuild 2155 RMD160 4dd61fc556387bcc1d1017bb8a6a18b4f3199437 SHA1 aea867f6771006d9cbed10e1949046d654a4007c SHA256 a4d7a27f6902f826704738ccb8dac2139b9c64a92735fcdc3868229493764bec
 EBUILD lxc-0.7.2-r1.ebuild 3073 RMD160 b04383df106bf68dfc65967c595ae0ac2c25ed02 SHA1 0b5663325909d39b8682603293b2dc1db893c169 SHA256 0118908c15e225b06efca3648d6734a384faa3443c84709e2ae4861615c67402
-MISC ChangeLog 3868 RMD160 a0ea9ef2c2e3abf7ad405d4df46a6287c04fa483 SHA1 016447864b24f59aaae041fa597803ccacc75bf1 SHA256 cb4bb0f8c19b2a35efb13063adf02d7b2e8ea83f5f4844803b306c7f503181f5
+MISC ChangeLog 3967 RMD160 f77a1648246e2aaca31325a7931e26ee67173de8 SHA1 c94340b09b35ccb9f7476c8ba1e188ab62e34e7c SHA256 8038745085e423d6555ce2de8bf36d9b351229f8395e4921ee46a214e68ee216
 MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxV43UACgkQAiZjviIA2XiDtgCgyUKhh/EcBvP7HEupo85Qre9h
-VcYAoN4Q4UxtLG6k9RKtLtbmeRr31AOa
-=kb3A
+iEYEARECAAYFAky4ZSkACgkQAiZjviIA2XgwFwCeJQ9hTTI38YFpTAnjHCIEiB0Z
+MLAAmweyUhFVibPYgxGBdZ/wDML54559
+=2M8l
 -----END PGP SIGNATURE-----