Bump to the stable series

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 304 insertions, 2 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 3f5e9e4db970..7b2a92642b99 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.205 2012/08/13 04:53:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.206 2012/08/13 23:19:10 cardoe Exp $
+
+*libvirt-0.9.11.5 (13 Aug 2012)
+
+  13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> +libvirt-0.9.11.5.ebuild:
+  Bump to the stable series
 
   13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13-r1.ebuild:
   Change CONFIG_USER_NS to only happen for kernels before 3.5. bug #428216
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d0d6e6824fc4..3f514544b9f1 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -3,13 +3,15 @@ AUX libvirtd.confd-r3 1757 SHA256 60f341dcf33ca8d55b6394ba6cf8e22f5133393e47f827
 AUX libvirtd.init-r5 3572 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f SHA512 bd11dfbd4ccf884b3b6f501bb3b2799f0d001b60eb9ec16167ac757066cf34ef5f22409fc97354596fb7d2a6701e023faf4a43f767df34a1070365731780b2b2 WHIRLPOOL 670e0918536745a6dd6de00bd9bef7b4d540be386d855fdd064ceb471a4f1e17d3dbac963f63f3c8f51985df7e60562775d01a14c86ebd3a8f96cc943cea7fd0
 AUX libvirtd.init-r8 3630 SHA256 2156b91662bfc9a6c668130c5f562ff79101f0ba579a86b7048d1851e8ef7968 SHA512 1f4e500bed8fad3c5fa0999f8710e1d788910d44548c0a494ffb27047e1d0b328017bd895fa5474c27364a8dcf98181159f962568d896a5bb296da93f4240dc5 WHIRLPOOL 2580754a2edd461c38aeacbc5e60c34df3d84611fe5c04b08fbfe6d9cfd4956697c4edc2df3ce86016716ab74ce574ec24498a55ff3e851d637893e2d512e17b
 DIST libvirt-0.9.11.4.tar.gz 19684316 SHA256 f3e16a62dff9720e1541da5561f448853e9821baa4622a0064dc28589eebed45 SHA512 c26d0cc376b18a887fdc76b93b767c3171ca9e5e1ad3d682f73a44c1c51c59cc17772d1fac01b7d6c950c6362202b54dd457ccf04e2c3467e4b1caa44e793f5e WHIRLPOOL 1315f4d04100ae0bc4a52b79b43c90809fee23a574c3b8f7e35b40d0cb3ae160026057e174ab97c28c5fedb06bd4f509f5a1a6269ac037b9fcb48cb1bb91927d
