Tweak Xen depends to make bug #446572 not bite people.

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

4 files changed, 19 insertions, 13 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index e30e430f24de..7af8d26ed752 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.242 2013/01/24 04:06:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.243 2013/01/24 04:18:47 cardoe Exp $
+
+  24 Jan 2013; Doug Goldstein <cardoe@gentoo.org> libvirt-1.0.0.ebuild,
+  libvirt-1.0.1.ebuild:
+  Tweak Xen depends to make bug #446572 not bite people.
 
   24 Jan 2013; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.10.2-r3.ebuild,
   -files/libvirtd.confd-r3, -files/libvirtd.init-r9:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8dbc0fa0b2a0..e995d8745fa3 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -7,8 +7,8 @@ DIST libvirt-1.0.0.tar.gz 21868950 SHA256 14c8a30ebfb939c82cab5f759a95d09646b43b
 DIST libvirt-1.0.1.tar.gz 22512698 SHA256 4a16c76c46ebc41a6514082b5d95b5d5a0868e7a8cc00ab2e6cc1a23ec6b5a3b SHA512 7a106998565410197b1cca45c68c84661935c96d1cd28888b977691faf29b10af6742f00f0e8baa76b27af4031e6b8b988c2ae83f3cbb5affe3381401fb6859e WHIRLPOOL 3b98c742141a63b3e6384e6fe09b01cec485bfb59fbefe89f3e64450bf66e2441aea43b754f92253e2c3f33f5b5d56975473cc4aa7313d622e40cd3185608ae6
 EBUILD libvirt-0.10.2.1.ebuild 11493 SHA256 8b16eb20d78026ffa2feccea853650da67479ebcb2cd2da43f6e30d740b1c9d4 SHA512 fd3efc36c1358ac9413a319e20efe25a71be62714071e43951bae6bc8e2104d5c86e74a50edfbaabeba43d6c12638b5df198f565e56dbc5ec7c26783300ce2a6 WHIRLPOOL b1a859a1f105ed3e37e8fd59606db8244196b9f4341495aea91fe78d76f8c8cada4bc21fcbe5079639147f8c15fe00c8c02ca6ee60039174f8d6cb2caf434842
 EBUILD libvirt-0.10.2.2.ebuild 11622 SHA256 82e89a1ad116af8ad4818e32108f36a739b52b97be5df6f996a26c73aa8b5ea0 SHA512 a2484b229926316ab9735efb8bd6835ed15e773f87c7a25ea387f83ed14812e66f4498faca6989801684f40a01e3f7a53382c953827ca0105ae815ea42b8c189 WHIRLPOOL 51c1ec1d51d3c950ef01b7af02b4808e0c87fe2413eeeef9dc9be189acd771b384a0c60fd0d2a72eeed7709af71a7d1565dd77ba66bef0d87b79e1fa98554779
-EBUILD libvirt-1.0.0.ebuild 11697 SHA256 6859fa65dd4bd7cd18d948facf2fc3b775bf7fb274eab1d41b7fac95b53d2bd4 SHA512 af35a0362fe5c4fe9365ee17c342f568faf9141f65e0c84ce37984e786d9bcfd776e5a620e8e28e1039df6758d881b31796a6267f5b8fdce6b5a32f42443ee6b WHIRLPOOL 8e9d2682e90c328d4690597ebd47e9c9baed51f3dc76742b867f1d21bcbc984ce4bed8c06352c5016bd4c60821042c34069833390684dc9b6d4ebe67282c92c2
-EBUILD libvirt-1.0.1.ebuild 11822 SHA256 2a884a6af476b34a4b94c8d2d9a987fd20c63cd82caf615f2f122496ffaf939d SHA512 2c570834569954273ef3d1d67d5b06dc6030233154641ad128baa39cac199e9f49abf0d3029b7c051f84dd97208d2471d42720e57e0e8bf3a72cce5aab2b9da4 WHIRLPOOL d2224dda8d76b5467e2ed5d63d5078e7be05b90c77892761fc95daa61edf6b17a72db6077aa0e3a465aa11f6f1b5911c71c8fb1d7b26ad573ebd5f78bdd708c5
+EBUILD libvirt-1.0.0.ebuild 11621 SHA256 dedea12d030a0848b14203ac957711736634314e80436684d49c260cf00b8133 SHA512 02ba9fcc564d1f42a31ea089a08d1e00aac99770d32b7c20f628ce373e188eb49a24ad0feb5189b22e4a362479a550c143f9204d9ec311172c9586ced91c8957 WHIRLPOOL 1cee0be66c616c7d68b689c03ff95d77a016f80106fd8f5cbbf81c945d4bef90697dfcd2892e1f06ae438aaddd0ce23bb9c16b749db15c106b0ffdad6a5a13ac
+EBUILD libvirt-1.0.1.ebuild 11845 SHA256 099a9d2c123492bb6eaa7e803913dcfcc6906fadb0b19acfe3e99adf719308b0 SHA512 5da41aaf41385c50f21fa7e724441bf1cfe0cac9d4d47fb521817705fa87f0bfb81f277c1eb0c3c0aa785c67ba44e3772900ed179241b8440d29ddece0d29a24 WHIRLPOOL 0607f0e2ce346f7204cb192211ed4991a4add1b6c6377c2a1ad7a56e5cb9a39235e83823c68e8efc788e145d0ab704bf41696778b0b9bc24ceb34c49c69cb3ac
 EBUILD libvirt-9999.ebuild 11519 SHA256 97c4435c5719e3e94658fe3c66366afc37f1bdaffe6221183635212a5061837f SHA512 a152f25c2aa41db942f0d51dd65ae4412b31ae077b3e7ca48dbe721d2792df8fc6dead7bd03fccf2c7e95821b9bb4e167877343b549a4a6949af97fdf9a9b099 WHIRLPOOL 4ecef7a049e9610e7ce891eaa31dbbe41bffaaa08686d9bca23fd5b8770c8690c338a4a78fb64536a295b9cf1f43d379bba2891e391b935519d4f4b269c69d04
