Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt #145809

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

7 files changed, 35 insertions, 26 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 3bf44496a4c4..c4d26263d0ae 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.124 2013/01/20 19:29:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.125 2013/01/21 22:18:07 ssuominen Exp $
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r2.ebuild,
+  xen-tools-4.1.2-r3.ebuild, xen-tools-4.2.0-r1.ebuild,
+  xen-tools-4.2.0-r2.ebuild:
+  Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt
+  #145809
 
   20 Jan 2013; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.0-r2.ebuild:
   Drop python2.5 because of lxml.
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index b133fba70099..6ea21b85bd9f 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,19 +30,21 @@ 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 10850 SHA256 211488d3a1463ff5da42f9fd429bfbf951df6651b11ffd2f471c95cc7203d20c SHA512 0cd5590022e404a53db131d370b75ed5f70d183a2f3deaed30b0f0a561410695790b3b991db3b1fd7028d6192c11ce4bcd404752bbe7d2b8d7630a4f3fe8b84d WHIRLPOOL f1af0bcfa23161dc1e6236d9237c7bbdc9037cdacfc775d7b9a8858ef432a57d852f9b1cae979540579ec00ee955965edf175dd1aefa18db3d21acb05adb1ce6
-EBUILD xen-tools-4.1.2-r2.ebuild 9850 SHA256 02ad4fcf28cfc7a35136990d394ee539dffa2a2fa6292711d9cad1762d77dd02 SHA512 1688309835861894868572e047c8e910f4f54c0899760c119dec37c01b7ed6c45a50af30134564457a36a928c0e83d8df1aa7949580543778d62369a332bbc69 WHIRLPOOL 3b1ed42e1733e5d42c3cba47101f2376264c9b566e5b724c80f7f4e6e90303be2c60d632bc6d7daa044bc12a1328c5c8c8a8764520a97c02dc6d5bc30acf2391
-EBUILD xen-tools-4.1.2-r3.ebuild 9895 SHA256 90119e2cd13c0bf04185fdcc329a3d5e3c638c476a4402b2b1d840e52aa3fdd9 SHA512 e044dc74ba1dd63d2d8249bc55fd0a843792524fbe72fedda839317fe76fb8cb7663fda70fada77f9d83027b465b29e0dfa88c220911e96ab46bc922361a274d WHIRLPOOL bdb88576c3ae528115a8f89a831d0ad3cdb61eb23c517bf4e3fe43605e8cd2ccf36af9696f9e15a24848060a487a7dddb26e87e81cab80371f79556af3c733cc
-EBUILD xen-tools-4.2.0-r1.ebuild 10208 SHA256 0b96f2338d5b7faf8ae41bd9abcb6297df623e78b6ce884871910a6166397a9c SHA512 419ae1a963b6e1807d2ac34c99f19d06239e172f3084cc6dda6831edf536d19ad445c84bae391eb67f84b14e4c3f81ebc70a7b18ab720543011963068581a1fd WHIRLPOOL 7a81a3444f95bec0f3c12a43d8fae8442dc0e9736e5a07dd8cc2c748b8e974dbbb2f92dcf2fb41d89e4c145913140f5861c23e4b38dc36c3ff723992e6d3c32e
-EBUILD xen-tools-4.2.0-r2.ebuild 10275 SHA256 b6568b2980f7db7f6c69ea9e6ffb6dad0e7880239522b4f90dd4858bdbe57b5d SHA512 6818d7c8a6be72b4e0646944b8f50693c1b66fa69fc82fae95d1135de101d1fc58f33415be79577e80f99c29a3fc112c92db49bd73cd03fb3f8747ee58082beb WHIRLPOOL 9ed3b7ce7469333419e9561150363204709a8e282c18113658226c16f1a79ac833996a4dffaa847032cda389e50cccaef43fcd4a5db87f2ec32bf1eea9ca1874
-MISC ChangeLog 30178 SHA256 6019f3225707b2ae201c0e98e33d617dcdab0b893bd4d814d2c27cc22c524e3c SHA512 35c1c77d7f2c80b4c5bc2508284053960d757ccca046f3419852d67fcd7eabbdfdf4115dfe4f0907cd09d118192060400e88fb499b281676994c2cc389334d5f WHIRLPOOL 91d49a914a8f0eedcd6084f24cf39f1c54ae7dc720f94109add82c76b37224116c47d28595ef35138f927348e924da9e041e1bb7c01bc0a40b1383f1b4b2cfb1
+EBUILD xen-tools-4.1.1-r6.ebuild 10826 SHA256 9de2acb519d5dd4170dc427c4046a277ebf33eba53e5b2a9d900d6e2aefaf5ab SHA512 f984fbd0e317624a762b240057898b2c4935dfde2cc9d7d3e418dcfa2e50720bc71c407d140a4c3ab1cf5288c78731810158cfd273cc2968668ecf283ba1d93c WHIRLPOOL 203266f0c6f94127d06720294f52b234ac450b644898b2a096550af61e28f05ab3313ed345572458f7f7ef2e802f1e8182c26566c517b57fad94f49df383050e
+EBUILD xen-tools-4.1.2-r2.ebuild 9826 SHA256 b300e42de3af86855917751962a9a295398a499654ed1cbfbde41427abf0dbdf SHA512 769f640ef25f1f56135c928e1e7136ae0004a34781c1b3789f3c4ac974a11ab3c500097b6ab1f26a7f85da3199877c0c9e4d7dacf52493f50a4995ab25fdd18e WHIRLPOOL a60d467adb89fa56d982af3a3189372767bff3688732e26ccbd70fe3fc5fec4f9e0c86cbb3343ad8cc34d9190378161720f1b370e10e78eafd3e57fc534c89c8
+EBUILD xen-tools-4.1.2-r3.ebuild 9871 SHA256 ed822340a3a807899d1d493d52b166a10c956cc032e24468d40a0d54fb17220a SHA512 df957044e736b254ffae9b5b45b51db80d8d0afc7ad70324fd62b76076588614bc70171917a66f42d3c3ba73acb230938e728e68073943d18324999463d4d3b0 WHIRLPOOL 47f433f9807e91ba220de47e44e0256a3f9222344cf944bf0fa2a85c97112973f324a96bebb073e989c091e8f6bded5fac1cee4e58bdc4b6f000fc227d1d2c79
+EBUILD xen-tools-4.2.0-r1.ebuild 10184 SHA256 36e11a418b4ad36dc14b22847c6eee52ee8684c5cf4f1b32a6b20f21b479e1cb SHA512 9321e3b399136024cba5e8094f244e63b2c44c1557eff4ca26315a6fb97414e7df5c406cf9aa26bbe1d4601dfbaf40b0f4fbf7d48a8ba9a8cde7757c9bf3e86f WHIRLPOOL 82cff2fb0e6d7c4b5f7ba94deee3dd955a23d568ca973d887e193b79c34459764f8a9b309286e5596a0edc8ef5e95ac1a7fbbdab79b16258d99822dc27efa0ef
+EBUILD xen-tools-4.2.0-r2.ebuild 10254 SHA256 c8440539edfceab62364f555e20ae5497f79bfac8b805f742c448b4776e8e257 SHA512 b5e299d4409baee107c25b5ea2d7da7e971ea0aad226f06f6048856679e92ab18f87c176443687e9c6347510d619413b3f767b699a61e22c8416be8b6613707d WHIRLPOOL 578f6c95bd7f2d32bd6cf9684739c32ffab73a72d9558efe157605eadab18e8243db2246e200e19ed0ffa62787f8992622abdeec909ea84bd2afb979226373de
+MISC ChangeLog 30466 SHA256 64700ff0e6d40f8c30d1bcacdc62397ffb7a7d0c2df541add13491ecccb62775 SHA512 77cd084efe78ae166ff1793194ab03b8629336de99f50e7369b50b456ab85f81515e0a8e8f1b480795dbf4b9120aa9ff50920a6b67cf26125f3e771af8af789d WHIRLPOOL acb0de965d4a5045422bb624f26f7a91a506858553de43795f0d55bbbd1ad1a5a13058ddca79d98161849d6280be86ad01af6091d5867f5fa5829b49f52fa1af
 MISC metadata.xml 801 SHA256 44aaa6739a1add2cce5db154a3007e5aff3eacc9006e86ac332acd9b3ad3c627 SHA512 b791fd7a9ad54aa0374c8da46ec9197110918b4857d12416e2f76d604e92ce9f732bf94b236cc629c5cd0979dc5061fcffb94e846ed865ed0ca157457ffde720 WHIRLPOOL fb12683cfa3ea2d24c22fd87e88e2b5abd97b299edb9154658ab79def1eabd7b1fecf723a2c8ffc2d048bdea97e5ef374272398659f2ba76aa9000f1104eeb4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlD8RdEACgkQfXuS5UK5QB3/JQP+NcNEdbZ1WuKbI2m9LJ03+a66