+DIST libvirt-0.9.11.5.tar.gz 19746828 SHA256 4c8a36861d0f24bf40971b2a932a5e9b42c25bec80ee98db9ca723e1990548b6 SHA512 9a9b77ffa78fc468b8f1a2ab2cc882b64ccb8ad43c0cf9f11029553d5962e18955d81f15f00b57237f1d0f38e3810d76ee1ca2e08141fdd35969c83138768d7f WHIRLPOOL 9c4ca67d1350bed4bbb112ee2489a23a418c98ad8fe25ad86bc39964faa30abf564eac92a8c32983ae7774b9598d7da37e888a0c4eae9877e018bfea9744ae37
 DIST libvirt-0.9.12.tar.gz 20054618 SHA256 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7 SHA512 6a3eac6c5373c81530ef01d4991a2795776934ef434667c6ddeb991587c9f0bb4a712f14e2f1ea2bd373dc2b4994ec0c46b8807fd209b607960a22dcce2d32ae WHIRLPOOL 2899f0668f3b6f456cbfc74c182848c0c32c7614db2d04e9099f6510556b0816372c0dde531bc7a300065bbaebf2d4dfb06041b2078b06fb4bbf0a17b8662444
 DIST libvirt-0.9.13-bp-1.tar.xz 6160 SHA256 dfb91f17d999f1aaf17e9cb59b64227631851ccfabaa24f0ba217dd5f4ae8f51 SHA512 9d7b7d9106fa217d1d6a218196b4692c6f560ffa2824de2b0e04ca35e8eb9ee6abeb02fece3720aa649128596c0990613d7914ab7dadfc7c8e830208882a2e1b WHIRLPOOL 54d96823526d569f081805569fa94947a0843c45cbefa83492e0da19741474fe6d07e212c5dadf93fa2d9123e05c21ab30cec9d8fff3f1ccff6dba8b41f23c8d
 DIST libvirt-0.9.13.tar.gz 20276757 SHA256 d124e9915c88c195da9c008a6d855e53e555dca5816052e163dda61388359d5b SHA512 d275cf6dd6c5700eeee701ff4d28a1483137f8c7525496069438b9e81727761066f1d4b1504bf170f6a3f457ecc203f6b5e7b367fe931803cb7592cccceb7f71 WHIRLPOOL 26a5c660c07516c3736f7bd818b6b4b06c98d78181ba991139818f321ace43a33dcc7d095ce6f02b94f7b3aea7c556bb5388cea34ef801576e4d86f9c08712f7
 EBUILD libvirt-0.9.11.4.ebuild 8717 SHA256 1aa05ff800faac006cc7ac8a1da3978364d302c465452bf2c302b22ffebc9108 SHA512 fdcac516d0ed64aea658fb24c124179bb9c1f597a03ced889c803211baf7c22914eec4e5e9f5940c027d6e36ac8eeecb47eb730daef1372d51df3330e1f965e0 WHIRLPOOL 26a9b6bc50f0547d4bad7bc62008ab7e9284c2c50402e63f24c19bbc6aac8b5a1dce82d03cba595106c48c3de0768f3e3c6ed071bb4b2f2a9dcecdf3786cde53
+EBUILD libvirt-0.9.11.5.ebuild 8719 SHA256 e11eec0ccb727e548d324348b0c4d1feb46e5ea2d7765a7232e7970507ada641 SHA512 f0e438beb2da85992066336fa07c6bc0a4d41662d35c8c630066560ac2f59a20303862f8123f896e1faed2605762df12057d7383eafeeafbecece312d36d9cad WHIRLPOOL 718f60e8ae7eb71c69fee079bed1f4eedf1e97d7716591782e48cc836376b243367aed0bd65ce2e01c232570ae58e6a149ff5e0b90f23c1c12c138a4a77f047a
 EBUILD libvirt-0.9.12-r1.ebuild 10353 SHA256 2083781e89483e8dca012ddc71f526380f704cac3acf19dafa2f17d22d35c544 SHA512 45c6de7858d5ec022515f35efd6532fa79db6da1085557457a6c649cec71ed499bf1b692b1af6fd65cb04d12b80ba5e3255331544b49152e82bec8761d80b736 WHIRLPOOL 8f6ceed8eb27dcb905d298caf44a0f78398c36e21576ef6db69a6c499f90330928d4b21e1d065b2a11b9ef782dc694c4995d403f5624fa4e85984481721a9372
 EBUILD libvirt-0.9.12.ebuild 10223 SHA256 3559384bb4892a0fdda39a3704a4c8c5ed8e3ad03427924132c89c3350759a9a SHA512 8c6d366cf27a0e65340d1249e6c5b6f7faadbd5402370305a1b8a3097c9e97f1d6df0766fff1a2d96ff5c38db4eaf3ca5de77d4f7325c25dabe94c8417aca160 WHIRLPOOL dbf14226a71296813f91e63d7bb34e223a488e5a3e7d55abc100d2479d2ed444a25e46f646ab56e5c16aabc1f25d5503fc54d299133455cba3b88d4f09e416d6
 EBUILD libvirt-0.9.13-r1.ebuild 10801 SHA256 e5c05bbfd730a7f67743ff275ffaa9ebb3e83ebc98f938a915c0427fe3b0e219 SHA512 259a87d6c161f56dc1d2d11dd45e96ab5f235d32068ef53f099bb4fe41f3ece6a8476352ca9eaab1022d2bce895ffea9253f1ba04d3abb18143d7713affb7103 WHIRLPOOL 270389d73405c38b1026041195bb4107db7898b798a0c95cfdeca6841925d800890ded9392a4e914cf95d1dfdee228c68227ff9b8d6746344e0503da7b75b7b8
 EBUILD libvirt-9999.ebuild 10349 SHA256 62ae9e1daff84437904c87954dd7c5d2dc34a8119e9dffd770fa1515bc757f99 SHA512 06c1e295c455c800e89c6a58a097925cb0912a8e83b0dbdf81351289d3585e23921eb5466ee10511fa13478e7cb1eeb0286521b6d1b7288c48509fa1e0b35228 WHIRLPOOL d94e0f4b7ddd7b1bbbd39f17852e8a9af45cce3b53639e4732bdb3fc193655025cd842d3b613327f26a6da76af5046648744ebaf7ac8f610a4d424c342639e43
