Move sys-power/iasl dependency from USE="hvm" to always required because econf won't pass without it. Use udev.eclass to install udev rules into correct directory. Convert to virtual/udev again after it was mistakenly reverted 05 Dec 2012 by idella4.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 32 insertions, 19 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 01adc8b0484a..187035d75de4 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.118 2012/12/04 23:14:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.119 2012/12/11 09:02:38 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r3.ebuild,
+  xen-tools-4.2.0-r1.ebuild:
+  Move sys-power/iasl dependency from USE="hvm" to always required because
+  econf won't pass without it. Use udev.eclass to install udev rules into
+  correct directory. Convert to virtual/udev again after it was mistakenly
+  reverted 05 Dec 2012 by idella4.
 
   04 Dec 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Change maintainer tag (bug #390951).
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 5aa620a4e7c8..5ff9de3ccf2b 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,16 +30,20 @@ DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527
 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
 DIST xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f SHA512 1b2678f1cc0b4a9bf24b6b096ed40132a757594c1c5c877468d4cb0c2fba2193cc6bf5fb55d9a0f6cc81f1bf95913758c67898d8c4398210609a6e4412583df9 WHIRLPOOL 24d544c1c1d435879be8879a69eb096c451299a0d4e07c1407d6eaaa8910c2088f2ca0c618f8c6f02fbffbf745f06c9dd4faa5cc666a069e205a28024ddf77b4
-EBUILD xen-tools-4.1.1-r6.ebuild 10844 SHA256 cc64324dce41ca101328e47ac1e5665ab9d1ec4103432ddfea336a59f5bdc8aa SHA512 1612bc4a73bc54a30614667c9db186638c933e59e113a14d8e64adf84e55b3fbf696799a2ea023694cc0b5c458d4e24c6f16e988380c4647138d65a02380be2e WHIRLPOOL 9b59b6999194dd6eb93d7839515641aa144229e8e4ca60b7d08a349b74c46d1da6dba18a117aa24a634a5e8fe6f6dff130d55f30c5a77b00754f9cededc6f5e5
+EBUILD xen-tools-4.1.1-r6.ebuild 10845 SHA256 b764f7b64ebcd2dbe50bb63997c81ab8cfa8c3dd79a84eee4463648da7f0e4a8 SHA512 e102b8287a47848b903fae60989ae8774fe850e4896da6d2e8858fb8c6af599110901201870ac50c7f6a3301a960e91810e045f749cb01369414dfcfc41fa18d WHIRLPOOL 370c7c353648deb98f48308732f2bda17f74a721824191aaadd91d23fcb9aab8a12496df59f64e2a491925068025996f78462c6c3a8f28aa08765c9ba1e3e27a
 EBUILD xen-tools-4.1.2-r2.ebuild 9850 SHA256 02ad4fcf28cfc7a35136990d394ee539dffa2a2fa6292711d9cad1762d77dd02 SHA512 1688309835861894868572e047c8e910f4f54c0899760c119dec37c01b7ed6c45a50af30134564457a36a928c0e83d8df1aa7949580543778d62369a332bbc69 WHIRLPOOL 3b1ed42e1733e5d42c3cba47101f2376264c9b566e5b724c80f7f4e6e90303be2c60d632bc6d7daa044bc12a1328c5c8c8a8764520a97c02dc6d5bc30acf2391
-EBUILD xen-tools-4.1.2-r3.ebuild 9892 SHA256 b3b9aba6349603bbe3cb0fb6331d55539f0d66786b3238f044fa39d7123b8c8f SHA512 f8971a942aabaf96189c32131dc650dc7c5a776d84e9ebd80fc6094d7ac81fc570c5fc8e14f04d51ad9521a6a7d69b51d5c10de136f6a1fe098bf857473666a8 WHIRLPOOL 2ede5b57cd00e684aff18cc185be37a0362c59a3053d8e02494bc0ea4e25f11a2a3b9772e29f8b1c755c7b9b96f49c464324a32e081d606260a7cf57c71ca776
-EBUILD xen-tools-4.2.0-r1.ebuild 10156 SHA256 517368933cc24558b8b63c2261d2118a58220b3d3c670fcaa7048d5577ece53c SHA512 df6812b015931ac21ccc836a81bf43696a315ed49d04c32f49183ab06dafc28dfc82c8108d1da71003c6ab39598286425659a9c96519a8153732618bb01a352a WHIRLPOOL 511c4a2ef8f8e161fa9fa84072c4e588534624a460d1b35945a4a7c96d9aef058bebbdaa57597a49deb9e6343eb1d2efb57c4c7c2b9a99f607c271e739d2cdad
-MISC ChangeLog 29077 SHA256 b72e325fff889598dfc9095a3596dd30af2b656232ee55f3ecc7098ea9936b68 SHA512 3e33adfc39272a03452dbdbbd13c4d0fd45b5adf209f7dd4f5ef1692fdb8ca355eb455d51912a781642c5b3ac15cb3a4fdde9e66a807a25f3c349ee9a7f9ead5 WHIRLPOOL aa41b76ee2a019e12afdc952302441284a0567fe985b7bec5d0a3d492adca97ff07606d781af907e7a53ebba995469c60d28e549181dd027bf4d5003c25286e6
+EBUILD xen-tools-4.1.2-r3.ebuild 9895 SHA256 90119e2cd13c0bf04185fdcc329a3d5e3c638c476a4402b2b1d840e52aa3fdd9 SHA512 e044dc74ba1dd63d2d8249bc55fd0a843792524fbe72fedda839317fe76fb8cb7663fda70fada77f9d83027b465b29e0dfa88c220911e96ab46bc922361a274d WHIRLPOOL bdb88576c3ae528115a8f89a831d0ad3cdb61eb23c517bf4e3fe43605e8cd2ccf36af9696f9e15a24848060a487a7dddb26e87e81cab80371f79556af3c733cc
+EBUILD xen-tools-4.2.0-r1.ebuild 10196 SHA256 4f0f3123567b207c371b448150568158b5c7f9c415892f9ccdfbadef36ee1eb8 SHA512 dcd6fa6652440793ebc47063c3996ca76af5ba49fbffb1c25f22a4e439a26cb371b8f0395a7034207f07c123140acffb3d91ea36d7f1bcf9920cda3400e33210 WHIRLPOOL a2014b01eb2349b76e429d534501550f4f38f6912f7e4be40178adb8a4e2cd89aa40b5a98375e9029358b28ab71cbf74714ba1bf3571b27f30a467aaa9726eb1
+MISC ChangeLog 29482 SHA256 7c0d6ed1d1f6eb17d681c82172fdfc087abf2c493bdaa34caee90293ef3e87ce SHA512 380cd48c5e6389dbdea4a169e512c9ac879f11ce883e7796e0fd2ad29caf9392c83729f3d21ceed31fcc0f149963cdd791099dd273908afd802de039722ca157 WHIRLPOOL 10be037fb84a78bfd50c128cf0b7cd6cbfd9ea9df8858fa8cfd4482051b62c1ca53e16a811171859b55daa6b8a9e43953afd46f57fec010e3c1d34aff84fe080
 MISC metadata.xml 801 SHA256 44aaa6739a1add2cce5db154a3007e5aff3eacc9006e86ac332acd9b3ad3c627 SHA512 b791fd7a9ad54aa0374c8da46ec9197110918b4857d12416e2f76d604e92ce9f732bf94b236cc629c5cd0979dc5061fcffb94e846ed865ed0ca157457ffde720 WHIRLPOOL fb12683cfa3ea2d24c22fd87e88e2b5abd97b299edb9154658ab79def1eabd7b1fecf723a2c8ffc2d048bdea97e5ef374272398659f2ba76aa9000f1104eeb4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC+g8QACgkQVWmRsqeSphNutQCeI7i+nntbDfy4rWTGJIOoghUF
-x9cAni54TN+liK5qn2ruhWn9BRKJnnWn
-=kpcv
+iQEcBAEBCAAGBQJQxvawAAoJEEdUh39IaPFNybkH/js2c8OExQcteKMCd+qK+xp/
+gqxtOJeFKwOPSHY1+PVC1JioiF2s7CPe6qvciFQoltIxZRpKpdPx9JwnC2zc4iDW
+NQreb+sNkbslspiRxQ2Wa22HGq0qpkL8+qtcHhQGtFyF0TupLH2vggLtjrMevoFS
+LxzqIJ7VfZSdfStpLHESY1isAC0g6i7I+jao79W0y+rw9xHAzmr5Dl2zbI2ryJw5
+9MQJ30uFi0Ra5hwM0z2LoLGvcZ4R8W1mEKWxlkUDNmhREWlPa8jUqjUueuQ4R/r4
+PikYiu6gFb7WlooOMrlFLdVw+zfBypn2sj46HXhSFOQuGsu2uBK+Vb6Ge4hjglA=
+=QPpm
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
index e32dc1011b34..33b7e2c194fd 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.8 2012/12/04 19:24:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.9 2012/12/11 09:02:38 ssuominen Exp $
 
 EAPI="3"
 
@@ -69,7 +69,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( sys-fs/udev sys-apps/hotplug )"
+	|| ( virtual/udev sys-apps/hotplug )"
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild
index c39c7d3a8cdf..5850f93d51cc 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.3 2012/12/04 12:00:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.4 2012/12/11 09:02:38 ssuominen Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( sys-fs/udev sys-apps/hotplug )
+	|| ( virtual/udev sys-apps/hotplug )
 	selinux? ( sec-policy/selinux-xen )"
 
 # hvmloader is used to bootstrap a fully virtualized kernel
diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
index 1e8e5e4909eb..b5824a6bb22f 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.1 2012/12/04 12:00:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.2 2012/12/11 09:02:38 ssuominen Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -22,7 +22,7 @@ else
 	$XEN_SEABIOS_URL"
 	S="${WORKDIR}/xen-${PV}"
 fi
-inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclass}
+inherit flag-o-matic eutils multilib python toolchain-funcs udev ${live_eclass}
 
 DESCRIPTION="Xend daemon and tools"
 HOMEPAGE="http://xen.org/"
@@ -41,9 +41,9 @@ CDEPEND="<dev-libs/yajl-2
 	sys-libs/zlib
 	sys-devel/bin86
 	sys-devel/dev86
+	sys-power/iasl
 	dev-ml/findlib
-	hvm? ( media-libs/libsdl
-		sys-power/iasl )
+	hvm? ( media-libs/libsdl )
 	api? ( dev-libs/libxml2 net-misc/curl )"
 
 DEPEND="${CDEPEND}
@@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( sys-fs/udev sys-apps/hotplug )"
+	|| ( virtual/udev sys-apps/hotplug )"
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
@@ -281,8 +281,9 @@ src_install() {
 	keepdir /etc/xen/auto
 
 	# Temp QA workaround
-	mkdir -p "${ED}"$(get_libdir)
-	mv "${ED}"etc/udev "${ED}"$(get_libdir)
+	dodir "$(udev_get_udevdir)"
+	mv "${ED}"/etc/udev/* "${ED}/$(udev_get_udevdir)"
+	rm -rf "${ED}"/etc/udev
 
 	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
 	rm -f $(find "${ED}" -name openbios-sparc32) \