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

6 files changed, 31 insertions, 26 deletions

diff --git a/sys-fs/iprutils/ChangeLog b/sys-fs/iprutils/ChangeLog
index 9a618302416e..80e040faa7d9 100644
--- a/sys-fs/iprutils/ChangeLog
+++ b/sys-fs/iprutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/iprutils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.36 2012/12/03 10:03:00 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.37 2013/01/21 22:20:54 ssuominen Exp $
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> iprutils-2.2.18.ebuild,
+  iprutils-2.2.19.ebuild, iprutils-2.3.0.ebuild, iprutils-2.3.9.ebuild:
+  Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt
+  #145809
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> iprutils-2.2.18.ebuild,
   iprutils-2.2.19.ebuild, iprutils-2.3.0.ebuild, iprutils-2.3.9.ebuild:
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index e9c28133d411..652fe3a9dd53 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -8,20 +8,20 @@ DIST iprutils-2.2.18-src.tgz 163371 SHA256 e761ca8d2843ea6bcfe2bfdfa3268606c9f88
 DIST iprutils-2.2.19-src.tgz 166307 SHA256 0a3f3e2380d4b58cf578f8a049d648ac6d84c48ec775503b8034f857f467aa8d
 DIST iprutils-2.3.0-src.tgz 453479 SHA256 805a1000b79680e911c45fa65847a348011c858e42bbf3c6a5cfed4df7f516fc
 DIST iprutils-2.3.9-src.tgz 169854 SHA256 9d56d058dc377ec21323e6a8710742168f5d2148d13dc249021f7123b8ba360f
