bump libvirt, add init scripts, add myself as maintainer, new patch to fix issue with kvm

Package-Manager: portage-2.1.4.4

7 files changed, 140 insertions, 13 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 41a82c77548d..c5e642bdc807 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.11 2008/05/15 10:23:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.12 2008/07/08 22:57:29 ramereth Exp $
+
+*libvirt-0.4.4 (08 Jul 2008)
+
+  08 Jul 2008; Lance Albertson <ramereth@gentoo.org>
+  +files/libvirt-0.4.4-kvm-cdrom-fix.patch, +files/libvirtd.confd,
+  +files/libvirtd.init, metadata.xml, +libvirt-0.4.4.ebuild:
+  * Bump version
+  * Add init scripts for libvirtd
+  * Add kvm-cdrom-fix patch
+  * Add myself as a maintainer
 
   15 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   Add myself as maintainer.
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 0445e1864319..c49c623d6ee2 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,24 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libvirt-0.4.4-kvm-cdrom-fix.patch 1183 RMD160 35555fcee1bbe7550066450c7fcf1a8c20f3c73c SHA1 4a4c728630e645dee99e2625aa900e0099930590 SHA256 2f2573ba4969fb8c068ee8e1af7b60adc97a5caa7d26b58e3caa48ce3371b721
+AUX libvirtd.confd 232 RMD160 2daafe89b89fab5b40f225835e070ba83d1caec8 SHA1 8d817c4e39f1b21abaf861f473566892d4e5ee43 SHA256 e6ca0a896f799048ddf9325d207353d33ef0b2118adfb0876c67c5d97dd3a658
+AUX libvirtd.init 331 RMD160 076b6f857958576bafcc699551108c4f411511fb SHA1 fa6c973fe7ccfd15406dae9d9a223c11b661494a SHA256 880f9806f1e5675b1c5b6615f99858d8504200ce832ec9780066fd8087728def
 DIST libvirt-0.1.3.tar.gz 585339 RMD160 69cb5f031214ddd2119a2756d838fcbe56ce56cc SHA1 52e90e9331e33776905146dfdafe0cc920374be4 SHA256 9557030a6e898299d150bc05ad74489d9b6638cd36092757a37a5c16f483f3a7
 DIST libvirt-0.1.4.tar.gz 609075 RMD160 bf120066a7c551c307cdf68d0e8ec283d1547cda SHA1 56233639f56133cd3b503b8691188b72a2e76504 SHA256 ad7a27c732aaec3c1c1f56304326509eb031fd79d06bb72abd872a1e663e1566
 DIST libvirt-0.1.7.tar.gz 692709 RMD160 6324a5c157c155db68c5774ebdfc3e2731e438bd SHA1 eb85985bf2f09f754518b01277ca18de69bdf252 SHA256 9249cd9f4891789ba7b05055095e9788c2cf33d664601a37380b6c8a351f4118
 DIST libvirt-0.2.3.tar.gz 2099985 RMD160 2556ca8aa7e855fb90f13d86c62ca7313e7345e7 SHA1 6baad80e41e1afc7b3ca8c8c8879c2436fda51d1 SHA256 eb96733fec2c240495f4493a525f39bde049ae3452c6501f87fd3068eedea909
 DIST libvirt-0.3.3.tar.gz 2525163 RMD160 73023c90a5ed80ec06919a98824fc9e60a941f31 SHA1 9f9d8a3aad8ec3cde841f029a4088312e928a18e SHA256 f58c57148782f70f7ddf11da29bdf2df6f639edd77cdd38a5fa538044997f647
 DIST libvirt-0.4.2.tar.gz 4354329 RMD160 e46ae2c4f8be093e2a010f3aeb1ee4e583fac0c0 SHA1 7076e542f34d4cffc2b8f9fd1ecc41d40ad83b07 SHA256 8d7c254bd13accf2a5ec3178a33e25a6a79c187c4c2da12cd58df006c25bb611