-0TF/bvZ5tMZYTnuuXyGgtH88rnff5oQzF53z5BgQhZMC/DebT0vkCgy8phvOvAE6
-KW82OwHavPWizC3bP7OP/MxW9Vxy+dvgvsDN0WBM5qYpJsE6ecnT7feQ8ed6s+8L
-sIg/C9TkCCGLv1Oqr5Q=
-=HROA
+iQEcBAEBCAAGBQJQ/b6fAAoJEEdUh39IaPFNhmIH/j+M5Xc/NxG3+HWE3hxKeRHY
+9bH/rlJjIj1U8dyH+vY5fdH7rh3oN7WwP2hqwF77MrmTVjtwwp1N/BTNPd68iUCE
+SQVptq8w5thJjEUzwZqUaNTxiYybZEtOYEDwzooizjvNHzNzQyFC1QhtxhI3H5SM
+DAQ6THptEuFo+Y/T9L+NWmzBQUJmwiVv416+/0rPobu9XRyRic3O0Gn4+SQdpEea
+d9F5MSPEIYTScuUIPTUH8ThYXveO0xTvuqKf6EpYm7D7+lBUHtlWUub6bVRxXNS+
+qycWUhuY1MEQZ/brYf/6Qmy/xTiBvC7wSf+rJkMwbaWAsY2Lre7AvIc6h9X+pnA=
+=B+eX
 -----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 0002a91a95b0..b080691a63f7 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
+# Copyright 1999-2013 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.10 2012/12/11 09:06:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.11 2013/01/21 22:18:07 ssuominen Exp $
 
 EAPI="3"
 
@@ -69,7 +69,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 # 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-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index 9a289c7ecac4..0180c2976ab5 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.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/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.6 2013/01/21 22:18:07 ssuominen Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 # 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 5850f93d51cc..6e873f9bfa5c 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
+# Copyright 1999-2013 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.4 2012/12/11 09:02:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.5 2013/01/21 22:18:07 ssuominen Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( virtual/udev sys-apps/hotplug )
+	virtual/udev
 	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 783ef9ceb18a..6192ef6f067a 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
+# Copyright 1999-2013 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.3 2012/12/11 09:06:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.4 2013/01/21 22:18:07 ssuominen Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 # 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.2.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
index 9ddb92b77e0f..3549172f3001 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r2.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/xen-tools/xen-tools-4.2.0-r2.ebuild,v 1.4 2013/01/20 19:29:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild,v 1.5 2013/01/21 22:18:07 ssuominen Exp $
 
 EAPI=5
 
@@ -81,7 +81,7 @@ RDEPEND="${CDEPEND}
 		app-misc/screen
 		app-admin/logrotate
 	)
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032