-MISC ChangeLog 46565 SHA256 d8159e568fa04494299a22f068e10b0327863cd4f65b898dc2e46f45ebad1a49 SHA512 89cb4c4fb28dcb7f729e3d3b0085a2a9063627e881e925eea38f820a3454bec2f774cd87552c85ac5f95605e4acf84f2e4c5dd7b6d10c6c1c2a27fdbd66505d0 WHIRLPOOL d068590daff5e701d90bbd022987276b3c174410568c53643675fca0df8011617739e68a1c4f87d7e95e71b5c2a2d565bf0f1c66b39fa7ccd96405dedad05b3e
+MISC ChangeLog 46719 SHA256 02796514b1ebe2fb6be3b283f89236e8a4da3c705541b2335fcebf7f1ad1b910 SHA512 8aefbdd36fea40efa2b5c35dc86616182dad651a65a82a8d3f49da6170c227a33254360683ffd3fdbd96dc247b07d7d4c694d126cb88ee3d485ec8ec2b7ff8d0 WHIRLPOOL e864dc0d652e5814a4fa2221af84af8b9fa2db1b61700a362d7a5c581bb599d17a1ca48997e55aa9deab067a2257bf859e8d865bfc0c2e1fb1dffc54ed9db382
 MISC metadata.xml 3433 SHA256 1f1ed0c0f3ff9c388bf84c6877e7f5a9f2913b3d9b4ce71e3f98c64dde4a6084 SHA512 59c1c7df543b79e0de45dd0d30f0c2440a27baf2bf89fb8f4505c8d98ed152bb074cdf136fdb4299247f80099af5a3a2c058c3aa5ce277014128cd7f759a5b4a WHIRLPOOL 76a3e08490084f62049793359c23305565facaea07433227f432cbfdbd7e4a3956ca31a958c5b7634196345e236a5cb9000ff89bc7a22eaa9c98921990119d05
diff --git a/app-emulation/libvirt/libvirt-1.0.0.ebuild b/app-emulation/libvirt/libvirt-1.0.0.ebuild
index 85dae7d9ceea..4fb92a1cd2eb 100644
--- a/app-emulation/libvirt/libvirt-1.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.0.ebuild,v 1.4 2012/11/29 02:13:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.0.ebuild,v 1.5 2013/01/24 04:18:47 cardoe Exp $
 
 EAPI=4
 
@@ -224,9 +224,8 @@ src_configure() {
 
 	## 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"
-	use xen || myconf+=" --without-xenapi"
+	myconf="${myconf} $(use_with xen xenapi)"
+	myconf+=" --without-libxl"
 	myconf="${myconf} $(use_with openvz)"
 	myconf="${myconf} $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
diff --git a/app-emulation/libvirt/libvirt-1.0.1.ebuild b/app-emulation/libvirt/libvirt-1.0.1.ebuild
index 332ac39ddeda..8d50b3c6b3df 100644
--- a/app-emulation/libvirt/libvirt-1.0.1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.1.ebuild,v 1.2 2013/01/11 23:37:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.1.ebuild,v 1.3 2013/01/24 04:18:47 cardoe Exp $
 
 EAPI=4
 
@@ -224,9 +224,12 @@ src_configure() {
 
 	## 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"
-	use xen || myconf+=" --without-xenapi"
+	myconf+=" $(use_with xen xenapi)"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
 	myconf="${myconf} $(use_with openvz)"
 	myconf="${myconf} $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then