-EBUILD iprutils-2.2.18.ebuild 1137 SHA256 e231cf33b1fb3360c1e7b64fa8fa2da4dae8dc0a7de056da0cf0bc91f6480534 SHA512 01433741b61f5926f52e28266438cfd112222f135380a6b88348c0a91e9834fd45ebc29cc3f79047cfeacf58f946ec3676b7225498094ea2435308a321b47bec WHIRLPOOL ee22360d5a59fe2ef3e806359d6004c74331ac200615710c3ecaba50811d5682b63fcc8d2dedf8d9bcc8dde54b334ad92e76bd5c142f8bf169fc643f0d6a9aa4
-EBUILD iprutils-2.2.19.ebuild 1135 SHA256 989ad69fb070ec97f5c4d65bc21d3b7ad26ac1e4da1a499c987a5cedf476e337 SHA512 1b6d481daf1a705ff146b974bddb7aff00bb7ac7da29beb10f5fa2da13da37cb219109fb2fcb0b521c0a3ed5bc7cbe85a93e6253caa8b05ccdec9e5e79af72bd WHIRLPOOL 9c5917eecb2c014d00a6357c0cd0cb444a2a0a6ebf394949993f2122aab2488abd61604342d18c45a50175dd2a98c7818784e981dcc20d397b6f379743f1032f
-EBUILD iprutils-2.3.0.ebuild 1136 SHA256 e2ea0e3c2818d829c64c28dda63518ba3994f001cfc277bce4be8ac6713bd314 SHA512 2328566eeb3d483bf0924657836b1780e71852074f6a5d7da1f08900061abea6b47b23046f7d241a8b6e8d8db094b088224e84bbabc9784e9e72bdf906f414be WHIRLPOOL d90a6e099ee13423c5ca885d691c86b752dc17023b4b1505e64e983c7c3b2d6ed8b5c21a5c9798801be1f7d7553bbb31cf8b6f6174059d4be74a60e37eee3986
-EBUILD iprutils-2.3.9.ebuild 1136 SHA256 9af71a411627e8a8ffcc139040448f0ffd92927bab73bd7166825140624820bd SHA512 a07e5ad9a1733f69c954a21b87bb72d8bf1d316a4a135cf3037c2c346a1165079c93e2a199053d38a268ae8b3900e2dcd562d16f59d8d3f3e078f3dbabea160f WHIRLPOOL d87b57f786bd25a85c818b62af0048d772695fffe468408fd9fa0aa6345b2fe08a6ceb62abf6f275e1ff8e9c164a2b7bb145e92c9d3dd2603e29a9c69480fd8b
-MISC ChangeLog 6095 SHA256 8f06d4a97a006625648b3cb5982c6a1b3fa5914be64b467c5383ff98a4db5b0c SHA512 60e0f7b55bffde205c57f28481c9275eadae735b0063ae9ab6bf12f2a4033f3ef1790aae4f2d1e2d8ea6822fb0f088d45dc6e068ba854438945a9f624120250e WHIRLPOOL a6bc8c9eeb2dea76226d00b4c15130e0d8d5a22bc53c584ee5ec4f9781a1224830a7beb85c4b8f133bebf96b871afb7e4b8769310b51cc7c59152366d10b6769
+EBUILD iprutils-2.2.18.ebuild 1113 SHA256 497de8c2d25b1c30929ae9abd38aec3a008b92260ef124b19fbaa5cb6b9d04d7 SHA512 fc4a91e1bb744c47003cb42ae648dc89cdb01a9987c7812829ea7023daf738add3389fa8714bd86bec91b55d8a4e603456d0d5000a00036ccc61fc50540896c5 WHIRLPOOL 8940ccb85fb4c84450833bf2c1d91324e953f0677cca6c9910fd2ff7a6c39569a749e0dfc9815170237e3fad6c48d0445eae07353572208b7dfd87b90f64bd2b
+EBUILD iprutils-2.2.19.ebuild 1111 SHA256 13fadbdc78af333a56578a1d3b1fa1807b6475d857037c043dc3b1a20ad8a11e SHA512 f2e433e4bed3c82727dcde8fa59ab7f646967fe3ec4c886e80f7b281c7722e63ead9535a16282d2913856994496c4684ff2a6cd3452d95d873ae27fcb0368b8f WHIRLPOOL 069792a42da36e191e849795834051295bce59ef934643e367f8810b4627fcd96201e318ea6d6063358cdd65978fec1d2b358ab95662ad373ecf8a44790b9595
+EBUILD iprutils-2.3.0.ebuild 1112 SHA256 8ec6b1fef0e583bccd232843eef386d275995ffb2d6c59cf020f90205c920b1f SHA512 bd9f0fba448718aa7b38829150406c7dae6f9ace8347c46a55545ff094ec90f6d3a5881080f9d5e0ce3343f3cd1891b8c856a8a82521c128e0fd6710fa56ae8c WHIRLPOOL 11799a198ea7a3fe36a8a72cc5fec09f728237231956aca1c650aaee234550581d925b6cc3de340abf1df2d7792e49f6d6509620ddb3b9bcfc3162545abe3c4b
+EBUILD iprutils-2.3.9.ebuild 1112 SHA256 efbd076f914cbe3efa0735372a559b1a6a53c401d125b9b8306e627f7c19f8ae SHA512 c74cf7e4f9711a175fe18356582c1d8d8d8d48fb91d1ef67e1ab104637fbf40e421d305c08abbf25bacfb7fdb34f2136c163dee7b3dbc496a61e93fc286b63ff WHIRLPOOL 255d20e744a005ef8df7cea732b47e9327a594819f9badb92760fe368b165edd15ce0c29f7e65dcc3ab396219c47df6a95f84c33120586d5cfe83824b7d9a33b
+MISC ChangeLog 6335 SHA256 28dcf1564ec13f644e3b19142432a7811d6473790237fa228fdd7c1229d74dd5 SHA512 dad381945da83cd869955ee0ceb1dbfb137ad647daaec92cd10825c32fb7e20d895bd4a79a2249566fe08b7da7157dbc9e6e21a3b9e0a541ced16c59fa41435f WHIRLPOOL 4c61c8a3020e7d28963cd695e2f6b085470771fd5c04908a385b6ac7f275015914bca3ee88b534e34eabc84d91457196f308645d86070db4b1d05f9a9941658c
 MISC metadata.xml 245 SHA256 a09ece2e39954e335916376b6a82a1c14d4168b114ebbfbf2d50ee27ef06fd26 SHA512 ba9bc8ac47a73223e6f67d347e42cbe367da152d4ba9582df71cfcd798e4983ef5b287ad6b54f51a6a5ae5989aaa76ca472d82da212b93efefccb7bb9f678561 WHIRLPOOL 163c43fd3c3c73f33a225e3950efeebdd1b2bc0b0748b279b715a58dce468e8d4ce7d0a2d9e74fd05d95007f8f2f22bf0d8a6566a2e46b7c1d8f0111821ffcb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvHjVAAoJEEdUh39IaPFNy3sH/1Fp5Slgog7DF5i6QwMYuY3T