-MISC ChangeLog 40536 SHA256 b4fd143ce3d05c78a4ada1c0fa8f29b8c7c08e66802418280936fbae28956381 SHA512 5a6b71ef3539e10eac10432ea598266db07ecb3d705759e11b0bc3f812cb98397ecc9eaafe9d0d04e337c7ae12777cf427d79169f201ac189956ce3832054e80 WHIRLPOOL 3476c9ad5ae74cb48609d78780fb83ec4119767a6a6846a8f8da62634127432995ba0c028d1454c948667664f7754ba73dc1d3caecbd5859d800c882134b8de3
+MISC ChangeLog 40674 SHA256 f1353aab936e676865fd8b6e775920921d7813b1f96b9deceb169fc9d9de92ea SHA512 55f5b630ef3898dc8c71e5159fb240b1afd12a20ace7ea5b508dfba30ae6872790eda5027d7253d00b5092a1a7f39e5781696492a0d9fda24c2e2b7042bd968c WHIRLPOOL 357b86e8219ce32be3de9bb8fda317308400f0d5a3aae07e866007ff4a4df6181751a3950e729fdd140787ca23e434e11d073158ae42ca09680947f9ea96e51c
 MISC metadata.xml 3420 SHA256 0916b94209d91c7a809069e61f788a9f6115ce9081758a90330f29a3249c9be5 SHA512 8acd907b424ef3500112d5834fba026146636948675381a3a07c1837968f2ebb146b0afa2a9d56225d9af008ade51d46022ba1c03d5e02de0e6e7f3678be4091 WHIRLPOOL c0e4dea1775586184c261a406556eed83f3f26782bfb770e055df8531b0643c62e0f8a6ac3f1243c8cdd1e931f17020d72704178a33e8b5eb4f23f24cf4f7354
diff --git a/app-emulation/libvirt/libvirt-0.9.11.5.ebuild b/app-emulation/libvirt/libvirt-0.9.11.5.ebuild
new file mode 100644
index 000000000000..f33b8b1e24ee
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.9.11.5.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.5.ebuild,v 1.1 2012/08/13 23:19:11 cardoe Exp $
+
+EAPI=4
+
+#BACKPORTS=1
+#AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+fi
+
+PYTHON_DEPEND="python? 2:2.5"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python
+
+if [[ ${PV} = *9999* ]]; then
+	inherit autotools git-2
+	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}-bp-${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 +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
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
+	virtualbox? ( libvirtd ) xen? ( libvirtd )"
+
+# 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/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	>=dev-libs/libnl-1.1:1.1
+	>=net-libs/gnutls-1.0.25
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	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 )
+	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 )
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	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[-minimal] )
+	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"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -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
+
+	[[ -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)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	# 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)"
+
+	## 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
+
+	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
+	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-r8" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r3" 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}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+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
+}