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

3 files changed, 23 insertions, 16 deletions

diff --git a/net-wireless/zd1211-firmware/ChangeLog b/net-wireless/zd1211-firmware/ChangeLog
index be6879791dd3..011d206518ce 100644
--- a/net-wireless/zd1211-firmware/ChangeLog
+++ b/net-wireless/zd1211-firmware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/zd1211-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211-firmware/ChangeLog,v 1.14 2013/01/21 22:23:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211-firmware/ChangeLog,v 1.15 2013/01/21 22:24:48 ssuominen Exp $
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  zd1211-firmware-1.4.ebuild:
+  Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt
+  #145809
 
   21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
   -zd1211-firmware-1.2.ebuild, -zd1211-firmware-1.3.ebuild:
diff --git a/net-wireless/zd1211-firmware/Manifest b/net-wireless/zd1211-firmware/Manifest
index 6e771d9f62b0..8e5172bb51e8 100644
--- a/net-wireless/zd1211-firmware/Manifest
+++ b/net-wireless/zd1211-firmware/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST zd1211-firmware-1.4.tar.bz2 39061 SHA256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1
-EBUILD zd1211-firmware-1.4.ebuild 727 SHA256 1be1be8be6b40f7ec026b58a5c3ecd6f471fcf5b846b7237726091c91617f40d SHA512 3cde521dd43e3d2155c69720f09fd6a059e0a53d81fe92466a1b5db188dcbb7daa4e06202c14c5122a60d3358185632e85e4ce5c83b0442b8f4a879baedb3804 WHIRLPOOL 4b760ddcc09704a128b71edfd7553bdd26ff701095b295e8a2a807308c825fcc08094ef32c47f01b9cb471829be2885c5565877c10e9018515df82069a27c3aa
-MISC ChangeLog 2190 SHA256 087f455ebaf4e4f39ace2e31a7bb1ed036e005346d6d23810fb4b657a9573d32 SHA512 70f435a424673db9b6fbe9479e64a53000c6e3f9930bd5da243836f8fb40545b95f23d5d806bf091696032851ebf673cca964a45db5322334c2a7e355bedec3c WHIRLPOOL aa4c508bdd4aba5fde86723e9c37d86a955fa39fd41b645336ffd20ff1ce201443514f1cc21471df14e60900455a6e62bd316602a08f0c1cadcf51f209359648
+EBUILD zd1211-firmware-1.4.ebuild 722 SHA256 e4eba2e55f016a3d5ab4b36b53a0e2d5b1315404d554400185c9512ea78c04a7 SHA512 63e46ce8cee78c65bcb4246118b7f9c8df6d2b47d5db5c972067e0825ec0924772b060fc7a891303e1995d74c2eec90365baecfe52aacbd07c6202194a362ab8 WHIRLPOOL 1b4842cf1f59f801ccafaef16b6a3202c8db0c7fbfe2616876d841166c9d8712982a7278bdbc79b1c7a53a3599e73bae282d3f1d214123289e75d7944087f855
+MISC ChangeLog 2364 SHA256 c30939f9a3083d01fd48cbadc0bbd51f8ec8b53c8d602f6fc015bcebfa60097e SHA512 06f3397b961600d46bf96bf4ffd6059557628c40f91e8e7a3228827b5ee75356c81ff5abcd2d07c28967d15702d6776364f8e6e9014d3343fff278dc3a435252 WHIRLPOOL f21ff71f0ee123648ff4fa431d2e49915abb2a772605845384e081d40f5ec3474f5b649a5405774046043a6b1873b4809927ab0f80ecf45a875eeb008a4e4d47
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/b/nAAoJEEdUh39IaPFNmmEH/jF0zucUJYzC0yZiSG3YX2MO
-OuVsok49HIZ/V5awnyN1MtEQgqIbjrCN2u2vh+GdHNNAjnbZEG9ntt4IKCxtnOtY
-Znqc6V6wnbXb3zlJNLWpiZLZzlM2PlLHldSWoy9Xucv34t97n6GRdNbhVJJi3Tcd
-ztlpQb1J2vn9Rgg5qTnkapZkgcdtc/QONAkgowAM14OJWoZGIjjPMat2J/RnDFFy
-dTdRLOPnBoZmsRPJOXGA3+QK7bjC9dW1I33B/lAbK9EI4Xe1POE/8kyYuiBJLzTa
-mT5wySQeM2mh5YeyltGY8J0zYA4BzLrIypqmaolhkJbnjA9rvYIimBYjkevZzgY=
-=Slgh
+iQEcBAEBCAAGBQJQ/cAwAAoJEEdUh39IaPFNEMcH/2lJdX/1NWF7h7cVkeSpg6Uq
+JwLlOv4gOylnlc2R06b64hMKYbQKugjIhCXSoiC7yS2OTKKDaTcvxFKlPat6kPMM
+pBhSxbZ05qQksLY1EC13G8yqh3QH+/MRYWJ06veTlfrdVCJOSWenADSoBtqFT3rD
+5ZRd+8z1BwlVf5HJgRI5NRh0o0wui1OgM+B/y4aJyThOKAROJ3Nb+5JaLUDfe0lu
+aXuBqWa1zD7rMzkJuvedV3veAii/GrI7sq0RsN3d2B3ud8fFK3MX/hqxSuw0/ZW9
+AVIZjq2Yt2kgJ6sD8YuZx5dP3VVVo1gRxm2QsTK6gPsr3QiBGl+VYySdlm+BJQw=
+=RsJd
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild b/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild
index ca132606b70c..dcd8ad9786de 100644
--- a/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild
+++ b/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild
@@ -1,20 +1,22 @@
-# 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/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild,v 1.4 2012/12/11 04:13:24 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild,v 1.5 2013/01/21 22:24:48 ssuominen Exp $
 
-DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
+EAPI=5
 
+DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
 HOMEPAGE="http://zd1211.ath.cx/wiki/DriverRewrite"
 SRC_URI="mirror://sourceforge/zd1211/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-
 IUSE=""
-DEPEND="|| ( virtual/udev >=sys-apps/hotplug-20040923 )"
 
-S="${WORKDIR}/${PN}"
+RDEPEND="virtual/udev"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${PN}
 
 src_install() {
 	insinto /lib/firmware/zd1211