-sL6P/llIslS4U5dCkQX1AaF+qy3QA9/bMRm+nctSxItXv8RLiLgUAh9PfeUakclX
-ATeTfQsH+XtLpsysXwW4WxyP5BNYYmsrgO6NYcFvFfTBObdQWI7bOk2lytVYvKnO
-rFEie+FoqOLcNoynIuw5J/NMs1+XHQ/xnMWitFcQ3Y1QetrxfIisNAI/RGhpaV0Z
-HuA2FkFW5m0U+AF8IQ3byr0wpD6cnz4KJjIm3CtPWAMXMJJ63nrr3k+kwXTEho3L
-4dBeG7fuSnqw8ZGQjEHeKM7YgcIKE0ydJwcG8wu8UWEE0LUSCxPEDT5KBps3ut0=
-=bcjs
+iQEcBAEBCAAGBQJQ/b9GAAoJEEdUh39IaPFNuK4H/0qYcxZ4qHaB1cMeATh28ogX
+hv9WpUbvAABCzeYdr4sSb13Ekpp9BLbWM+0iTrVTsg4P59ZPPcqine2nRa+twF/d
+nCloXXn69TbLjP8gnfi/E9LSBAYTM0O45fZzciYzM5hJyozHmkiN4qjE897syNFP
+x4vzYEDT8onwEaG1LqMLPI/lk9JE44JeiFFCvB3lAuUpbAUchZyzGBoVXj+AkNWi
+54yhvfWEU9WWRY56F9NIlZZ+hkCX2FMFOGMYdxCCVQk+LrCdkWWq6wLgFOlc761C
+yVhxo5tQlvCsZqb31gHHfMGsd6WfxpvfPwXvu8ubyfvACJVr92KwuPxCVyxWurI=
+=Vi2G
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/iprutils/iprutils-2.2.18.ebuild b/sys-fs/iprutils/iprutils-2.2.18.ebuild
index b865f48fe295..ef270b042367 100644
--- a/sys-fs/iprutils/iprutils-2.2.18.ebuild
+++ b/sys-fs/iprutils/iprutils-2.2.18.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/sys-fs/iprutils/iprutils-2.2.18.ebuild,v 1.2 2012/12/03 10:03:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.2.18.ebuild,v 1.3 2013/01/21 22:20:54 ssuominen Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=sys-libs/ncurses-5.4-r5
 	>=sys-apps/pciutils-2.1.11-r1
 	>=sys-fs/sysfsutils-1.3.0
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 RDEPEND="${DEPEND}
 	virtual/logger"
diff --git a/sys-fs/iprutils/iprutils-2.2.19.ebuild b/sys-fs/iprutils/iprutils-2.2.19.ebuild
index 04a7ca16c72f..43a2bdd4790c 100644
--- a/sys-fs/iprutils/iprutils-2.2.19.ebuild
+++ b/sys-fs/iprutils/iprutils-2.2.19.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/sys-fs/iprutils/iprutils-2.2.19.ebuild,v 1.3 2012/12/03 10:03:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.2.19.ebuild,v 1.4 2013/01/21 22:20:54 ssuominen Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=sys-libs/ncurses-5.4-r5
 	>=sys-apps/pciutils-2.1.11-r1
 	>=sys-fs/sysfsutils-1.3.0
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 RDEPEND="${DEPEND}
 	virtual/logger"
diff --git a/sys-fs/iprutils/iprutils-2.3.0.ebuild b/sys-fs/iprutils/iprutils-2.3.0.ebuild
index bdffa70c6f6a..79e97d4d693f 100644
--- a/sys-fs/iprutils/iprutils-2.3.0.ebuild
+++ b/sys-fs/iprutils/iprutils-2.3.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/sys-fs/iprutils/iprutils-2.3.0.ebuild,v 1.2 2012/12/03 10:03:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.0.ebuild,v 1.3 2013/01/21 22:20:54 ssuominen Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=sys-libs/ncurses-5.4-r5
 	>=sys-apps/pciutils-2.1.11-r1
 	>=sys-fs/sysfsutils-1.3.0
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 RDEPEND="${DEPEND}
 	virtual/logger"
diff --git a/sys-fs/iprutils/iprutils-2.3.9.ebuild b/sys-fs/iprutils/iprutils-2.3.9.ebuild
index d1f694792a4e..5a3a2f9d5327 100644
--- a/sys-fs/iprutils/iprutils-2.3.9.ebuild
+++ b/sys-fs/iprutils/iprutils-2.3.9.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/sys-fs/iprutils/iprutils-2.3.9.ebuild,v 1.2 2012/12/03 10:03:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.9.ebuild,v 1.3 2013/01/21 22:20:54 ssuominen Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=sys-libs/ncurses-5.4-r5
 	>=sys-apps/pciutils-2.1.11-r1
 	>=sys-fs/sysfsutils-1.3.0
-	|| ( virtual/udev sys-apps/hotplug )"
+	virtual/udev"
 
 RDEPEND="${DEPEND}
 	virtual/logger"