Add a couple fixes missed in my previous commit.

Package-Manager: portage-2.1.4.5

4 files changed, 23 insertions, 23 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ddae9fc4bd47..cdb63ec20d88 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2008/11/23 21:53:54 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.18 2008/11/23 22:54:37 marineam Exp $
+
+  23 Nov 2008; Michael Marineau <marineam@gentoo.org>
+  libvirt-0.4.4-r2.ebuild, libvirt-0.4.6.ebuild:
+  Fix install path under /var and always enable the server.
 
 *libvirt-0.4.6 (23 Nov 2008)
 *libvirt-0.4.4-r2 (23 Nov 2008)
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 852e02c46ff6..25a7a58eb30d 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -10,14 +10,14 @@ AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76
 AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c
 DIST libvirt-0.4.4.tar.gz 4944817 RMD160 1521a96cb30a94d678c475148e6c9f1f72d80709 SHA1 c8be6aeca311a6cb573a298e3fc878b693ffbda4 SHA256 d77999eeaf9a4654702be498cd9ffc36943e183a74ab6e1db40150b6f2bcde61
 DIST libvirt-0.4.6.tar.gz 5255397 RMD160 7a59cf7b678148c380e20e57f4d5d323f5aeb6b6 SHA1 dd6994e09789e19679cae4bdd65f2d7aea9cf8d0 SHA256 70049e309632718af75cd11116063ade45eb2879eb9e7ac7c6106559d344a37a
-EBUILD libvirt-0.4.4-r2.ebuild 2679 RMD160 4dfd8a5aad071a50f837491ecc84c9e37dbc23b6 SHA1 48da4d8d152016a2ecc7d1f4ad072cd7474db786 SHA256 80f813fc331518d37604fc95fab6ba8cd3656711b6143063cdc5e18a82a56c7a
-EBUILD libvirt-0.4.6.ebuild 2394 RMD160 208370b7d80e1db39349efc2e2b9cb53b6a1e4cc SHA1 b31f9faa2f0286c1163f2a2dc282acf9141682ca SHA256 99c9ade78efec49bd09a52ae04789c0eb045c3ca4a9d5a50be82f3d505be0895
-MISC ChangeLog 3986 RMD160 8f7e13361840606d0df59888854cef7470436189 SHA1 0da68963f9c418e61dd2bec63edec5f35bcb48da SHA256 e3ec23517aad87c6c4cc220b5fcbe4cc64ffc9fb8a4aa1f8f68fe8b2ee1a1db5
+EBUILD libvirt-0.4.4-r2.ebuild 2625 RMD160 68464334acd3f4efbba102791c54812eb92136d3 SHA1 99c15bc3cb02d63aaaa4ddc5f55e9b7d4ebb914d SHA256 d7010b943c09f44a5d56093574cc60db643c6181bc2a9f32635d3047fb94641f
+EBUILD libvirt-0.4.6.ebuild 2340 RMD160 463231379f32dbf8ec57d8e3f93d4c7e2ec9992e SHA1 524154abf9c12e77091b744b45a5300f6591da15 SHA256 44d2ace95b09f7c3e6de65a67f62e3869c92bf286f4b7906b05a3dcc58a9283e
+MISC ChangeLog 4150 RMD160 49ab017a3860ee484201fc4530b19da0236efb35 SHA1 e66531dc832f98d5b84d40479c52bf2868713d9c SHA256 b20f33842b06f46db73f1dc0f8a15c80ba51180bba86843494ab12da597c7020
 MISC metadata.xml 1208 RMD160 38a54882e6a0376f45d2b7836cd732705817dd27 SHA1 ffa1980f9cd7cc99d121fe0cbaf2a1108c91bba7 SHA256 197fed9765b57cdd3b83c064a2f14fcf0b98b386e775e7e9cb5161a8959e1e74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkp0QUACgkQiP+LossGzjBYfgCdGlbTqveleKKqwZ6EkAQW3pzS
-I68AoJhmSO1TjVB8+lW26xW3tmXZEAz2
-=cg3J
+iEYEARECAAYFAkkp30AACgkQiP+LossGzjCP5QCgg7c6zcPIwe54FHeTgy5hWxQq
+B8QAn1fGfqJAJfnLgycESE/JM+CkY8YP
+=DpXw
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.4.4-r2.ebuild b/app-emulation/libvirt/libvirt-0.4.4-r2.ebuild
index eeeededa5823..962eb35b6232 100644
--- a/app-emulation/libvirt/libvirt-0.4.4-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2008/11/23 21:53:54 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.4.4-r2.ebuild,v 1.2 2008/11/23 22:54:37 marineam Exp $
 
 inherit eutils autotools
 