+DIST libvirt-0.4.4.tar.gz 4944817 RMD160 1521a96cb30a94d678c475148e6c9f1f72d80709 SHA1 c8be6aeca311a6cb573a298e3fc878b693ffbda4 SHA256 d77999eeaf9a4654702be498cd9ffc36943e183a74ab6e1db40150b6f2bcde61
 EBUILD libvirt-0.1.3.ebuild 641 RMD160 fd68f7082c45234c2c1ce0ff02bc6e8e931ca779 SHA1 2ffc045428eaba3d0f1930347249794b53a37eb8 SHA256 70e785bd66c6cb57646f3dbf31b7f173ae8033dd5b5929c69b5d6f5233174902
 EBUILD libvirt-0.1.4.ebuild 641 RMD160 3b69e1206182294c0408324a5bdf532cadee22a7 SHA1 c83d468e0cc97fe155f109705ca11990e022b530 SHA256 6fa056abb9ab7c53d1cc5248f342359e99de393dbfb1d0c60e44307f13e089a4
 EBUILD libvirt-0.1.7.ebuild 635 RMD160 065d29cf299ba77d92cabd642fe588f6da777f06 SHA1 cee7099f7dc1d4599a0e2d329f011d756ba08420 SHA256 cd8e1c7a150a0293df07661d3013d0363bb111187a808f07ee0893b0a039938f
 EBUILD libvirt-0.2.3.ebuild 977 RMD160 80e7af8d8ce220517ebe48cfbeca2b045d94cb7b SHA1 3702cb5747d8cf4eb0ad3870c3555c94948f7885 SHA256 d67b02360406d3261969dbfa1a7a2467239e1face337204a74d93f3b25476f32
 EBUILD libvirt-0.3.3.ebuild 977 RMD160 7e8b025dcc2e4e7e8646662c219b0849d026d7ad SHA1 846f6f7443a2ffd430cdf740e18236ef8b20a14d SHA256 3e7bb4acb64cb0c984f256c37a91e9317d64481ccc2f4b6bf6bbd563d010642c
 EBUILD libvirt-0.4.2.ebuild 1644 RMD160 3a23e3c22763288585458d606a16b3c7499bf853 SHA1 ed82e260c8496c0e91a37dbe6d372add5508a06c SHA256 cdf54f0a74786b339f92bdf5e6cac25a130380291ed5029f077739c8f34bab41
