From: Doug Goldstein <cardoe@gentoo.org>
Date: Thu, 10 Nov 2011 22:07:43 +0000 (+0000)
Subject: Drop older version
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=903837a98d35ff06374049cef0ccfd75e40a27b6;p=gentoo.git

Drop older version

Package-Manager: portage-2.1.10.33/cvs/Linux x86_64
---

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 227090f9a12b..daf4398e8905 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.139 2011/11/09 16:01:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.140 2011/11/10 22:07:43 cardoe Exp $
+
+  10 Nov 2011; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.4.ebuild:
+  Drop older version
 
   09 Nov 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-9999.ebuild:
   Update the live ebuild to the latest bits
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index a441a4e45c30..ea7a1fb5a587 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -7,13 +7,11 @@ AUX libvirtd.init-r4 3365 RMD160 01b6dc11c4baa541ab933a69a85e6d314a8aa041 SHA1 9
 AUX libvirtd.init-r5 3572 RMD160 2899a3bc515856642eb6f0cfe6d0944454271460 SHA1 ea541974fb672621c3d75020bfa8ec4be77066e1 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f
 DIST libvirt-0.9.3-backports-2.tar.bz2 2165 RMD160 445a2391fa10b76160ecb1d1d80ea3d52f9caa0a SHA1 b74034cba35972822a626298a9f4c4b3ead6bc77 SHA256 3cf9f698b8e98ba7463423adb6cb5746ec9a7fb6b047f9d32abf45ce5179197a
 DIST libvirt-0.9.3.tar.gz 15958983 RMD160 a01dbe29e23225706afcff74146aa3b224ba04bb SHA1 e25850d270a24441305dd92935209efa993b479d SHA256 4d673be9aa7b5618c0fef3cfdbbbeff02df1c83e26680fe40defad2b32a56ae3
-DIST libvirt-0.9.4.tar.gz 16643543 RMD160 a9edfdac715caac650520e5e12dd499f46e9957b SHA1 29e81c972ca7c3e73f4cecf84e77f68739ef00a2 SHA256 e76c026646ae4885b162bf711b854f36195f93538d6fcbee48479c2354a342af
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
 DIST libvirt-0.9.7.tar.gz 17853636 RMD160 d5a9e7461fc2c487aadf7e8955a213252edd1e2e SHA1 2f08609267154ad5377b3dc3952eb1e77469b570 SHA256 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23
 EBUILD libvirt-0.9.3-r1.ebuild 7737 RMD160 b0b705ccca86b210cfc7d5edf85598293bf18899 SHA1 b57290a3779ebbf860c8d956641bdf75d211ca0f SHA256 4c092f4c6d57b127199dad40985bd98acc9607beda92b644c3069b5c60f98d16
-EBUILD libvirt-0.9.4.ebuild 7878 RMD160 c514dc4531ce263f9fdedf28314844908c96fe76 SHA1 8066a9146d9c2ea8615daaa356ef52c30a1bdff0 SHA256 692ab87250ba25a49c161eb1f2aca9266bf6062eed20d822664331d93e76652b
 EBUILD libvirt-0.9.6.ebuild 7878 RMD160 b2d89a590da15fb1993204cf5fad010e38d6263d SHA1 d16a10aadd0dd1e4cb6835c979d9735f1ed2da12 SHA256 c35c965cd2c89f92330789411826b605cfe1727403f07296dff3da679a5b33d6
 EBUILD libvirt-0.9.7.ebuild 7878 RMD160 998a7a3a11b954ab1f72eca400c22d9a6019279e SHA1 55530ccfcc696649a4403fcd1d5721fafae34086 SHA256 df01e992eb46401293137f1d100d4b49a84aa0d5b723c8e214ac6f63ced49b14
 EBUILD libvirt-9999.ebuild 7878 RMD160 631245bd62d7febecba010d8da9042ef52129ade SHA1 c4b26718d962aff8b3242c948379961393facf29 SHA256 9ca5345c191bb0590487ac6c86a784c5d759cb6b765171fc748c115777b4421c
-MISC ChangeLog 29159 RMD160 66f22b8e2f448812bfb81618adbbc9d7e1020603 SHA1 9e4bfb338c17a8b284a79355a73d03de63dd9d98 SHA256 86d71b66b09de1242cc73b797546a8e73d7034ae56a348b8f1686c79efd322db
+MISC ChangeLog 29254 RMD160 080ce6823df5063528e6ce27655b9da4fc01dac9 SHA1 66d6c93162d4f42a1cb37ef627a64bbfb9a638bb SHA256 e3dae56fd2bdd7bdf018d5e8a7337745b4f2dd89ffd4c29c4c8592598b2b9bf5
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/libvirt-0.9.4.ebuild b/app-emulation/libvirt/libvirt-0.9.4.ebuild
deleted file mode 100644
index 7b4ccbdf9548..000000000000
--- a/app-emulation/libvirt/libvirt-0.9.4.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild,v 1.6 2011/10/27 18:57:28 cardoe Exp $
-
-#BACKPORTS=2
-#AUTOTOOLIZE=yes
-
-EAPI="3"
-
-MY_P="${P/_rc/-rc}"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	GIT_ECLASS="git-2"
-	AUTOTOOLIZE=yes
-fi
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python ${AUTOTOOLIZE+autotools} ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	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/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-	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="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
-	uml virtualbox virt-network xen elibc_glibc"
-# IUSE=one : bug #293416 & bug #299011
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1:1.1
-	>=net-libs/gnutls-1.0.25
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	iscsi? ( sys-block/open-iscsi )
-	json? ( dev-libs/yajl )
-	libvirtd? ( net-misc/bridge-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( >sys-process/numactl-2.0.2 )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	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 >=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 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-firewall/ebtables
-		sys-apps/iproute2 )
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	[[ -n ${AUTOTOOLIZE} ]] && 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)"
-	 # leave it automagic as it depends on the version of xen used.
-	use xen || myconf+=" --without-libxl"
-
-	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 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 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 bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-	myconf="${myconf} $(use_with json yajl)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf --without-audit"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# 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
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	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 \
-		|| 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-r4" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r2" 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 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 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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}