@@ -11,7 +11,7 @@ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi lvm kvm openvz parted qemu sasl selinux server xen" #policykit is in package.mask
+IUSE="avahi iscsi lvm kvm openvz parted qemu sasl selinux xen" #policykit is in package.mask
 
 DEPEND="sys-libs/readline
 	sys-libs/ncurses
@@ -21,6 +21,7 @@ DEPEND="sys-libs/readline
 	sys-fs/sysfsutils
 	net-misc/bridge-utils
 	net-analyzer/netcat
+	net-dns/dnsmasq
 	avahi? ( >=net-dns/avahi-0.6 )
 	iscsi? ( sys-block/open-iscsi )
 	kvm? ( app-emulation/kvm )
@@ -30,7 +31,6 @@ DEPEND="sys-libs/readline
 	qemu? ( app-emulation/qemu )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
-	server? ( net-dns/dnsmasq )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	"
 	#policykit? ( >=sys-auth/policykit-0.6 )
@@ -77,11 +77,11 @@ src_compile() {
 		$(use_with parted storage-disk) \
 		$(use_with sasl) \
 		$(use_with selinux) \
-		$(use_with server libvirtd) \
 		$(use_with xen) \
 		${my_conf} \
 		--with-remote \
 		--disable-iptables-lokkit \
+		--localstatedir=/var \
 		--with-remote-pid-file=/var/run/libvirtd.pid \
 		|| die "econf failed"
 		#$(use_with policykit) \
@@ -91,8 +91,6 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-	if use server ; then
-		newinitd "${FILESDIR}"/libvirtd.init libvirtd
-		newconfd "${FILESDIR}"/libvirtd.confd libvirtd
-	fi
+	newinitd "${FILESDIR}"/libvirtd.init libvirtd
+	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
 }
diff --git a/app-emulation/libvirt/libvirt-0.4.6.ebuild b/app-emulation/libvirt/libvirt-0.4.6.ebuild
index c6c8b18ceb34..1d6fad6038c7 100644
--- a/app-emulation/libvirt/libvirt-0.4.6.ebuild
+++ b/app-emulation/libvirt/libvirt-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2008/11/23 21:53:54 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.4.6.ebuild,v 1.2 2008/11/23 22:54:37 marineam Exp $
 
 inherit eutils autotools
 
@@ -11,7 +11,7 @@ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi lvm kvm openvz parted qemu sasl selinux server xen" #policykit is in package.mask
+IUSE="avahi iscsi lvm kvm openvz parted qemu sasl selinux xen" #policykit is in package.mask
 
 DEPEND="sys-libs/readline
 	sys-libs/ncurses
@@ -21,6 +21,7 @@ DEPEND="sys-libs/readline
 	sys-fs/sysfsutils
 	net-misc/bridge-utils
 	net-analyzer/netcat
+	net-dns/dnsmasq
 	avahi? ( >=net-dns/avahi-0.6 )
 	iscsi? ( sys-block/open-iscsi )
 	kvm? ( app-emulation/kvm )
@@ -30,7 +31,6 @@ DEPEND="sys-libs/readline
 	qemu? ( app-emulation/qemu )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
-	server? ( net-dns/dnsmasq )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	"
 	#policykit? ( >=sys-auth/policykit-0.6 )
@@ -70,11 +70,11 @@ src_compile() {
 		$(use_with parted storage-disk) \
 		$(use_with sasl) \
 		$(use_with selinux) \
-		$(use_with server libvirtd) \
 		$(use_with xen) \
 		${my_conf} \
 		--with-remote \
 		--disable-iptables-lokkit \
+		--localstatedir=/var \
 		--with-remote-pid-file=/var/run/libvirtd.pid \
 		|| die "econf failed"
 		#$(use_with policykit) \
@@ -84,8 +84,6 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
-	if use server ; then
-		newinitd "${FILESDIR}"/libvirtd.init libvirtd
-		newconfd "${FILESDIR}"/libvirtd.confd libvirtd
-	fi
+	newinitd "${FILESDIR}"/libvirtd.init libvirtd
+	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
 }