-MISC ChangeLog 1944 RMD160 51fad9aa9a4fd4475e25369a01f6971ab1f86038 SHA1 63d987fef2067a9324656d79f7ae022b49666f13 SHA256 8152d3f7a394d717f783eec4777d5db4cc7a7bb24a19ba39c1822c4dfa64c98b
-MISC metadata.xml 255 RMD160 affeed963c1cd71b4a4c9e5eef48a332baa089ad SHA1 1f9cbbadc3ffc632a0a095f82afc3bb434b4b972 SHA256 a5463f773e4af390b746517860c7502c7ba3513dbe007315530673cfff5f3fb8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgsDz4ACgkQXVaO67S1rtvwGACeJB/Ab8xFRn18P10CPcxw6v+t
-R5oAoKOKXBSSX/1xULmH7rfGMMe6JWUw
-=TC5s
------END PGP SIGNATURE-----
+EBUILD libvirt-0.4.4.ebuild 1834 RMD160 32d4157fb27cce97384057b1ad4f4143ff029927 SHA1 59ee7b19e3a33da4b94bd9d1d76066760b385e1b SHA256 4d755eca2aa75a87ea54ac994db35cd8601f9a9ded7202647d29bf68d94910ec
+MISC ChangeLog 2265 RMD160 763eaa96c1a6fe83e171b184e30c6bb65038c029 SHA1 dd39e24dc838326a1a8e24bf55c5538f2396b44f SHA256 31ae9a40e1ee6c221cda1adfe47d4b7142aa63b7b5f51efbe5ad882d2c87a5cf
+MISC metadata.xml 352 RMD160 8ecec71524546a162a8f9a8a6518c8c1efc51f47 SHA1 6b0febbf1d8a74f93cdc47e9357068e090468b4a SHA256 a0862db0915069404eb2d268e788e840cf5e135989d1d6db752611402b0c6a17
diff --git a/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch b/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch
new file mode 100644
index 000000000000..a073f062bc6b
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch
@@ -0,0 +1,27 @@
+diff -urN libvirt-0.4.4/src/qemu_conf.c libvirt-0.4.4-new/src/qemu_conf.c
+--- libvirt-0.4.4/src/qemu_conf.c	2008-06-19 13:15:02.000000000 +0000
++++ libvirt-0.4.4-new/src/qemu_conf.c	2008-07-02 20:47:51.000000000 +0000
+@@ -2612,11 +2612,18 @@
+                 break;
+             }
+ 
+-            snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s",
+-                     disk->src, qemudBusIdToName(disk->bus, 1),
+-                     media ? media : "",
+-                     idx,
+-                     bootable ? ",boot=on" : "");
++            if (disk->device == QEMUD_DISK_CDROM) {
++                snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d",
++                         disk->src, qemudBusIdToName(disk->bus, 1),
++                         media ? media : "",
++                         idx);
++            } else { 
++                snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s",
++                         disk->src, qemudBusIdToName(disk->bus, 1),
++                         media ? media : "",
++                         idx,
++                         bootable ? ",boot=on" : "");
++            }
+ 
+             ADD_ARG_LIT("-drive");
+             ADD_ARG_LIT(opt);
diff --git a/app-emulation/libvirt/files/libvirtd.confd b/app-emulation/libvirt/files/libvirtd.confd
new file mode 100644
index 000000000000..c41e3c9aad1a
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.confd
@@ -0,0 +1,8 @@
+# /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"
diff --git a/app-emulation/libvirt/files/libvirtd.init b/app-emulation/libvirt/files/libvirtd.init
new file mode 100755
index 000000000000..aaf6f0ecd97d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+
+start() {
+	ebegin "Starting libvirtd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- \
+		-d --pid-file /var/run/libvirtd.pid ${LIBVIRTD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping libvirtd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pid-file=/var/run/libvirtd.pid
+	eend $?
+}
diff --git a/app-emulation/libvirt/libvirt-0.4.4.ebuild b/app-emulation/libvirt/libvirt-0.4.4.ebuild
new file mode 100644
index 000000000000..81c28b0b52b3
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.4.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.4.4.ebuild,v 1.1 2008/07/08 22:57:29 ramereth Exp $
+
+inherit eutils
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi iscsi lvm openvz parted qemu sasl selinux xen" #policykit is in package.mask
+
+DEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=dev-libs/libxml2-2.5
+	>=net-libs/gnutls-1.0.25
+	dev-lang/python
+	sys-fs/sysfsutils
+	avahi? ( >=net-dns/avahi-0.6 )
+	iscsi? ( sys-block/open-iscsi )
+	lvm? ( sys-fs/lvm2 )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? ( >=sys-apps/parted-1.8 )
+	qemu? ( app-emulation/qemu )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	"
+	#policykit? ( >=sys-auth/policykit-0.6 )
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/"${P}"-kvm-cdrom-fix.patch
+}
+
+pkg_setup() {
+	if ! use qemu && ! use xen && ! use openvz; then
+		local msg="You must enable one of these USE flags: qemu xen openvz"
+		eerror "$msg"
+		die "$msg"
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_with avahi) \
+		$(use_with iscsi storage-iscsi) \
+		$(use_with lvm storage-lvm) \
+		$(use_with openvz) \
+		$(use_with parted storage-disk) \
+		$(use_with qemu) \
+		$(use_with sasl) \
+		$(use_with selinux) \
+		$(use_with xen) \
+		--disable-iptables-lokkit \
+		|| die "econf failed"
+		#$(use_with policykit) \
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
+	newinitd "${FILESDIR}"/libvirtd.init libvirtd
+	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
+}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 849d5495f8c7..a892205aca4d 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -6,4 +6,8 @@
 		<email>dberkholz@gentoo.org</email>
 		<name>Donnie Berkholz</name>
 	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
 </pkgmetadata>